Rebase + update

mapbox · Jul 24, 2017 · bc52b9e · bc52b9e
1 parent ded25a9
commit bc52b9e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
@@ -586,7 +586,7 @@
           "macos": "0.1.0"
         },
         "data-driven styling": {
-          "js": "0.39.0"
+          "js": "0.40.0"
         }
       }
     },

diff --git a/test/integration/render-tests/line-join/property-function-dasharray/style.json b/test/integration/render-tests/line-join/property-function-dasharray/style.json
@@ -117,22 +117,8 @@
       "source": "geojson",
       "layout": {
         "line-join": {
-          "type": "categorical",
-          "property": "join",
-          "stops": [
-            [
-              "miter",
-              "miter"
-            ],
-            [
-              "round",
-              "round"
-            ],
-            [
-              "bevel",
-              "bevel"
-            ]
-          ]
+          "type": "identity",
+          "property": "join"
         }
       },
       "paint": {

diff --git a/test/integration/render-tests/line-join/property-function/style.json b/test/integration/render-tests/line-join/property-function/style.json
@@ -117,22 +117,8 @@
       "source": "geojson",
       "layout": {
         "line-join": {
-          "type": "categorical",
-          "property": "join",
-          "stops": [
-            [
-              "miter",
-              "miter"
-            ],
-            [
-              "round",
-              "round"
-            ],
-            [
-              "bevel",
-              "bevel"
-            ]
-          ]
+          "type": "identity",
+          "property": "join"
         }
       },
       "paint": {