Fix inverse spatial feature order

This commit is contained in:
Erica Fischer
2023-12-15 15:01:37 -08:00
parent fdf230f632
commit 5978ecdb44
2 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -3359,8 +3359,8 @@ int main(int argc, char **argv) {
order_by.push_back(order_field(ORDER_BY_SIZE, true)); order_by.push_back(order_field(ORDER_BY_SIZE, true));
order_by_size = true; order_by_size = true;
} else if (strcmp(opt, "order-spatial-inverse") == 0) { } else if (strcmp(opt, "order-spatial-inverse") == 0) {
order_by.push_back(order_field(ORDER_SPATIAL, false));
order_by.push_back(order_field(ORDER_BY_FEATURE_MINZOOM, false)); order_by.push_back(order_field(ORDER_BY_FEATURE_MINZOOM, false));
order_by.push_back(order_field(ORDER_SPATIAL, false));
} else if (strcmp(opt, "simplification-at-maximum-zoom") == 0) { } else if (strcmp(opt, "simplification-at-maximum-zoom") == 0) {
maxzoom_simplification = atof_require(optarg, "Mazoom simplification"); maxzoom_simplification = atof_require(optarg, "Mazoom simplification");
if (maxzoom_simplification <= 0) { if (maxzoom_simplification <= 0) {
+4 -1
View File
@@ -665,7 +665,8 @@ void *partial_feature_worker(void *v) {
to_tile_scale(geom, z, out_detail); to_tile_scale(geom, z, out_detail);
} }
(*partials)[i].index = i; // what was this for?
// (*partials)[i].index = i;
std::vector<drawvec> geoms; // artifact of former polygon-splitting to reduce geometric complexity std::vector<drawvec> geoms; // artifact of former polygon-splitting to reduce geometric complexity
geoms.push_back(geom); geoms.push_back(geom);
@@ -2336,6 +2337,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
for (size_t i = 0; i < partials.size(); i++) { for (size_t i = 0; i < partials.size(); i++) {
partial &p = partials[i]; partial &p = partials[i];
#if 0
{ {
std::string layername = (*layer_unmaps)[p.segment][p.layer]; std::string layername = (*layer_unmaps)[p.segment][p.layer];
@@ -2350,6 +2352,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
sv2.s = std::to_string(p.feature_minzoom); sv2.s = std::to_string(p.feature_minzoom);
p.full_values.push_back(sv2); p.full_values.push_back(sv2);
} }
#endif
if (p.clustered > 0) { if (p.clustered > 0) {
std::string layername = (*layer_unmaps)[p.segment][p.layer]; std::string layername = (*layer_unmaps)[p.segment][p.layer];