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

Require that per-feature maxzoom and minzoom be small integers

Browse Source 
Also fixes a place in the Makefile that accidentally still used
CFLAGS instead of CXXFLAGS
This commit is contained in:
Eric Fischer
2018-07-12 11:24:30 -07:00
parent d64ac19f11
commit d1a0e495ce
7 changed files with 156 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.cpp
+4 -10
View File
@@ -82,19 +82,13 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
if (tippecanoe != NULL) {
json_object *min = json_hash_get(tippecanoe, "minzoom");
if (min != NULL && min->type == JSON_NUMBER) {
tippecanoe_minzoom = min->number;
}
if (min != NULL && min->type == JSON_STRING) {
tippecanoe_minzoom = atoi(min->string);
if (min != NULL && (min->type == JSON_STRING || min->type == JSON_NUMBER)) {
tippecanoe_minzoom = integer_zoom(sst->fname, min->string);
}
json_object *max = json_hash_get(tippecanoe, "maxzoom");
if (max != NULL && max->type == JSON_NUMBER) {
tippecanoe_maxzoom = max->number;
}
if (max != NULL && max->type == JSON_STRING) {
tippecanoe_maxzoom = atoi(max->string);
if (max != NULL && (max->type == JSON_STRING || max->type == JSON_NUMBER)) {
tippecanoe_maxzoom = integer_zoom(sst->fname, max->string);
}
json_object *ln = json_hash_get(tippecanoe, "layer");