From 2e5e6dbc9e0774c889d44a397bc6116d21e2f7c6 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 18 Jul 2016 13:24:51 -0700 Subject: [PATCH 1/4] Update to feature-filter 2.2.0 This release adds support for `$id` keys: https://github.com/mapbox/mapbox-gl-style-spec/issues/391 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25e5143919c..ede95dfc9b1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "csscolorparser": "^1.0.2", "earcut": "^2.0.3", - "feature-filter": "^2.1.0", + "feature-filter": "^2.2.0", "geojson-rewind": "^0.1.0", "geojson-vt": "^2.3.0", "gl-matrix": "^2.3.1", From 5a5d1962457d61a4682abde3a76367a9cae9125f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 18 Jul 2016 17:37:06 -0700 Subject: [PATCH 2/4] Update to vector-tile 1.3.0 This release adds a public "id" property to VectorTileFeature: https://github.com/mapbox/vector-tile-js/issues/43 --- js/util/vectortile_to_geojson.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/util/vectortile_to_geojson.js b/js/util/vectortile_to_geojson.js index aa3faa475ca..880ac0df753 100644 --- a/js/util/vectortile_to_geojson.js +++ b/js/util/vectortile_to_geojson.js @@ -10,8 +10,8 @@ function Feature(vectorTileFeature, z, x, y) { this.properties = vectorTileFeature.properties; - if (vectorTileFeature._id) { - this.id = vectorTileFeature._id; + if (vectorTileFeature.id) { + this.id = vectorTileFeature.id; } } diff --git a/package.json b/package.json index ede95dfc9b1..107ec21e0cb 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "supercluster": "^2.0.1", "unassertify": "^2.0.0", "unitbezier": "^0.0.0", - "vector-tile": "1.2.1", + "vector-tile": "^1.3.0", "vt-pbf": "^2.0.2", "webworkify": "^1.3.0", "whoots-js": "^2.0.0" From 8479d07fff413a2224953bfe92827f1f60665ba1 Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Wed, 10 Aug 2016 18:22:30 +0300 Subject: [PATCH 3/4] update to geojson-vt 2.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 107ec21e0cb..edab44369de 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "earcut": "^2.0.3", "feature-filter": "^2.2.0", "geojson-rewind": "^0.1.0", - "geojson-vt": "^2.3.0", + "geojson-vt": "^2.4.0", "gl-matrix": "^2.3.1", "grid-index": "^1.0.0", "mapbox-gl-function": "^1.2.1", From 1dd37e549b2856147fe231deb02c7e963ad678bb Mon Sep 17 00:00:00 2001 From: Vladimir Agafonkin Date: Wed, 10 Aug 2016 18:55:37 +0300 Subject: [PATCH 4/4] make sure id=0 works for geojson --- js/util/vectortile_to_geojson.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/util/vectortile_to_geojson.js b/js/util/vectortile_to_geojson.js index 880ac0df753..6d415119e36 100644 --- a/js/util/vectortile_to_geojson.js +++ b/js/util/vectortile_to_geojson.js @@ -10,7 +10,7 @@ function Feature(vectorTileFeature, z, x, y) { this.properties = vectorTileFeature.properties; - if (vectorTileFeature.id) { + if (vectorTileFeature.id != null) { this.id = vectorTileFeature.id; } }