Merge branch 'master' into fuzz-pipe

1 files changed, 51 insertions, 51 deletions

diff --git a/bin/style.json b/bin/style.json
index 4044e45626..a26a37f2fa 100755
--- a/bin/style.json
+++ b/bin/style.json
@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sprite": "https://www.mapbox.com/mapbox-gl-styles/sprites/outdoors",
-  "glyphs": "https://mapbox.s3.amazonaws.com/gl-glyphs-256/{{fontstack}}/{{range}}.pbf",
+  "glyphs": "https://mapbox.s3.amazonaws.com/gl-glyphs-256/{fontstack}/{range}.pbf",
   "sources": {
     "mapbox": {
       "type": "vector",
@@ -1734,10 +1734,10 @@
     "id": "country_label",
     "source": "mapbox",
     "source-layer": "country_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
       "text-max-size": 24,
@@ -1759,10 +1759,10 @@
     "id": "marine_label_line_1",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "line", "labelrank": 1 },
+    "filter": { "$type": "LineString", "labelrank": 1 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 30,
@@ -1789,10 +1789,10 @@
     "id": "marine_label_line_2",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "line", "labelrank": 2 },
+    "filter": { "$type": "LineString", "labelrank": 2 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 24,
@@ -1818,10 +1818,10 @@
     "id": "marine_label_line_3",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "line", "labelrank": 3 },
+    "filter": { "$type": "LineString", "labelrank": 3 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 18,
@@ -1847,10 +1847,10 @@
     "id": "marine_label_line_other",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "line", "labelrank": [4, 5, 6] },
+    "filter": { "$type": "LineString", "labelrank": [4, 5, 6] },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 16,
@@ -1876,10 +1876,10 @@
     "id": "marine_label_point_1",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "point", "labelrank": 1 },
+    "filter": { "$type": "Point", "labelrank": 1 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 30,
@@ -1907,10 +1907,10 @@
     "id": "marine_label_point_2",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "point", "labelrank": 2 },
+    "filter": { "$type": "Point", "labelrank": 2 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 24,
@@ -1938,10 +1938,10 @@
     "id": "marine_label_point_3",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "point", "labelrank": 3 },
+    "filter": { "$type": "Point", "labelrank": 3 },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 18,
@@ -1969,10 +1969,10 @@
     "id": "marine_label_point_other",
     "source": "mapbox",
     "source-layer": "marine_label",
-    "filter": { "$type": "point", "labelrank": [4, 5, 6] },
+    "filter": { "$type": "Point", "labelrank": [4, 5, 6] },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 16,
@@ -2000,10 +2000,10 @@
     "id": "state_label",
     "source": "mapbox",
     "source-layer": "state_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Regular, Arial Unicode MS Regular",
       "text-max-size": 16,
@@ -2031,10 +2031,10 @@
     "id": "place_label_city",
     "source": "mapbox",
     "source-layer": "place_label",
