summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-11 05:53:01 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-11 05:53:40 (GMT)
commit6450b503eaad0f01f6044d48920f0bfa6382a3e3 (patch)
tree498b378a8bbd2cc2ea1ee36076097574334ce19b
parent0df741d697c7d68d10a3c693ad5f2ea804a86385 (diff)
Rename cutToTiles() to clipTo()
-rw-r--r--tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp2
-rw-r--r--tools/vectorosm-tilecreator/TinyPlanetProcessor.h2
-rw-r--r--tools/vectorosm-tilecreator/main.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp b/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
index 1c46166..591d064 100644
--- a/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
+++ b/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
@@ -171,7 +171,7 @@ GeoDataDocument *TinyPlanetProcessor::clipTo(const GeoDataLatLonBox &tileBoundar
return tile;
}
-GeoDataDocument *TinyPlanetProcessor::cutToTiles(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY)
+GeoDataDocument *TinyPlanetProcessor::clipTo(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY)
{
unsigned int N = pow(2, zoomLevel);
GeoDataLatLonBox tileBoundary;
diff --git a/tools/vectorosm-tilecreator/TinyPlanetProcessor.h b/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
index 0fedd5a..e204ab8 100644
--- a/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
+++ b/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
@@ -26,7 +26,7 @@ public:
void process() override;
GeoDataDocument* clipTo(const GeoDataLatLonBox &box);
- GeoDataDocument* cutToTiles(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY);
+ GeoDataDocument* clipTo(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY);
private:
void copyTags(const GeoDataPlacemark &source, GeoDataPlacemark &target) const;
diff --git a/tools/vectorosm-tilecreator/main.cpp b/tools/vectorosm-tilecreator/main.cpp
index 2d9990a..7946446 100644
--- a/tools/vectorosm-tilecreator/main.cpp
+++ b/tools/vectorosm-tilecreator/main.cpp
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
GeoDataLatLonBox world(85.0, -85.0, 180.0, -180.0, GeoDataCoordinates::Degree);
TileIterator iter(world, zoomLevel);
foreach(auto const &tileId, iter) {
- GeoDataDocument* tile = processor.cutToTiles(zoomLevel, tileId.x(), tileId.y());
+ GeoDataDocument* tile = processor.clipTo(zoomLevel, tileId.x(), tileId.y());
NodeReducer reducer(tile, zoomLevel);
reducer.process();
@@ -251,8 +251,8 @@ int main(int argc, char *argv[])
TileIterator iter(tagsFilter.accepted()->latLonAltBox(), zoomLevel);
foreach(auto const &tileId, iter) {
- GeoDataDocument* tile1 = processor.cutToTiles(zoomLevel, tileId.x(), tileId.y());
- GeoDataDocument* tile2 = landMassClipper.cutToTiles(zoomLevel, tileId.x(), tileId.y());
+ GeoDataDocument* tile1 = processor.clipTo(zoomLevel, tileId.x(), tileId.y());
+ GeoDataDocument* tile2 = landMassClipper.clipTo(zoomLevel, tileId.x(), tileId.y());
GeoDataDocument* combined = mergeDocuments(tile1, tile2);
NodeReducer reducer(combined, zoomLevel);
reducer.process();
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
//TileIterator iter(map->latLonAltBox(), zoomLevel);
TileIterator iter(world, zoomLevel);
foreach(auto const &tileId, iter) {
- GeoDataDocument* tile = processor.cutToTiles(zoomLevel, tileId.x(), tileId.y());
+ GeoDataDocument* tile = processor.clipTo(zoomLevel, tileId.x(), tileId.y());
if (!writeTile(parser, outputName, tile, tileId.x(), tileId.y(), zoomLevel)) {
return 4;
}