ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-01 16:58:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #566 from mapbox/extend-zooms-with-feature-limit

Browse Source 
Also take note of --force-feature-limit if extending zooms
This commit is contained in:
Eric Fischer 2018-05-04 22:31:20 +02:00 committed by GitHub
commit 2cf0524037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7552 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## 1.27.15
* --extend-zooms-if-still-dropping now also extends zooms if features
are dropped by --force-feature-limit
## 1.27.14 ## 1.27.14
* Use an exit status of 100 if some zoom levels were successfully * Use an exit status of 100 if some zoom levels were successfully

7542
tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--force-feature-limit.json Normal file
View File

File diff suppressed because one or more lines are too long

4
tile.cpp
View File

@ -2314,6 +2314,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
if ((additional[A_DROP_FRACTION_AS_NEEDED] || additional[A_COALESCE_FRACTION_AS_NEEDED]) && fraction < arg->fraction_out) { if ((additional[A_DROP_FRACTION_AS_NEEDED] || additional[A_COALESCE_FRACTION_AS_NEEDED]) && fraction < arg->fraction_out) {
arg->fraction_out = fraction; arg->fraction_out = fraction;
arg->still_dropping = true; arg->still_dropping = true;
} else if (prevent[P_DYNAMIC_DROP]) {
arg->still_dropping = true;
} }
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;
@ -2404,6 +2406,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
if ((additional[A_DROP_FRACTION_AS_NEEDED] || additional[A_COALESCE_FRACTION_AS_NEEDED]) && fraction < arg->fraction_out) { if ((additional[A_DROP_FRACTION_AS_NEEDED] || additional[A_COALESCE_FRACTION_AS_NEEDED]) && fraction < arg->fraction_out) {
arg->fraction_out = fraction; arg->fraction_out = fraction;
arg->still_dropping = true; arg->still_dropping = true;
} else if (prevent[P_DYNAMIC_DROP]) {
arg->still_dropping = true;
} }
line_detail++; // to keep it the same when the loop decrements it line_detail++; // to keep it the same when the loop decrements it
} }

2
version.hpp
View File

@ -1,6 +1,6 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
#define VERSION "tippecanoe v1.27.14\n" #define VERSION "tippecanoe v1.27.15\n"
#endif #endif