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

Make base zoom and drop rate guessing more testable, and test them

Browse Source
This commit is contained in:
Eric Fischer
2016-03-03 17:03:03 -08:00
parent e4ab47b3d6
commit d38b5a999e
7 changed files with 91751 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.c
+19 -5
View File
@@ -2105,12 +2105,15 @@ int main(int argc, char **argv) {
case 'B':
if (strcmp(optarg, "g") == 0) {
basezoom = -2;
basezoom_marker_width = 1;
} else if (optarg[0] == 'g') {
} else if (optarg[0] == 'g' || optarg[0] == 'f') {
basezoom = -2;
basezoom_marker_width = atof(optarg + 1);
if (basezoom_marker_width == 0) {
fprintf(stderr, "%s: Must specify marker width >0 with -Bg\n", argv[0]);
if (optarg[0] == 'g') {
basezoom_marker_width = atof(optarg + 1);
} else {
basezoom_marker_width = sqrt(50000 / atof(optarg + 1));
}
if (basezoom_marker_width == 0 || atof(optarg + 1) == 0) {
fprintf(stderr, "%s: Must specify value >0 with -B%c\n", argv[0], optarg[0]);
exit(EXIT_FAILURE);
}
} else {
@@ -2154,6 +2157,17 @@ int main(int argc, char **argv) {
case 'r':
if (strcmp(optarg, "g") == 0) {
droprate = -2;
} else if (optarg[0] == 'g' || optarg[0] == 'f') {
droprate = -2;
if (optarg[0] == 'g') {
basezoom_marker_width = atof(optarg + 1);
} else {
basezoom_marker_width = sqrt(50000 / atof(optarg + 1));
}
if (basezoom_marker_width == 0 || atof(optarg + 1) == 0) {
fprintf(stderr, "%s: Must specify value >0 with -r%c\n", argv[0], optarg[0]);
exit(EXIT_FAILURE);
}
} else {
droprate = atof(optarg);
}