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

Be more careful to retry when the feature count is exceeded

Browse Source
This commit is contained in:
Erica Fischer
2024-08-16 10:39:25 -07:00
parent d891ca7289
commit c3fa99bc86
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+10 -3
View File
@@ -1640,6 +1640,9 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
size_t lead_features_count = 0; // of the tile so far size_t lead_features_count = 0; // of the tile so far
size_t other_multiplier_cluster_features_count = 0; // of the tile so far size_t other_multiplier_cluster_features_count = 0; // of the tile so far
bool too_many_features = false;
bool too_many_bytes = false;
std::atomic<bool> within[child_shards]; std::atomic<bool> within[child_shards];
long long start_geompos[child_shards]; long long start_geompos[child_shards];
for (size_t i = 0; i < (size_t) child_shards; i++) { for (size_t i = 0; i < (size_t) child_shards; i++) {
@@ -1995,10 +1998,14 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
unsigned long long sfindex = sf.index; unsigned long long sfindex = sf.index;
if (sf.geometry.size() > 0) { if (sf.geometry.size() > 0) {
if (lead_features_count > max_tile_size || (lead_features_count + other_multiplier_cluster_features_count > max_tile_features && !prevent[P_FEATURE_LIMIT])) { if (lead_features_count > max_tile_size) {
// Even being maximally conservative, each feature is still going to be // Even being maximally conservative, each feature is still going to be
// at least one byte in the output tile, so this can't possibly work. // at least one byte in the output tile, so this can't possibly work.
skipped++; skipped++;
too_many_bytes = true;
} else if (lead_features_count + other_multiplier_cluster_features_count > max_tile_features && !prevent[P_FEATURE_LIMIT]) {
skipped++;
too_many_features = true;
} else { } else {
kept++; kept++;
@@ -2483,7 +2490,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
} }
if (totalsize > 0 && tile.layers.size() > 0) { if (totalsize > 0 && tile.layers.size() > 0) {
if (totalsize > scaled_max_tile_features && !prevent[P_FEATURE_LIMIT]) { if (too_many_features || (totalsize > scaled_max_tile_features && !prevent[P_FEATURE_LIMIT])) {
if (totalsize > arg->feature_count_out) { if (totalsize > arg->feature_count_out) {
arg->feature_count_out = totalsize; arg->feature_count_out = totalsize;
} }
@@ -2585,7 +2592,7 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
// printf("%lld %zu\n", estimated_complexity, compressed.size()); // printf("%lld %zu\n", estimated_complexity, compressed.size());
} }
if (compressed.size() > scaled_max_tile_size && !prevent[P_KILOBYTE_LIMIT]) { if (too_many_bytes || (compressed.size() > scaled_max_tile_size && !prevent[P_KILOBYTE_LIMIT])) {
// Estimate how big it really should have been compressed // Estimate how big it really should have been compressed
// from how many features were kept vs skipped for already being // from how many features were kept vs skipped for already being
// over the threshold // over the threshold