From ded25a9484222b5af9a4a48dc6b2a327a136fa85 Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Fri, 21 Jul 2017 12:06:02 -0700
Subject: [PATCH 1/2] Implement property functions for line-join

---
 src/data/bucket/line_bucket.js                |   2 +-
 src/style-spec/reference/v8.json              |   5 +-
 .../property-function-dasharray/expected.png  | Bin 0 -> 2050 bytes
 .../property-function-dasharray/style.json    | 144 ++++++++++++++++++
 .../line-join/property-function/expected.png  | Bin 0 -> 1134 bytes
 .../line-join/property-function/style.json    | 143 +++++++++++++++++
 6 files changed, 292 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/render-tests/line-join/property-function-dasharray/expected.png
 create mode 100644 test/integration/render-tests/line-join/property-function-dasharray/style.json
 create mode 100644 test/integration/render-tests/line-join/property-function/expected.png
 create mode 100644 test/integration/render-tests/line-join/property-function/style.json

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index 22e9c512702..da216ebaa5f 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -96,7 +96,7 @@ class LineBucket extends Bucket {
 
     addFeature(feature: VectorTileFeature) {
         const layout = this.layers[0].layout;
-        const join = layout['line-join'];
+        const join = this.layers[0].getLayoutValue('line-join', {zoom: this.zoom}, feature.properties);
         const cap = layout['line-cap'];
         const miterLimit = layout['line-miter-limit'];
         const roundLimit = layout['line-round-limit'];
diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
index fb6940e09dd..b82f6688009 100644
--- a/src/style-spec/reference/v8.json
+++ b/src/style-spec/reference/v8.json
@@ -564,6 +564,7 @@
       "type": "enum",
       "function": "piecewise-constant",
       "zoom-function": true,
+      "property-function": true,
       "values": {
         "bevel": {
             "doc": "A join with a squared-off end which is drawn beyond the endpoint of the line at a distance of one-half of the line's width."
@@ -584,7 +585,9 @@
           "ios": "2.0.0",
           "macos": "0.1.0"
         },
-        "data-driven styling": {}
+        "data-driven styling": {
+          "js": "0.39.0"
+        }
       }
     },
     "line-miter-limit": {
diff --git a/test/integration/render-tests/line-join/property-function-dasharray/expected.png b/test/integration/render-tests/line-join/property-function-dasharray/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..fef23ec06f1b1b2fc978a0dc2ee26d2780e942a8
GIT binary patch
literal 2050
zcmV+d2>thoP)<h;3K|Lk000e1NJLTq004jh002M;1^@s6($;@}00002Nkl<ZcmeDh
ze$oH{2fIl`K~(L*dytd`0RZsde!B!GZ;ucMlQc;|#m69-X^D^ogrumMmX9<=Jx9z3
zY9(9_f&!uD)L=deZP2t79Y%a)DH>_wgI<s&K0s_RK!ua@xcmBJ|G2r?{dR93x8ExJ
z`>Cm^si~={*(oJ;y*|=f<(EJmdZG?JuwB>cg%;7ep*QLfphacvf)>%bqc?hBy8@+j
zy@xSYe)X7+2GmKr5try%Kf-j`^}w%ivb1JAk6UrK${34>WH%VU!zgKun5h6MmC+)%
zdQ3+H>Qs+07_VJ-9EGD$kDJ763Px%-L)uK86o_9vrlSFMsz(o;j^47n7<-D(V4Q|P
zM>8-}Ck5hFkLhSYo$4|M<3-yG`-{&MjFjCB%+v`f`3=Jo(f*0a3RjQmXh5Cforrm&
z-H*!@rUy<(Z@KLzziaSa(SD3O6lO3^Lm=7=JcyU&kdj|_3>9sg!qsCs8c-)wi?lZR
z^}-O*>J@Gb#w(Bh7$RC9g`0wr${-~kQ_+ArnO0+|wB_P)I(n;Kry)=VDP3=?Oxw|n
zX7tl;H4fLVS=akerUbU&Q`kkkT4d^tE$F92DP3=(O!F}x)389=Y79rHvS!M3va~yK
zrc9x<P}h4zrs2|F!of0yIw_?(tj2JJs@rDFMT@i-RF}2*nRai>BPD*TF&v@lwHb49
zGq$NdYte|i(53(>rP+kX6>k%UBUHTi@v2Ns_!pKaUK6gy&Df?m@8VUNHe(H*QM~oI
z5qF_Y5fbv-6EkIc2M^#yw2DtZ43=pl{)bk@>yBon8H9S7-o|@qQ@j9eN|2CWfF3e6
zsi~={sreX7h~HO5dlPHKD=AtVLh(w9)`n0HDe)SEd7}LqH;B&!OcHGoR*28#*juz&
zSSN>+(hb5pigO@Fi1wu7b;oYl1*;Y3B%CSQb6BA`J+V7l@P^`?ii1U4h;?#EDNZ*W
zh7&Lplf|bW221OU{V*KEu@9caRPh;vdT9eO48t)Ddt*Ls5tEeslISU|2ad&wI2wKN
zvUnYXInoBA4-(ovD_&>g3?#5Sdg>@8Mk)F2fjQEK;XnkcM;{DTy#`>YDwUF7f1IM`
z6Dd%$Q%i|gh){J4MGM6*RDzV!r7#%l748{aA=*l%8=!di;_srppmakNZvh61_O?7y
zir0pJV+Dp`y~3@;N?oTJEjS3TDBLnE({<iMFYJyD3b#m!QVRD0Uc%#e0;|v@K5xoy
z4Q|KX*dRX7Vwz0PVIh8t_r)Zob3(j@XYeSN<8_4M_ae5Um$W84h=o{=P`vKP>-em+
zcd;0^VU?IAbk1Sug_U?;^|=tYU=@CWd+@I6F$33NITm6GntZ|~RMrU?rFxx;eeEO$
z;4<`7o%Y2v)$7YRM+GF6-$2a96*vO-Vu$P!NFqRh009C7NFY>R!|)R{;4^qgv;YAD
z1PBlyK%i@k#*H`^Em$sEfB*pk1PBly&<P3UH3+kDrgl$Y0$OA`1}BO3B<@o_2Vg#q
z)$UfDC%ZFnxM+*8Livove2mcUN?b3yA7BsBW?`KiQc9P?emENA@O2%H#lx6@HXV(?
zRMEEMKBcR}BuvF<9i59-Tp-iYI8(IeutMo}#VNP|`|D^9S}{+i6LGL;3$acPDWw^L
z1{{O^(Oq`q@GvH-yaRAHPQ^gkosU*rq_PtD63)Z%=qbCoXvG3$7AVad*oZ^XU2bFX
z9hEm87h|B@zJ()I-Wm8dddls5?5)fKrMm%F$*mdJ<9?Ml7q`i6Bd*4uRaS@#@q4+g
z!6kT2nFY#Y4t^-R4>23F@S%8|i`!-QUtERTu|ws3gh}{=?EZmiSgH#I%4Zg?(NPm-
zVK$n@>m2-2M;mY@?nJBje2C-lw2uCUX;`L<1j_4LG)misYjFcUQn)s(S6*k~E@|s=
z1s0)Av=AXega{ELM5uhWViKN}_6jb><BIbE-jhd4`OU-*G-CmFh}MLSGChsOSgQO^
z#}=%>JqSg+7pu`KyBCz#`<R3UxD!vwZ8J9N=si4$-(amg61q-+Ho5JKuVGibB5f^R
zMyP8g5X!ALE|PYg%ISs{`AxzhXu@mKR$zlpO6oeHXnk=MreHEokTwhNs1AKF4VPjf
z0{l^Bw8?EROu})PjFYeoi?LM!k}9u1X5n&7z+j{>0-wVJ;@1zC;QQz&?JLrr60a}f
zCY+5?=!XQpfwg!=0g@`K9@k+i`XQmCgRmDK6rcXM6w}aGM@OR#Pm9NqxEV*FhfK%g
zKUk%ck}9Vc=HYuth;}fBV2R4B$7Q$}y=6BVJFr}3jl|D!sN7D#tN5!<NUEHVFcyc)
z?-1;XRoJ3(zKKTklG`!Zgy&V(S@^X4reGaj$96d+Rn{^Lz$p10f=g7^%Qym`m)jPM
z#vN!<86RL7#$kZ`CgCc1Bvsxc*bRrtE<}Jv@mP#e7%IDFbVE06!Lur7Gakiw)XOeJ
zfJU8=6py9Y9V4|15uj20?!gzZkB&klkwg-!@R-WlgvT%*yK0v}BN`PTAzn{ltm@Pa
zD{-K-P^KgCC-E4Dzo3^AB-G^69dBWPOiy97kGZ6pTw3u{jKd%#(2OORsAi`#SWQh$
gO-)Tr%_qSB0ZIG3iSw<)!~g&Q07*qoM6N<$g7Y%DQ2+n{

literal 0
HcmV?d00001

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
new file mode 100644
index 00000000000..7d2804ce3c2
--- /dev/null
+++ b/test/integration/render-tests/line-join/property-function-dasharray/style.json
@@ -0,0 +1,144 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 128,
+      "height": 64
+    }
+  },
+  "zoom": 0,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "miter"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  -36,
+                  16
+                ],
+                [
+                  -36,
+                  0
+                ],
+                [
+                  -20,
+                  -16
+                ],
+                [
+                  -20,
+                  16
+                ],
+                [
+                  -28,
+                  16
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "round"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  -8,
+                  16
+                ],
+                [
+                  -8,
+                  0
+                ],
+                [
+                  8,
+                  -16
+                ],
+                [
+                  8,
+                  16
+                ],
+                [
+                  0,
+                  16
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "bevel"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  20,
+                  16
+                ],
+                [
+                  20,
+                  0
+                ],
+                [
+                  36,
+                  -16
+                ],
+                [
+                  36,
+                  16
+                ],
+                [
+                  28,
+                  16
+                ]
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "line",
+      "type": "line",
+      "source": "geojson",
+      "layout": {
+        "line-join": {
+          "type": "categorical",
+          "property": "join",
+          "stops": [
+            [
+              "miter",
+              "miter"
+            ],
+            [
+              "round",
+              "round"
+            ],
+            [
+              "bevel",
+              "bevel"
+            ]
+          ]
+        }
+      },
+      "paint": {
+        "line-width": 8,
+        "line-dasharray": [1, 1]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/line-join/property-function/expected.png b/test/integration/render-tests/line-join/property-function/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4be40940a853cee30747a7ebf591c1afac220a0
GIT binary patch
literal 1134
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQcRvMjv*C{Z=~ujF)*;GgLrQb
z)^^-0Wn}np{`20=oyxm?lZ|iatg_cRYP`jzcm+r5+d{SOuT2{TR8uQ=%bc58R37y?
zSO595RWFm2t0K3GZ+Dj#b_$rHxg}QMVtr@Q8iDr$f^*LOT5PZMsQmo*ca?SbpQrDC
z|6KX>CY{rpqOvsZH=Og)yxvfu{$bh{wj;BRod2FO&-`}Ga81nQM|*q4KWfzJ^?H6h
zW{}19E7jPLefmSAIgRb1r#tGUMKw>PWpi|gp676L<=S-fmxSHgS#AbePW!*H75Z%C
zj9E|~mb5%+_lMl45exR7jaYlb;8^K>4!PqknJkfOStHke)xJOFCGU&1nn&##E`PZ;
zC5hSU%KDnmBGJ8PtFq@MS#J!=KO6i;f~{2HM3yc|=tYdZ*vfUrp|@{VX}q|zGvlH1
zs!YvqE7x7UvB16QorS!v&V+lXZ~f+~TWvn?^1a*&2Y!~jpCz{xEZfre$oH-8@w}IB
z4|?C)E&EzkY>RoL^wFIhx@RVz6L}|)&RVCqH}=t*!+V9e9=$nGeq^VF?i{_jxjX#l
z<UdHiBz1WG(Vg6jg*YGO9@l*o(<S!I>$#te#<{OIG}o?A?6*+f5zTb)%pZySqUoGb
z7NJ(z8w2M|y`i{vebRo5?+^S`xzpYW@^lunMp?L8WgF<7<GrD`_H{wP9QmZRLaduN
zv)&heuC+yAiE)qaqdP6~p4pP~1fJKe37nMh%`CasBHqC}%K3)cxwAL4)@B!Y%xO1R
z!{V53mbBI){*Ytl+C%<FB3lbz{t@=IQ9Y-2XVvMZbG99&k4!%9*phcF`4Laz<PyI{
zo%g#x8-%@Fw7~k^@z_T?hwU=&w#@G`?%};;*{C*8EL}VAqH67~=aGBbwYQY>ojZK`
z$D$<nf{1dNBkqPP_IewL7aOj)!RYhi&h8uC=O5?1t(B}l-WsvuMwyIxuif3RJW@Mi
zs^=ea(g}IP!S{L|^AC%2*Y7QTahT~SUxHKloC9_`2b13F9<}~4A?bGE9h0Va(ntA^
zNKU!8{eySmxyje0GahwVbeCvo9KRc}e%HRvyQ?yVeD`QHF0i?OoO#vj*FSo*s(5|>
zIG$`Oy4%<ua-Hi<sPF#+K{COM7SwD{Ui>Pm@9(OY7PEdVp2U*5=HQN3yZG2cF0amb
z<nILz)K#yewuD^P&UkcwmySm^M}LR8&f4q`ODg22ob%3jr2oh_W3hi#`vwMa&1(l{
z-1{MF*X^J6e*KTRC2EBd;g5NaN=XPW^v}2H++48mKS;&x-t!NImwjjA^L$-u)4JO5
ze!Yo7o1yWA3(@Bv3tcVY>U$J(blQW+y@h;g2JY-qn_iwdc;Ddu|0+iD>iMrH`#x9M
vmLzG{!*=heVvOeMxvroLt8@Av{~zwFe*4;w3kW9y3lIiRS3j3^P6<r_h*%@S

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/line-join/property-function/style.json b/test/integration/render-tests/line-join/property-function/style.json
new file mode 100644
index 00000000000..ceda727e423
--- /dev/null
+++ b/test/integration/render-tests/line-join/property-function/style.json
@@ -0,0 +1,143 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 128,
+      "height": 64
+    }
+  },
+  "zoom": 0,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "miter"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  -36,
+                  16
+                ],
+                [
+                  -36,
+                  0
+                ],
+                [
+                  -20,
+                  -16
+                ],
+                [
+                  -20,
+                  16
+                ],
+                [
+                  -28,
+                  16
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "round"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  -8,
+                  16
+                ],
+                [
+                  -8,
+                  0
+                ],
+                [
+                  8,
+                  -16
+                ],
+                [
+                  8,
+                  16
+                ],
+                [
+                  0,
+                  16
+                ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "join": "bevel"
+            },
+            "geometry": {
+              "type": "LineString",
+              "coordinates": [
+                [
+                  20,
+                  16
+                ],
+                [
+                  20,
+                  0
+                ],
+                [
+                  36,
+                  -16
+                ],
+                [
+                  36,
+                  16
+                ],
+                [
+                  28,
+                  16
+                ]
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "line",
+      "type": "line",
+      "source": "geojson",
+      "layout": {
+        "line-join": {
+          "type": "categorical",
+          "property": "join",
+          "stops": [
+            [
+              "miter",
+              "miter"
+            ],
+            [
+              "round",
+              "round"
+            ],
+            [
+              "bevel",
+              "bevel"
+            ]
+          ]
+        }
+      },
+      "paint": {
+        "line-width": 8
+      }
+    }
+  ]
+}

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 2/2] 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": {