From 3a1f074c962ef1f4af9c7a5abbca21313ccb32f1 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 1 Mar 2017 16:01:57 -0800 Subject: [PATCH] Add test and documentation for tippecanoe-decode -l --- CHANGELOG.md | 4 ++ Makefile | 9 +++- README.md | 1 + man/tippecanoe.1 | 2 + tests/muni/decode/multi.mbtiles.json | 63 ++++++++++++++++++++++++++++ version.hpp | 2 +- 6 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/muni/decode/multi.mbtiles.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 91a3b88..a8c9544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.16.10 + +* Add a tippecanoe-decode option to specify layer names + ## 1.16.9 * Clean up layer name handling to fix layer merging crash diff --git a/Makefile b/Makefile index 12b3a2d..8e3f7fa 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ indent: TESTS = $(wildcard tests/*/out/*.json) SPACE = $(NULL) $(NULL) -test: tippecanoe tippecanoe-decode $(addsuffix .check,$(TESTS)) parallel-test pbf-test join-test enumerate-test unit +test: tippecanoe tippecanoe-decode $(addsuffix .check,$(TESTS)) parallel-test pbf-test join-test enumerate-test decode-test unit ./unit # Work around Makefile and filename punctuation limits: _ for space, @ for :, % for / @@ -111,6 +111,13 @@ parallel-test: cmp tests/parallel/linear-file.json tests/parallel/parallel-pipes.json rm tests/parallel/*.mbtiles tests/parallel/*.json +decode-test: + mkdir -p tests/muni/decode + ./tippecanoe -z11 -Z11 -f -o tests/muni/decode/multi.mbtiles tests/muni/*.json + ./tippecanoe-decode -l subway tests/muni/decode/multi.mbtiles > tests/muni/decode/multi.mbtiles.json.check + cmp tests/muni/decode/multi.mbtiles.json.check tests/muni/decode/multi.mbtiles.json + rm -f tests/muni/decode/multi.mbtiles.json.check tests/muni/decode/multi.mbtiles + pbf-test: ./tippecanoe-decode tests/pbf/11-328-791.vector.pbf 11 328 791 > tests/pbf/11-328-791.vector.pbf.out cmp tests/pbf/11-328-791.json tests/pbf/11-328-791.vector.pbf.out diff --git a/README.md b/README.md index 38bd37f..7ece228 100644 --- a/README.md +++ b/README.md @@ -411,3 +411,4 @@ resolutions. * -t _projection_: Specify the projection of the output data. Currently supported are EPSG:4326 (WGS84, the default) and EPSG:3857 (Web Mercator). * -z _maxzoom_: Specify the highest zoom level to decode from the tileset * -Z _minzoom_: Specify the lowest zoom level to decode from the tileset + * -l _layer_: Decode only layers with the specified names. (Multiple `-l` options can be specified.) diff --git a/man/tippecanoe.1 b/man/tippecanoe.1 index 279681d..5d36924 100644 --- a/man/tippecanoe.1 +++ b/man/tippecanoe.1 @@ -484,4 +484,6 @@ resolutions. \-z \fImaxzoom\fP: Specify the highest zoom level to decode from the tileset .IP \(bu 2 \-Z \fIminzoom\fP: Specify the lowest zoom level to decode from the tileset +.IP \(bu 2 +\-l \fIlayer\fP: Decode only layers with the specified names. (Multiple \fB\fC\-l\fR options can be specified.) .RE diff --git a/tests/muni/decode/multi.mbtiles.json b/tests/muni/decode/multi.mbtiles.json new file mode 100644 index 0000000..6a42a89 --- /dev/null +++ b/tests/muni/decode/multi.mbtiles.json @@ -0,0 +1,63 @@ +{ "type": "FeatureCollection", "properties": { +"bounds": "-122.538670,37.705764,-12.240000,37.836443", +"center": "-122.431641,37.788049,11", +"description": "tests/muni/decode/multi.mbtiles", +"format": "pbf", +"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/decode/multi.mbtiles", +"type": "overlay", +"version": "2" +}, "features": [ +{ "type": "FeatureCollection", "properties": { "zoom": 11, "x": 326, "y": 791 }, "features": [ +] } +, +{ "type": "FeatureCollection", "properties": { "zoom": 11, "x": 327, "y": 792 }, "features": [ +] } +, +{ "type": "FeatureCollection", "properties": { "zoom": 11, "x": 327, "y": 791 }, "features": [ +{ "type": "FeatureCollection", "properties": { "layer": "subway", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "properties": { "name": "Metro Castro Station/Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.435331, 37.762708 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Castro Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.435246, 37.762641 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Forest Hill Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.458634, 37.748356 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Montgomery Station/Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.402158, 37.788794 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Montgomery Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.401943, 37.788726 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Embarcadero Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.396579, 37.793033 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Embarcadero Station" }, "geometry": { "type": "Point", "coordinates": [ -122.396450, 37.793168 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Embarcadero Station" }, "geometry": { "type": "Point", "coordinates": [ -122.396407, 37.793168 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Civic Center Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.412543, 37.780348 ] } } +, +{ "type": "Feature", "properties": { "name": "Van Ness Station Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.419367, 37.775260 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Van Ness Station/Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.419281, 37.775159 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Van Ness Station" }, "geometry": { "type": "Point", "coordinates": [ -122.419195, 37.775091 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Van Ness Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.419281, 37.775057 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Civic Center Station/Outbd" }, "geometry": { "type": "Point", "coordinates": [ -122.415032, 37.778686 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Civic Center Station/Downtn" }, "geometry": { "type": "Point", "coordinates": [ -122.414818, 37.778551 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Church Station/Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.429323, 37.767356 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Church Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.429194, 37.767221 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Powell Station/Outbound" }, "geometry": { "type": "Point", "coordinates": [ -122.407823, 37.784317 ] } } +, +{ "type": "Feature", "properties": { "name": "Metro Powell Station/Downtown" }, "geometry": { "type": "Point", "coordinates": [ -122.407737, 37.784215 ] } } +] } +] } +, +{ "type": "FeatureCollection", "properties": { "zoom": 11, "x": 954, "y": 791 }, "features": [ +] } +] } diff --git a/version.hpp b/version.hpp index adece8f..4d70e23 100644 --- a/version.hpp +++ b/version.hpp @@ -1 +1 @@ -#define VERSION "tippecanoe v1.16.9\n" +#define VERSION "tippecanoe v1.16.10\n"