From a2712f6fa439af976f7c17685b78340cb14d67a1 Mon Sep 17 00:00:00 2001 From: Asheem Mamoowala Date: Mon, 28 Aug 2017 15:02:56 -0700 Subject: [PATCH] Update to gejson 0.4.2 and add StyleParser test to verify that GeoJSON without `properties` field can be loaded --- CMakeLists.txt | 2 +- .../style_parser/geojson-missing-properties.info.json | 6 ++++++ .../style_parser/geojson-missing-properties.style.json | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/style_parser/geojson-missing-properties.info.json create mode 100644 test/fixtures/style_parser/geojson-missing-properties.style.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 64dde928c..530461d1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ mason_use(kdbush VERSION 0.1.1-1 HEADER_ONLY) mason_use(earcut VERSION 0.12.3 HEADER_ONLY) mason_use(protozero VERSION 1.5.2 HEADER_ONLY) mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) -mason_use(geojson VERSION 0.4.0 HEADER_ONLY) +mason_use(geojson VERSION 0.4.2 HEADER_ONLY) mason_use(polylabel VERSION 1.0.3 HEADER_ONLY) mason_use(wagyu VERSION 0.4.3 HEADER_ONLY) mason_use(shelf-pack VERSION 2.1.1 HEADER_ONLY) diff --git a/test/fixtures/style_parser/geojson-missing-properties.info.json b/test/fixtures/style_parser/geojson-missing-properties.info.json new file mode 100644 index 000000000..9c25a2f48 --- /dev/null +++ b/test/fixtures/style_parser/geojson-missing-properties.info.json @@ -0,0 +1,6 @@ +{ + "default": { + "log": [ + ] + } +} diff --git a/test/fixtures/style_parser/geojson-missing-properties.style.json b/test/fixtures/style_parser/geojson-missing-properties.style.json new file mode 100644 index 000000000..fc4fe97c7 --- /dev/null +++ b/test/fixtures/style_parser/geojson-missing-properties.style.json @@ -0,0 +1,9 @@ +{ + "version": 8, + "sources": { + "mapbox": { + "type": "geojson", + "data": { "type": "Feature", "geometry": { "type": "Point", "coordinates": [100.0, 0.0] } } + } + } +}