From f23451a1d75f250c4540187d06ccddfa4aaec46b Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Tue, 1 Jul 2014 16:32:38 +0300
Subject: [PATCH 1/2] switch to new $type names, take 2

---
 js/style/bucket-filter.js  | 6 +++---
 js/worker/workertile.js    | 6 ++----
 package.json               | 2 +-
 test/bucket-filter.test.js | 6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/js/style/bucket-filter.js b/js/style/bucket-filter.js
index cae39c0bca2..966b06b168b 100644
--- a/js/style/bucket-filter.js
+++ b/js/style/bucket-filter.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var VectorTileFeature = require('vector-tile').VectorTileFeature;
+
 function infix(operator) {
     return function(left, right) { return left + ' ' + operator + ' ' + right; };
 }
@@ -29,8 +31,6 @@ var objOperators = {
     '!': not, '$not': not
 };
 
-var geometryTypeToName = [null, 'point', 'line', 'polygon'];
-
 module.exports = function (filter) {
     // simple key & value comparison
     function valueFilter(key, value, operator) {
@@ -76,7 +76,7 @@ module.exports = function (filter) {
     }
 
     function typeFilter(type) {
-        return 'f._type === ' + geometryTypeToName.indexOf(type);
+        return 'f.type === ' + VectorTileFeature.types.indexOf(type);
     }
 
     function fieldsFilter(obj) {
diff --git a/js/worker/workertile.js b/js/worker/workertile.js
index bfeeb9e1914..c18ba7af607 100644
--- a/js/worker/workertile.js
+++ b/js/worker/workertile.js
@@ -137,7 +137,7 @@ WorkerTile.prototype.parse = function(data, callback) {
             parseBucket(tile, bucket);
         }
     }
-    
+
     function dependenciesDone(bucket) {
         return function(err) {
             bucket.dependenciesLoaded = true;
@@ -261,13 +261,11 @@ function sortLayerIntoBuckets(layer, mapping, buckets) {
     }
 }
 
-var geometryTypeToName = [null, 'point', 'line', 'polygon'];
-
 function getGeometry(feature) {
     return feature.loadGeometry();
 }
 
 function getType(feature) {
-    return geometryTypeToName[feature._type];
+    return vt.VectorTileFeature.types[feature.type];
 }
 
diff --git a/package.json b/package.json
index d94f5f5e98d..50efb976caf 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "queue-async": "^1.0.7",
     "rbush": "~1.3.2",
     "unitbezier": "0.0.0",
-    "vector-tile": "0.0.5",
+    "vector-tile": "0.1.1",
     "point-geometry": "0.0.0"
   },
   "devDependencies": {
diff --git a/test/bucket-filter.test.js b/test/bucket-filter.test.js
index 59a70043a06..3ea6e907554 100644
--- a/test/bucket-filter.test.js
+++ b/test/bucket-filter.test.js
@@ -145,9 +145,9 @@ test('bucketFilter', function(t) {
     });
 
     t.test('filters by type', function(t) {
-        var f = filter({'$type': 'line'});
-        t.ok(f({_type: 2, properties: {}}));
-        t.notOk(f({_type: 1, properties: {}}));
+        var f = filter({'$type': 'LineString'});
+        t.ok(f({type: 2, properties: {}}));
+        t.notOk(f({type: 1, properties: {}}));
         t.end();
     });
 });

From a8843176c19867817ccf50b1300d8478b4b6e425 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Thu, 3 Jul 2014 12:55:03 +0300
Subject: [PATCH 2/2] update types in debug styles

---
 debug/style-basic-v3.json | 4 ++--
 debug/style-v3.json       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debug/style-basic-v3.json b/debug/style-basic-v3.json
index 09ac6dbfa9d..ddd21656785 100644
--- a/debug/style-basic-v3.json
+++ b/debug/style-basic-v3.json
@@ -132,7 +132,7 @@
     "id": "country_label",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "country_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
       "text-field": "{{name}}",
@@ -150,7 +150,7 @@
     "id": "road_label",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "road_label",
-    "filter": { "$type": "line" },
+    "filter": { "$type": "LineString" },
     "render": {
       "type": "text",
       "text-field": "{{name}}",
diff --git a/debug/style-v3.json b/debug/style-v3.json
index c26b3601104..64ef668442b 100644
--- a/debug/style-v3.json
+++ b/debug/style-v3.json
@@ -537,7 +537,7 @@
     "id": "country_label",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "country_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
       "text-field": "{{name}}",
@@ -555,7 +555,7 @@
     "id": "place_label",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "place_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
       "text-field": "{{name}}",
@@ -573,7 +573,7 @@
     "id": "road_label",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "road_label",
-    "filter": { "$type": "line" },
+    "filter": { "$type": "LineString" },
     "render": {
       "type": "text",
       "text-field": "{{name}}",
@@ -612,7 +612,7 @@
     "id": "road_markers",
     "source": "mapbox.mapbox-streets-v5",
     "source-layer": "road",
-    "filter": { "oneway": 1, "$type": "line" },
+    "filter": { "oneway": 1, "$type": "LineString" },
     "render": {
       "type": "icon",
       "icon-image": "bicycle-12",