diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rescale geometry if layer extents don't match

Browse Source
This commit is contained in:
Eric Fischer
2016-09-19 16:25:30 -07:00
parent a37fc361c2
commit 8d57f031ee
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile-join.cpp
+19 -4
View File
@@ -52,12 +52,20 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::vector<std:
outtile.layers[ol].extent = layer.extent; outtile.layers[ol].extent = layer.extent;
} }
if (tile.layers[l].extent != outtile.layers[ol].extent) { mvt_layer &outlayer = outtile.layers[ol];
fprintf(stderr, "Mismatched extents: %d vs %d\n", tile.layers[l].extent, outtile.layers[ol].extent);
exit(EXIT_FAILURE); if (layer.extent != outlayer.extent) {
if (layer.extent > outlayer.extent) {
for (size_t i = 0; i < outlayer.features.size(); i++) {
for (size_t j = 0; j < outlayer.features[i].geometry.size(); j++) {
outlayer.features[i].geometry[j].x = outlayer.features[i].geometry[j].x * layer.extent / outlayer.extent;
outlayer.features[i].geometry[j].y = outlayer.features[i].geometry[j].y * layer.extent / outlayer.extent;
}
} }
mvt_layer &outlayer = outtile.layers[ol]; outlayer.extent = layer.extent;
}
}
const char *ln = layer.name.c_str(); const char *ln = layer.name.c_str();
@@ -174,6 +182,13 @@ void handle(std::string message, int z, unsigned x, unsigned y, std::vector<std:
outfeature.type = feat.type; outfeature.type = feat.type;
outfeature.geometry = feat.geometry; outfeature.geometry = feat.geometry;
if (layer.extent != outlayer.extent) {
for (size_t i = 0; i < outfeature.geometry.size(); i++) {
outfeature.geometry[i].x = outfeature.geometry[i].x * outlayer.extent / layer.extent;
outfeature.geometry[i].y = outfeature.geometry[i].y * outlayer.extent / layer.extent;
}
}
features_added++; features_added++;
outlayer.features.push_back(outfeature); outlayer.features.push_back(outfeature);
} }