From 98cf4d94aa10b2269956dd6fc7d349654683492d Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 22 Dec 2017 14:34:37 -0800 Subject: [PATCH] Don't accept features or geometries inside another object's properties --- CHANGELOG.md | 5 +++ geojson-loop.cpp | 32 +++++++++++++++++++ jsontool.cpp | 5 +-- tests/nested/in.json | 9 ++++++ .../out/-z0_--preserve-input-order.json | 30 +++++++++++++++++ version.hpp | 2 +- 6 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 tests/nested/in.json create mode 100644 tests/nested/out/-z0_--preserve-input-order.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 0521c5c..4b34f66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.31.2 + +* Don't accept anything inside another JSON object's properties as a + feature or geometry of its own. + ## 1.31.1 * Add --exclude-all to tile-join diff --git a/geojson-loop.cpp b/geojson-loop.cpp index e1f0ac4..7ca0d51 100644 --- a/geojson-loop.cpp +++ b/geojson-loop.cpp @@ -93,6 +93,20 @@ void parse_json(json_feature_action *jfa, json_pull *jp) { } } + if (is_geometry) { + json_object *jo = j; + while (jo != NULL) { + if (jo->parent != NULL && jo->parent->type == JSON_HASH) { + if (json_hash_get(jo->parent, "properties") == jo) { + // Ancestor is the value corresponding to a properties key + is_geometry = 0; + break; + } + } + jo = jo->parent; + } + } + if (is_geometry) { if (found_features != 0 && found_geometries == 0) { fprintf(stderr, "%s:%d: Warning: found a mixture of features and bare geometries\n", jfa->fname.c_str(), jp->line); @@ -135,6 +149,24 @@ void parse_json(json_feature_action *jfa, json_pull *jp) { continue; } + bool is_feature = true; + { + json_object *jo = j; + while (jo != NULL) { + if (jo->parent != NULL && jo->parent->type == JSON_HASH) { + if (json_hash_get(jo->parent, "properties") == jo) { + // Ancestor is the value corresponding to a properties key + is_feature = false; + break; + } + } + jo = jo->parent; + } + } + if (!is_feature) { + continue; + } + json_object *tippecanoe = json_hash_get(j, "tippecanoe"); json_object *id = json_hash_get(j, "id"); diff --git a/jsontool.cpp b/jsontool.cpp index 0bf2f67..0dcc0b8 100644 --- a/jsontool.cpp +++ b/jsontool.cpp @@ -364,7 +364,7 @@ void join_csv(json_object *j) { } struct json_join_action : json_feature_action { - int add_feature(json_object *geometry, bool geometrycollection, json_object *properties, json_object *id, json_object *tippecanoe, json_object *feature) { + int add_feature(json_object *geometry, bool, json_object *, json_object *, json_object *, json_object *feature) { if (feature != NULL) { if (csvfile != NULL) { join_csv(feature); @@ -382,7 +382,7 @@ struct json_join_action : json_feature_action { return 1; } - void check_crs(json_object *j) { + void check_crs(json_object *) { } }; @@ -390,6 +390,7 @@ void process(FILE *fp, const char *fname) { json_pull *jp = json_begin_file(fp); json_join_action jja; + jja.fname = fname; parse_json(&jja, jp); json_end(jp); } diff --git a/tests/nested/in.json b/tests/nested/in.json new file mode 100644 index 0000000..0ab98c7 --- /dev/null +++ b/tests/nested/in.json @@ -0,0 +1,9 @@ +{"type":"Feature","properties":{"nested2":{"type":"Point","coordinates":[2,2]}},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} +{"type":"Feature","properties":{"deeper2":[{"type":"Point","coordinates":[2,2]}]},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} +{"type":"Feature","properties":{"more2":{"something":{"type":"Point","coordinates":[2,2]}}},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} + +{"type":"Feature","properties":{"nested":{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[2,2]}}},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} +{"type":"Feature","properties":{"deeper":[{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[2,2]}}]},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} +{"type":"Feature","properties":{"more":{"something":{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[2,2]}}}},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} + +{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[0,0],[1,1]]}} diff --git a/tests/nested/out/-z0_--preserve-input-order.json b/tests/nested/out/-z0_--preserve-input-order.json new file mode 100644 index 0000000..6539e98 --- /dev/null +++ b/tests/nested/out/-z0_--preserve-input-order.json @@ -0,0 +1,30 @@ +{ "type": "FeatureCollection", "properties": { +"bounds": "0.000000,0.000000,1.000000,1.000000", +"center": "0.000000,0.000000,0", +"description": "tests/nested/out/-z0_--preserve-input-order.json.check.mbtiles", +"format": "pbf", +"json": "{\"vector_layers\": [ { \"id\": \"in\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {\"deeper\": \"String\", \"deeper2\": \"String\", \"more\": \"String\", \"more2\": \"String\", \"nested\": \"String\", \"nested2\": \"String\"} } ],\"tilestats\": {\"layerCount\": 1,\"layers\": [{\"layer\": \"in\",\"count\": 7,\"geometry\": \"LineString\",\"attributeCount\": 6,\"attributes\": [{\"attribute\": \"deeper\",\"count\": 1,\"type\": \"string\",\"values\": [\"[{\\\"type\\\":\\\"Feature\\\",\\\"properties\\\":{},\\\"geometry\\\":{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}}]\"]},{\"attribute\": \"deeper2\",\"count\": 1,\"type\": \"string\",\"values\": [\"[{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}]\"]},{\"attribute\": \"more\",\"count\": 1,\"type\": \"string\",\"values\": [\"{\\\"something\\\":{\\\"type\\\":\\\"Feature\\\",\\\"properties\\\":{},\\\"geometry\\\":{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}}}\"]},{\"attribute\": \"more2\",\"count\": 1,\"type\": \"string\",\"values\": [\"{\\\"something\\\":{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}}\"]},{\"attribute\": \"nested\",\"count\": 1,\"type\": \"string\",\"values\": [\"{\\\"type\\\":\\\"Feature\\\",\\\"properties\\\":{},\\\"geometry\\\":{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}}\"]},{\"attribute\": \"nested2\",\"count\": 1,\"type\": \"string\",\"values\": [\"{\\\"type\\\":\\\"Point\\\",\\\"coordinates\\\":[2,2]}\"]}]}]}}", +"maxzoom": "0", +"minzoom": "0", +"name": "tests/nested/out/-z0_--preserve-input-order.json.check.mbtiles", +"type": "overlay", +"version": "2" +}, "features": [ +{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [ +{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "properties": { "nested2": "{\"type\":\"Point\",\"coordinates\":[2,2]}" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { "deeper2": "[{\"type\":\"Point\",\"coordinates\":[2,2]}]" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { "more2": "{\"something\":{\"type\":\"Point\",\"coordinates\":[2,2]}}" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { "nested": "{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[2,2]}}" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { "deeper": "[{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[2,2]}}]" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { "more": "{\"something\":{\"type\":\"Feature\",\"properties\":{},\"geometry\":{\"type\":\"Point\",\"coordinates\":[2,2]}}}" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +, +{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ 0.000000, 0.000000 ], [ 0.966797, 1.054628 ] ] } } +] } +] } +] } diff --git a/version.hpp b/version.hpp index c55bd3c..c26198a 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "v1.31.1" +#define VERSION "v1.31.2" #endif