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

Don't allow <0 gamma (randomized) if basezoom or droprate not known

Browse Source
This commit is contained in:
Eric Fischer
2015-12-16 12:33:07 -08:00
parent 6681817243
commit b7a411769a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+8 -1
View File
@@ -1122,7 +1122,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
if (droprate < 0) { if (droprate < 0) {
droprate = 1; droprate = 1;
for (z = 0; z <= basezoom; z++) { for (z = basezoom; z >= 0; z--) {
double interval = exp(log(droprate) * (basezoom - z)); double interval = exp(log(droprate) * (basezoom - z));
if (max[z].count / interval >= MAX_FEATURES) { if (max[z].count / interval >= MAX_FEATURES) {
@@ -1468,6 +1468,13 @@ int main(int argc, char **argv) {
geometry_scale = 32 - (full_detail + maxzoom); geometry_scale = 32 - (full_detail + maxzoom);
if ((basezoom < 0 || droprate < 0) && (gamma < 0)) {
// Can't use randomized (as opposed to evenly distributed) dot dropping
// if rate and base aren't known during feature reading.
gamma = 0;
fprintf(stderr, "Forcing -g0 since -B or -r is not known\n");
}
if (outdir == NULL) { if (outdir == NULL) {
fprintf(stderr, "%s: must specify -o out.mbtiles\n", argv[0]); fprintf(stderr, "%s: must specify -o out.mbtiles\n", argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);