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

Make better guesses about what gap will make a tile small enough

Browse Source
This commit is contained in:
Eric Fischer
2016-11-02 16:57:35 -07:00
parent 2e3ba8f374
commit 689f2ef7e9
2 changed files with 296 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/muni/out/-Z11_-z13_-k5000_-as.json
+290 -632
View File
File diff suppressed because it is too large Load Diff
tile.cpp
+6 -4
View File
@@ -1148,12 +1148,14 @@ unsigned long long choose_mingap(std::vector<unsigned long long> const &indices,
size_t want = indices.size() * f; size_t want = indices.size() * f;
while (top - bot > 2) { while (top - bot > 2) {
long long guess = bot / 2 + top / 2; unsigned long long guess = bot / 2 + top / 2;
size_t count = 0; size_t count = 0;
unsigned long long prev = 0;
for (size_t i = 0; i < indices.size(); i++) { for (size_t i = 0; i < indices.size(); i++) {
if (i == 0 || indices[i] < indices[i - 1] || (long long) (indices[i] - indices[i - 1]) > guess) { if (indices[i] - prev >= guess) {
count++; count++;
prev = indices[i];
} }
} }
@@ -1762,7 +1764,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
line_detail++; // to keep it the same when the loop decrements it line_detail++; // to keep it the same when the loop decrements it
continue; continue;
} else if (additional[A_INCREASE_SPACING_AS_NEEDED]) { } else if (additional[A_INCREASE_SPACING_AS_NEEDED]) {
mingap_fraction = mingap_fraction * 200000.0 / totalsize * 0.95; mingap_fraction = mingap_fraction * 200000.0 / totalsize * 0.90;
arg->mingap_out = mingap = choose_mingap(indices, mingap_fraction); arg->mingap_out = mingap = choose_mingap(indices, mingap_fraction);
if (!quiet) { if (!quiet) {
fprintf(stderr, "Going to try keeping the sparsest %0.2f%% of the features to make it fit\n", mingap_fraction * 100.0); fprintf(stderr, "Going to try keeping the sparsest %0.2f%% of the features to make it fit\n", mingap_fraction * 100.0);
@@ -1811,7 +1813,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
} }
line_detail++; // to keep it the same when the loop decrements it line_detail++; // to keep it the same when the loop decrements it
} else if (additional[A_INCREASE_SPACING_AS_NEEDED]) { } else if (additional[A_INCREASE_SPACING_AS_NEEDED]) {
mingap_fraction = mingap_fraction * max_tile_size / compressed.size() * 0.95; mingap_fraction = mingap_fraction * max_tile_size / compressed.size() * 0.90;
arg->mingap_out = mingap = choose_mingap(indices, mingap_fraction); arg->mingap_out = mingap = choose_mingap(indices, mingap_fraction);
if (!quiet) { if (!quiet) {
fprintf(stderr, "Going to try keeping the sparsest %0.2f%% of the features to make it fit\n", mingap_fraction * 100.0); fprintf(stderr, "Going to try keeping the sparsest %0.2f%% of the features to make it fit\n", mingap_fraction * 100.0);