From c87d6eadfcfcb7b385b0968f47e3934554a1ea1b Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 3 Jan 2017 12:18:40 -0800 Subject: [PATCH] Associate attributes with the right layer when explicitly tagged (#342) --- CHANGELOG.md | 4 +++ geojson.cpp | 31 ++++++++++--------- tests/muni/out/-Z11_-z11.json | 2 +- ...-Z11_-z11_--calculate-feature-density.json | 2 +- .../out/-Z11_-z11_--prefer-radix-sort.json | 2 +- tests/muni/out/-Z11_-z11_-g2.json | 2 +- tests/muni/out/-Z11_-z13_-B15.json | 2 +- tests/muni/out/-Z11_-z13_-Bf2000.json | 2 +- tests/muni/out/-Z11_-z13_-M10000.json | 2 +- tests/muni/out/-Z11_-z13_-M10000_-aG.json | 2 +- tests/muni/out/-Z11_-z13_-M10000_-ad.json | 2 +- tests/muni/out/-Z11_-z13_-M10000_-pd.json | 2 +- tests/muni/out/-Z11_-z13_-M5000_-as.json | 2 +- tests/muni/out/-Z11_-z13_-rf2000.json | 2 +- tests/muni/out/-Z11_-z13_-rf2000_-Bg.json | 2 +- tests/muni/out/-Z11_-z13_-rf2000_-g2.json | 2 +- tests/muni/out/-z1_-Z1_-ao_-P.json | 2 +- version.hpp | 2 +- 18 files changed, 36 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63981b..494fe2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.16.2 + +* Associate attributes with the right layer when explicitly tagged + ## 1.16.1 * Choose a deeper starting tile than 0/0/0 if there is one that contains diff --git a/geojson.cpp b/geojson.cpp index c04e2b8..79c1887 100644 --- a/geojson.cpp +++ b/geojson.cpp @@ -167,7 +167,7 @@ long long parse_geometry(int t, json_object *j, long long *bbox, drawvec &out, i return g; } -int serialize_geometry(json_object *geometry, json_object *properties, json_object *id, const char *reading, int line, volatile long long *layer_seq, volatile long long *progress_seq, long long *metapos, long long *geompos, long long *indexpos, std::set *exclude, std::set *include, int exclude_all, FILE *metafile, FILE *geomfile, FILE *indexfile, struct memfile *poolfile, struct memfile *treefile, const char *fname, int basezoom, int layer, double droprate, long long *file_bbox, json_object *tippecanoe, int segment, int *initialized, unsigned *initial_x, unsigned *initial_y, struct reader *readers, int maxzoom, json_object *feature, std::map *layermap, std::string const &layername, bool uses_gamma) { +int serialize_geometry(json_object *geometry, json_object *properties, json_object *id, const char *reading, int line, volatile long long *layer_seq, volatile long long *progress_seq, long long *metapos, long long *geompos, long long *indexpos, std::set *exclude, std::set *include, int exclude_all, FILE *metafile, FILE *geomfile, FILE *indexfile, struct memfile *poolfile, struct memfile *treefile, const char *fname, int basezoom, int layer, double droprate, long long *file_bbox, json_object *tippecanoe, int segment, int *initialized, unsigned *initial_x, unsigned *initial_y, struct reader *readers, int maxzoom, json_object *feature, std::map *layermap, std::string layername, bool uses_gamma) { json_object *geometry_type = json_hash_get(geometry, "type"); if (geometry_type == NULL) { static int warned = 0; @@ -257,6 +257,21 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje long long bbox[] = {LLONG_MAX, LLONG_MAX, LLONG_MIN, LLONG_MIN}; + if (tippecanoe_layername.size() != 0) { + if (layermap->count(tippecanoe_layername) == 0) { + layermap->insert(std::pair(tippecanoe_layername, layermap_entry(layermap->size()))); + } + + auto ai = layermap->find(tippecanoe_layername); + if (ai != layermap->end()) { + layer = ai->second.id; + layername = tippecanoe_layername; + } else { + fprintf(stderr, "Internal error: can't find layer name %s\n", tippecanoe_layername.c_str()); + exit(EXIT_FAILURE); + } + } + size_t nprop = 0; if (properties != NULL && properties->type == JSON_HASH) { nprop = properties->length; @@ -377,20 +392,6 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje } } - if (tippecanoe_layername.size() != 0) { - if (layermap->count(tippecanoe_layername) == 0) { - layermap->insert(std::pair(tippecanoe_layername, layermap_entry(layermap->size()))); - } - - auto ai = layermap->find(tippecanoe_layername); - if (ai != layermap->end()) { - layer = ai->second.id; - } else { - fprintf(stderr, "Internal error: can't find layer name %s\n", tippecanoe_layername.c_str()); - exit(EXIT_FAILURE); - } - } - long long geomstart = *geompos; long long bbox_index; diff --git a/tests/muni/out/-Z11_-z11.json b/tests/muni/out/-Z11_-z11.json index 7d7ec2c..7b8b3ef 100644 --- a/tests/muni/out/-Z11_-z11.json +++ b/tests/muni/out/-Z11_-z11.json @@ -3,7 +3,7 @@ "center": "-122.431641,37.788049,11", "description": "tests/muni/out/-Z11_-z11.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "11", "minzoom": "11", "name": "tests/muni/out/-Z11_-z11.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z11_--calculate-feature-density.json b/tests/muni/out/-Z11_-z11_--calculate-feature-density.json index 74bcdea..73d3cf4 100644 --- a/tests/muni/out/-Z11_-z11_--calculate-feature-density.json +++ b/tests/muni/out/-Z11_-z11_--calculate-feature-density.json @@ -3,7 +3,7 @@ "center": "-122.431641,37.788049,11", "description": "tests/muni/out/-Z11_-z11_--calculate-feature-density.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\", \"tippecanoe_feature_density\": \"Number\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"tippecanoe_feature_density\": \"Number\"} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\", \"tippecanoe_feature_density\": \"Number\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\", \"tippecanoe_feature_density\": \"Number\"} } ] }", "maxzoom": "11", "minzoom": "11", "name": "tests/muni/out/-Z11_-z11_--calculate-feature-density.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z11_--prefer-radix-sort.json b/tests/muni/out/-Z11_-z11_--prefer-radix-sort.json index eefe086..abc0c3b 100644 --- a/tests/muni/out/-Z11_-z11_--prefer-radix-sort.json +++ b/tests/muni/out/-Z11_-z11_--prefer-radix-sort.json @@ -3,7 +3,7 @@ "center": "-122.431641,37.788049,11", "description": "tests/muni/out/-Z11_-z11_--prefer-radix-sort.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "11", "minzoom": "11", "name": "tests/muni/out/-Z11_-z11_--prefer-radix-sort.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z11_-g2.json b/tests/muni/out/-Z11_-z11_-g2.json index 7c5bc39..4e43442 100644 --- a/tests/muni/out/-Z11_-z11_-g2.json +++ b/tests/muni/out/-Z11_-z11_-g2.json @@ -3,7 +3,7 @@ "center": "-122.431641,37.788049,11", "description": "tests/muni/out/-Z11_-z11_-g2.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 11, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "11", "minzoom": "11", "name": "tests/muni/out/-Z11_-z11_-g2.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-B15.json b/tests/muni/out/-Z11_-z13_-B15.json index 139d318..56a62b0 100644 --- a/tests/muni/out/-Z11_-z13_-B15.json +++ b/tests/muni/out/-Z11_-z13_-B15.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-B15.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-B15.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-Bf2000.json b/tests/muni/out/-Z11_-z13_-Bf2000.json index 5c50bdf..8ff048b 100644 --- a/tests/muni/out/-Z11_-z13_-Bf2000.json +++ b/tests/muni/out/-Z11_-z13_-Bf2000.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-Bf2000.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-Bf2000.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-M10000.json b/tests/muni/out/-Z11_-z13_-M10000.json index 1cca33b..211481c 100644 --- a/tests/muni/out/-Z11_-z13_-M10000.json +++ b/tests/muni/out/-Z11_-z13_-M10000.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-M10000.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-M10000.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-M10000_-aG.json b/tests/muni/out/-Z11_-z13_-M10000_-aG.json index a9efc1c..b205b06 100644 --- a/tests/muni/out/-Z11_-z13_-M10000_-aG.json +++ b/tests/muni/out/-Z11_-z13_-M10000_-aG.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-M10000_-aG.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-M10000_-aG.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-M10000_-ad.json b/tests/muni/out/-Z11_-z13_-M10000_-ad.json index b70ae3f..9a2c1b3 100644 --- a/tests/muni/out/-Z11_-z13_-M10000_-ad.json +++ b/tests/muni/out/-Z11_-z13_-M10000_-ad.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-M10000_-ad.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-M10000_-ad.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-M10000_-pd.json b/tests/muni/out/-Z11_-z13_-M10000_-pd.json index 2be81ae..b38fb8c 100644 --- a/tests/muni/out/-Z11_-z13_-M10000_-pd.json +++ b/tests/muni/out/-Z11_-z13_-M10000_-pd.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-M10000_-pd.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-M10000_-pd.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-M5000_-as.json b/tests/muni/out/-Z11_-z13_-M5000_-as.json index ca81b2f..91d5547 100644 --- a/tests/muni/out/-Z11_-z13_-M5000_-as.json +++ b/tests/muni/out/-Z11_-z13_-M5000_-as.json @@ -3,7 +3,7 @@ "center": "-122.497559,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-M5000_-as.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-M5000_-as.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-rf2000.json b/tests/muni/out/-Z11_-z13_-rf2000.json index ab1105f..27e108c 100644 --- a/tests/muni/out/-Z11_-z13_-rf2000.json +++ b/tests/muni/out/-Z11_-z13_-rf2000.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-rf2000.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-rf2000.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-rf2000_-Bg.json b/tests/muni/out/-Z11_-z13_-rf2000_-Bg.json index 49a9e30..a45f6c1 100644 --- a/tests/muni/out/-Z11_-z13_-rf2000_-Bg.json +++ b/tests/muni/out/-Z11_-z13_-rf2000_-Bg.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-rf2000_-Bg.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-rf2000_-Bg.json.check.mbtiles", diff --git a/tests/muni/out/-Z11_-z13_-rf2000_-g2.json b/tests/muni/out/-Z11_-z13_-rf2000_-g2.json index 71d960f..4238a39 100644 --- a/tests/muni/out/-Z11_-z13_-rf2000_-g2.json +++ b/tests/muni/out/-Z11_-z13_-rf2000_-g2.json @@ -3,7 +3,7 @@ "center": "-122.409668,37.770713,13", "description": "tests/muni/out/-Z11_-z13_-rf2000_-g2.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 11, \"maxzoom\": 13, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "13", "minzoom": "11", "name": "tests/muni/out/-Z11_-z13_-rf2000_-g2.json.check.mbtiles", diff --git a/tests/muni/out/-z1_-Z1_-ao_-P.json b/tests/muni/out/-z1_-Z1_-ao_-P.json index 4cccbe5..7293af7 100644 --- a/tests/muni/out/-z1_-Z1_-ao_-P.json +++ b/tests/muni/out/-z1_-Z1_-ao_-P.json @@ -3,7 +3,7 @@ "center": "-90.000000,37.836443,1", "description": "tests/muni/out/-z1_-Z1_-ao_-P.json.check.mbtiles", "format": "pbf", -"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 1, \"maxzoom\": 1, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 1, \"maxzoom\": 1, \"fields\": {} } ] }", +"json": "{\"vector_layers\": [ { \"id\": \"muni\", \"description\": \"\", \"minzoom\": 1, \"maxzoom\": 1, \"fields\": {\"name\": \"String\"} }, { \"id\": \"subway\", \"description\": \"\", \"minzoom\": 1, \"maxzoom\": 1, \"fields\": {\"name\": \"String\"} } ] }", "maxzoom": "1", "minzoom": "1", "name": "tests/muni/out/-z1_-Z1_-ao_-P.json.check.mbtiles", diff --git a/version.hpp b/version.hpp index 3780171..6b8335f 100644 --- a/version.hpp +++ b/version.hpp @@ -1 +1 @@ -#define VERSION "tippecanoe v1.16.1\n" +#define VERSION "tippecanoe v1.16.2\n"