It only needs to look for other small features when coalescing, not d…

…ropping (#64) * Back out the slow search for other small features when dropping features * Actually, *do* look for small features still when coalescing * Update changelog
felt · Jan 27, 2023 · b155b46 · b155b46
1 parent e615668
commit b155b46
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 215 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.22.0
+
+* Speed up feature dropping by removing unnecessary search for other small features
+
 ## 2.21.0
 
 * Improve label placement to avoid placing labels in polygon holes

diff --git a/tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--drop-smallest-as-needed.json b/tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--drop-smallest-as-needed.json
diff --git a/tests/ne_110m_admin_0_countries/out/-z5_-M5000_--drop-smallest-as-needed.json b/tests/ne_110m_admin_0_countries/out/-z5_-M5000_--drop-smallest-as-needed.json
diff --git a/...10m_admin_1_states_provinces_lines/out/-z5_-M500_--drop-smallest-as-needed.json b/...10m_admin_1_states_provinces_lines/out/-z5_-M500_--drop-smallest-as-needed.json
diff --git a/tests/ne_110m_populated_places/out/-z1_-M10000_--drop-smallest-as-needed.json b/tests/ne_110m_populated_places/out/-z1_-M10000_--drop-smallest-as-needed.json
diff --git a/tile.cpp b/tile.cpp
@@ -2100,7 +2100,9 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
 				}
 			} else if (additional[A_DROP_SMALLEST_AS_NEEDED]) {
 				add_sample_to(extents, sf.extent, extents_increment, seq);
-				if (sf.extent + coalesced_area <= minextent && find_partial(partials, sf, which_partial, layer_unmaps, minextent)) {
+				// search here is for LLONG_MAX, not minextent, because we are dropping features, not coalescing them,
+				// so we shouldn't expect to find anything small that we can related this feature to.
+				if (sf.extent + coalesced_area <= minextent && find_partial(partials, sf, which_partial, layer_unmaps, LLONG_MAX)) {
 					preserve_attributes(arg->attribute_accum, sf, stringpool, pool_off, partials[which_partial]);
 					strategy->dropped_as_needed++;
 					continue;

diff --git a/version.hpp b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v2.21.0"
+#define VERSION "v2.22.0"
 
 #endif