From bc52b9e8d1fc22be3f0ba0b878e70cf7848c84f8 Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Mon, 24 Jul 2017 15:17:26 -0700
Subject: [PATCH] Rebase + update

---
 src/style-spec/reference/v8.json               |  2 +-
 .../property-function-dasharray/style.json     | 18 ++----------------
 .../line-join/property-function/style.json     | 18 ++----------------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
index b82f6688009..7062b240902 100644
--- 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
index 7d2804ce3c2..e1cfe7a60a1 100644
--- 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
index ceda727e423..d73fcb76747 100644
--- 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": {