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

Remove dead code for a long-forgotten inaccessible option

Browse Source
This commit is contained in:
Erica Fischer
2022-10-20 12:16:24 -07:00
parent becb04693d
commit 266e73aeae
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
options.hpp
-1
View File
@@ -11,7 +11,6 @@
#define A_PREFER_RADIX_SORT ((int) 'R') #define A_PREFER_RADIX_SORT ((int) 'R')
#define A_CALCULATE_FEATURE_DENSITY ((int) 'g') #define A_CALCULATE_FEATURE_DENSITY ((int) 'g')
#define A_INCREASE_GAMMA_AS_NEEDED ((int) 'G') #define A_INCREASE_GAMMA_AS_NEEDED ((int) 'G')
#define A_MERGE_POLYGONS_AS_NEEDED ((int) 'm')
#define A_DROP_DENSEST_AS_NEEDED ((int) 's') #define A_DROP_DENSEST_AS_NEEDED ((int) 's')
#define A_DROP_FRACTION_AS_NEEDED ((int) 'd') #define A_DROP_FRACTION_AS_NEEDED ((int) 'd')
#define A_DROP_SMALLEST_AS_NEEDED ((int) 'n') #define A_DROP_SMALLEST_AS_NEEDED ((int) 'n')
tile.cpp
+5 -29
View File
@@ -1831,8 +1831,6 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
} }
} }
bool has_polygons = false;
bool first_time = true; bool first_time = true;
// This only loops if the tile data didn't fit, in which case the detail // This only loops if the tile data didn't fit, in which case the detail
// goes down and the progress indicator goes backward for the next try. // goes down and the progress indicator goes backward for the next try.
@@ -2081,7 +2079,6 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
strategy->tiny_polygons++; strategy->tiny_polygons++;
} }
} }
has_polygons = true;
} }
if (sf.t == VT_POLYGON || sf.t == VT_LINE) { if (sf.t == VT_POLYGON || sf.t == VT_LINE) {
if (line_is_too_small(sf.geometry, z, line_detail)) { if (line_is_too_small(sf.geometry, z, line_detail)) {
@@ -2233,10 +2230,9 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
} }
first_time = false; first_time = false;
bool merge_successful = true;
if (additional[A_DETECT_SHARED_BORDERS] || (additional[A_MERGE_POLYGONS_AS_NEEDED] && merge_fraction < 1)) { if (additional[A_DETECT_SHARED_BORDERS]) {
merge_successful = find_common_edges(partials, z, line_detail, simplification, maxzoom, merge_fraction); find_common_edges(partials, z, line_detail, simplification, maxzoom, merge_fraction);
} }
int tasks = ceil((double) CPUS / *running); int tasks = ceil((double) CPUS / *running);
@@ -2493,14 +2489,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
fprintf(stderr, "tile %d/%u/%u has %lld vertices, >%zu \n", z, tx, ty, total_geom_size, max_geometry_size); fprintf(stderr, "tile %d/%u/%u has %lld vertices, >%zu \n", z, tx, ty, total_geom_size, max_geometry_size);
} }
if (has_polygons && additional[A_MERGE_POLYGONS_AS_NEEDED] && merge_fraction > .05 && merge_successful) { if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
merge_fraction = merge_fraction * max_geometry_size / total_geom_size * 0.95;
if (!quiet) {
fprintf(stderr, "Going to try merging %0.2f%% of the polygons to make it fit\n", 100 - merge_fraction * 100);
}
line_detail++; // to keep it the same when the loop decrements it
continue;
} else if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
if (gamma < 1) { if (gamma < 1) {
gamma = 1; gamma = 1;
} else { } else {
@@ -2583,14 +2572,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
fprintf(stderr, "tile %d/%u/%u has %zu features, >%zu \n", z, tx, ty, totalsize, max_tile_features); fprintf(stderr, "tile %d/%u/%u has %zu features, >%zu \n", z, tx, ty, totalsize, max_tile_features);
} }
if (has_polygons && additional[A_MERGE_POLYGONS_AS_NEEDED] && merge_fraction > .05 && merge_successful) { if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
merge_fraction = merge_fraction * max_tile_features / tile.layers.size() * 0.95;
if (!quiet) {
fprintf(stderr, "Going to try merging %0.2f%% of the polygons to make it fit\n", 100 - merge_fraction * 100);
}
line_detail++; // to keep it the same when the loop decrements it
continue;
} else if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
if (gamma < 1) { if (gamma < 1) {
gamma = 1; gamma = 1;
} else { } else {
@@ -2692,13 +2674,7 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
} }
} }
if (has_polygons && additional[A_MERGE_POLYGONS_AS_NEEDED] && merge_fraction > .05 && merge_successful) { if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
merge_fraction = merge_fraction * max_tile_size / (kept_adjust * compressed.size()) * 0.95;
if (!quiet) {
fprintf(stderr, "Going to try merging %0.2f%% of the polygons to make it fit\n", 100 - merge_fraction * 100);
}
line_detail++; // to keep it the same when the loop decrements it
} else if (additional[A_INCREASE_GAMMA_AS_NEEDED] && gamma < 10) {
if (gamma < 1) { if (gamma < 1) {
gamma = 1; gamma = 1;
} else { } else {