-    "filter": { "type": "city", "$type": "point" },
+    "filter": { "type": "city", "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
       "text-max-size": 20,
@@ -2062,10 +2062,10 @@
     "id": "place_label_town",
     "source": "mapbox",
     "source-layer": "place_label",
-    "filter": { "type": "town", "$type": "point" },
+    "filter": { "type": "town", "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
       "text-max-size": 24,
@@ -2093,10 +2093,10 @@
     "id": "place_label_village",
     "source": "mapbox",
     "source-layer": "place_label",
-    "filter": { "type": "village", "$type": "point" },
+    "filter": { "type": "village", "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
       "text-max-size": 22,
@@ -2124,10 +2124,10 @@
     "id": "place_label_other",
     "source": "mapbox",
     "source-layer": "place_label",
-    "filter": { "type": ["hamlet", "suburb", "neighbourhood"], "$type": "point" },
+    "filter": { "type": ["hamlet", "suburb", "neighbourhood"], "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
       "text-max-size": 18,
@@ -2154,10 +2154,10 @@
     "id": "road_label_1",
     "source": "mapbox",
     "source-layer": "road_label",
-    "filter": { "class": ["motorway", "main"], "$type": "line" },
+    "filter": { "class": ["motorway", "main"], "$type": "LineString" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-padding": 2,
       "text-font": "Open Sans Regular, Arial Unicode MS Regular",
@@ -2180,10 +2180,10 @@
     "id": "road_label_2",
     "source": "mapbox",
     "source-layer": "road_label",
-    "filter": { "class": ["street", "street_limited"], "$type": "line" },
+    "filter": { "class": ["street", "street_limited"], "$type": "LineString" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-padding": 2,
       "text-font": "Open Sans Regular, Arial Unicode MS Regular",
@@ -2206,10 +2206,10 @@
     "id": "road_label_3",
     "source": "mapbox",
     "source-layer": "road_label",
-    "filter": { "class": ["service", "driveway", "path"], "$type": "line" },
+    "filter": { "class": ["service", "driveway", "path"], "$type": "LineString" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-padding": 2,
       "text-font": "Open Sans Regular, Arial Unicode MS Regular",
@@ -2232,11 +2232,11 @@
     "id": "contour_label",
     "source": "mapbox",
     "source-layer": "contour",
-    "filter": { "index": [5, 10], "$type": "line" },
+    "filter": { "index": [5, 10], "$type": "LineString" },
     "render": {
       "type": "text",
       "text-path": "curve",
-      "text-field": "{{ele}} m",
+      "text-field": "{ele} m",
       "text-font": "Open Sans Regular, Arial Unicode MS Regular",
       "text-max-size": 10,
       "text-max-angle": 0.5
@@ -2257,10 +2257,10 @@
     "id": "water_label",
     "source": "mapbox",
     "source-layer": "water_label",
-    "filter": { "$type": "point" },
+    "filter": { "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 12,
@@ -2278,10 +2278,10 @@
     "id": "waterway_label",
     "source": "mapbox",
     "source-layer": "waterway_label",
-    "filter": { "$type": "line" },
+    "filter": { "$type": "LineString" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "curve",
       "text-font": "Open Sans Semibold Italic, Arial Unicode MS Bold",
       "text-max-size": 12,
@@ -2303,7 +2303,7 @@
     "filter": { "scalerank": [1, 2] },
     "render": {
       "type": "icon",
-      "icon-image": "{{maki}}-12",
+      "icon-image": "{maki}-12",
       "icon-size": 12
     },
     "style.night": {}
@@ -2311,10 +2311,10 @@
     "id": "poi_label_1-2",
     "source": "mapbox",
     "source-layer": "poi_label",
-    "filter": { "scalerank": [1, 2], "$type": "point" },
+    "filter": { "scalerank": [1, 2], "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-padding": 2,
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
@@ -2341,7 +2341,7 @@
     "filter": { "scalerank": 3 },
     "render": {
       "type": "icon",
-      "icon-image": "{{maki}}-12",
+      "icon-image": "{maki}-12",
       "icon-size": 12
     },
     "style": {
@@ -2360,10 +2360,10 @@
     "id": "poi_label_3",
     "source": "mapbox",
     "source-layer": "poi_label",
-    "filter": { "scalerank": 3, "$type": "point" },
+    "filter": { "scalerank": 3, "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-padding": 2,
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
@@ -2398,7 +2398,7 @@
     "filter": { "scalerank": 4 },
     "render": {
       "type": "icon",
-      "icon-image": "{{maki}}-12",
+      "icon-image": "{maki}-12",
       "icon-size": 12
     },
     "style": {
@@ -2417,10 +2417,10 @@
     "id": "poi_label_4",
     "source": "mapbox",
     "source-layer": "poi_label",
-    "filter": { "scalerank": 4, "$type": "point" },
+    "filter": { "scalerank": 4, "$type": "Point" },
     "render": {
       "type": "text",
-      "text-field": "{{name_en}}",
+      "text-field": "{name_en}",
       "text-path": "horizontal",
       "text-padding": 2,
       "text-font": "Open Sans Semibold, Arial Unicode MS Bold",
@@ -2455,7 +2455,7 @@
     "filter": { "maki": "airport" },
     "render": {
       "type": "icon",
-      "icon-image": "{{maki}}-12",
+      "icon-image": "{maki}-12",
       "icon-size": 12
     },
     "style": {