From 55d8eb288c42064666fa60c9a37c5f280da37b5a Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Wed, 22 Jan 2020 23:15:11 +0200
Subject: [PATCH] Fix promoteId for line layers (#9210)

* fix promoteId for line layers

* fix promoteId spec definitions (#9212)

* Add render tests for feature state
feature-state/promote-id-line will fail until #9210 is merged

Co-authored-by: Karim Naaji <karim.naaji@gmail.com>
---
 src/data/bucket/line_bucket.js                |   4 +-
 .../promote-id-circle/expected.png            | Bin 0 -> 350 bytes
 .../style.json                                |   0
 .../promote-id-fill-extrusion/expected.png    | Bin 0 -> 2196 bytes
 .../promote-id-fill-extrusion/style.json      | 161 ++++++++++++++++++
 .../promote-id-fill/expected.png              | Bin 0 -> 126 bytes
 .../feature-state/promote-id-fill/style.json  | 114 +++++++++++++
 .../promote-id-line/expected.png              | Bin 0 -> 166 bytes
 .../feature-state/promote-id-line/style.json  | 116 +++++++++++++
 .../promote-id-symbol/expected.png            | Bin 0 -> 564 bytes
 .../promote-id-symbol/style.json              | 103 +++++++++++
 .../feature-state/promote-id/expected.png     | Bin 349 -> 0 bytes
 12 files changed, 496 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/render-tests/feature-state/promote-id-circle/expected.png
 rename test/integration/render-tests/feature-state/{promote-id => promote-id-circle}/style.json (100%)
 create mode 100644 test/integration/render-tests/feature-state/promote-id-fill-extrusion/expected.png
 create mode 100644 test/integration/render-tests/feature-state/promote-id-fill-extrusion/style.json
 create mode 100644 test/integration/render-tests/feature-state/promote-id-fill/expected.png
 create mode 100644 test/integration/render-tests/feature-state/promote-id-fill/style.json
 create mode 100644 test/integration/render-tests/feature-state/promote-id-line/expected.png
 create mode 100644 test/integration/render-tests/feature-state/promote-id-line/style.json
 create mode 100644 test/integration/render-tests/feature-state/promote-id-symbol/expected.png
 create mode 100644 test/integration/render-tests/feature-state/promote-id-symbol/style.json
 delete mode 100644 test/integration/render-tests/feature-state/promote-id/expected.png

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index 7e11a4fdae4..d76021b75d6 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -121,7 +121,7 @@ class LineBucket implements Bucket {
         const lineSortKey = this.layers[0].layout.get('line-sort-key');
         const bucketFeatures = [];
 
-        for (const {feature, index, sourceLayerIndex} of features) {
+        for (const {feature, id, index, sourceLayerIndex} of features) {
             if (!this.layers[0]._featureFilter(new EvaluationParameters(this.zoom), feature)) continue;
 
             const geometry = loadGeometry(feature);
@@ -130,7 +130,7 @@ class LineBucket implements Bucket {
                 undefined;
 
             const bucketFeature: BucketFeature = {
-                id: feature.id,
+                id,
                 properties: feature.properties,
                 type: feature.type,
                 sourceLayerIndex,
diff --git a/test/integration/render-tests/feature-state/promote-id-circle/expected.png b/test/integration/render-tests/feature-state/promote-id-circle/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..1587818fee0a1c76612df5f3599bf1d2b6a3cc3a
GIT binary patch
literal 350
zcmV-k0iphhP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003cNkl<ZcmeIf
zu}ULR6adik2HcOZwvZ4|*kT}9W)TeteyJctk)2WkQ!FTiU}5b?DEPLp3d792vGtxK
zgb+dqA%veP`IdZ&b9~^I^lGBa3@cyOiJj?=aD@Xr;K@YEB>5NqVQybT`lCRm!UnZ{
zEf$GSW&UDm-xj~|u25x~XUugi$#=?ZQ0uC(QRWUyU2{B}pi(TK;aI;5@}U8l8EXCN
z%*?PuT<CX<GleR}^0iTUY1qoRm0?Tct`(~MaFt@|#;DX7wl;2USYzCcLX~3a5ik1P
zlimzS?9l4hCU%Cs;a<NNJStR~<^)?^4e3&u1zKG#7Rp?r(Y3{i36gKgr#Qz4Zb`2u
w%FM9xWu4fW?g&>nzyqFy5JCtcgb+&n2lY)s5_y^5bN~PV07*qoM6N<$f+bO$OaK4?

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/feature-state/promote-id/style.json b/test/integration/render-tests/feature-state/promote-id-circle/style.json
similarity index 100%
rename from test/integration/render-tests/feature-state/promote-id/style.json
rename to test/integration/render-tests/feature-state/promote-id-circle/style.json
diff --git a/test/integration/render-tests/feature-state/promote-id-fill-extrusion/expected.png b/test/integration/render-tests/feature-state/promote-id-fill-extrusion/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..95a581a0695c85aec02e07a77801c5e31f62bd98
GIT binary patch
literal 2196
zcmb_d|2LcW9)E%=QdF6mx^s8hLxVQ4M3uI>ehaervQR8#71ItmI*X7_N7FW`p;k&Y
zLakI{_nNeKrEOT1^wc;tN0x51W2AJL)3Dv#TbF6?>uG!cft~Az9Le)~UhmhJ_vd+v
zq9a4??cD7Mg0K${+sh*e3;at+ZLIN`AFrnpgw28Qy}M$MQl4~g%bf^Yb6USMOU5cY
zP#@uLZlxbhjQ`|N^isIDBGi9>env)n2YZbt@!7YMD<sXI{7axYTRSDK)p<smeia57
zZ`5Yn9N(x?%pc%PrTuhkzKPc_E4*bRDbY}k&x5tpt`9a}2wc8@{h0B%=<`9kN?|MU
zHy+mKy!q+$q~`W480bM$t3zTr{zf|O;-2FMAU^;q(BJ4oqJEv!oHe&8FJX+Qk4kZ=
za-iO^^~w7SiL}GI3*3cRagxm!!P;5h{1$cTy`aK*6|Xpbf)`xaIS8U`5P9Y~JzEXE
z`y)*jj9d2}M`U)a4XMhO70~W-7gjnKkV1XDC8G^jerOdyiYAWZpP9g!8nl0yOHXWa
zVH)Y`QWE3^&}D$${U0b6puYe#qIO|sD$-9i%<jJVpfBm{v@jqudLT$vbDqatSNVOA
zS$chxdc*fFcilf5?2Ev(*;_(U+<qzLNCl*9#5Dn5JKet8lq(vFUgSrttH^dR9#Od%
zdK$$J_KlfOb;}%oLveMSPy1$BVeLpjYiFE+Jz2ZwXaenSs}qv56e4{EufKISonH>7
zH*!U5r8zefe>TVbWRfpUdek2T14rSy84SC?a2*WRU~uDtfdYp0U|^g9L$X?4tf2}R
z-jWCv42xjcI)>xlk_f|lVR#i%*;JOk3x?h9_a()k#g+sZ?uKFCs_%nX|A65;K6km)
z-x^kY2Bs_+9@e}xeEOAP=7-9^K_>fS(Gc@rZOS;GDGyy5ho(NyneoVL0Ko)OVWujp
zNl><E$OBstxA7I|HGq^SNDx|NrYKL4pd8UqEeY}hXqsdS2dJC`K}yuW8@!RdU=5^n
zwP7dQp1kiCHQ=<Ua$)W`k)DEG<35_yXtC2RVeryd2`}g1B?kMVez&;VD^>Y6maQUK
zD>R`X-|}n+!CNSZgMz+GM8xUmQ`F_vY!~cWW2A{+jCk!3uObogS|DDk{`xTiU!_Rj
zKzC0dnYL-EM2}ee%}f(C8hV3v->ytiQ>v}WZ8g-6w8dhlSCBi+!kCjPvBRcVjG2OC
z$2`3y!au64=pe>le|5kFc|oDmg}i>Tx1p50*j~}`<0aG=jr!^|l_~r$aduuK&*-Nr
z#f&w*od*$7646?szwhzy>Mv02b~2E97iLnoxd@3Ko|x1G%m@QE#UhXgIOMKAs_e9V
z0QQH{4lhb)EXQK(1Y0_9-4;e55^5C>-$q7Tli{}cocupoW7W^jvOTx9*GQdE4DrV=
z1q{l1{2DT7Q!@XM#Xr><=PccM)05j=CO?#BF1p-d>lSvf*|w{2#L+AHucmDVZ*KfT
z9na?4{FCLRckT~m@T)6%Hc?Zi7v=IB{rXQW4VdNZu3pS1G%xstVmWxOk^JXK{u-?(
zx8$7s6U@~NPIE#f&RH+!cHs9e`w@xSH=w;+KWdd&f8__Oae-;2bJmKd7iX+XuWr2(
zaXARfO>sN3)XfsUmr%zJ42Bs;(#)!X<z$PH@lNJwuefQBCZCTT`*|$Dn|uz1;~UF#
z<e>tAzt^YB*3NMyY2qfRTEKa-N)}_re96*)xQU(c)sR|Gt~SB#Sx#2U{ruuDuk;v=
z7{>W_mi9s7FbiTRrEiGEfr1LsWgUPzFK{|$$o3t}bl<UuOw0giRJr_+kR`>O8vRg)
z1!EoNY`K&Fp}REwZ8T-1kxkj<w|M=rheMO~X*+D6mtn(;{I(Y^4Y11CmN0jfkL$#>
z#{~>Q8?vDU=zPA}Qrd&)Ef~j4D-B<Mebu4VIu~O0lVV)&K+NB7&T%b;tdkhrJP6>`
ztr#5FjlsLtf7K&2q=k{3CE&F8q0Z{lHlPF7W-^K2(6e6^hOaU7b~d@_8liC33Fwgx
zDi>Yq$f&Fa$7{z1szEeX&Ay+OO5TZwuvKyndFN@|`87M?A~M`Ts)@U|oZSA7>yO{E
z%Fzg;`lGqI_Bf>Dh(;K%O9G8=Vl(6K>BMkm%To60M`aJN-;`mGr>AVMO>{CN8uhZz
zO<vqbZRzIoWCP!cb}Bk6<>_$foFR+A(}6O)9pIYOyp!aJB8*tP0i^W>EWg-vL^qC?
z&$F_ZcL>c^5L|~>ixu(wQ31n9!(i_;*?!cv91mec$an!`xk{cRG?Srt8IYcojsu}M
mvov7!C*RQjm)p7yKC}ENb!w6DSapyj4Br>ISF=0$<bMHkYsUfr

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/feature-state/promote-id-fill-extrusion/style.json b/test/integration/render-tests/feature-state/promote-id-fill-extrusion/style.json
new file mode 100644
index 00000000000..a4a31d62dfa
--- /dev/null
+++ b/test/integration/render-tests/feature-state/promote-id-fill-extrusion/style.json
@@ -0,0 +1,161 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 128,
+      "width": 512,
+      "operations": [
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "9007199254740992"
+          },
+          {
+            "color": "red"
+          }
+        ],
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "1.2"
+          },
+          {
+            "color": "blue"
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "promoteId": "foo",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [{
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [
+                  -0.0005,
+                  -0.0001
+                ],
+                [
+                  -0.0005,
+                  0.0001
+                ],
+                [
+                  -0.0003,
+                  0.0001
+                ],
+                [
+                  -0.0003,
+                  -0.0001
+                ],
+                [
+                  -0.0005,
+                  -0.0001
+                ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740992"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [
+                  -0.0001,
+                  -0.0001
+                ],
+                [
+                  -0.0001,
+                  0.0001
+                ],
+                [
+                  0.0001,
+                  0.0001
+                ],
+                [
+                  0.0001,
+                  -0.0001
+                ],
+                [
+                  -0.0001,
+                  -0.0001
+                ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740993"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [
+                  0.0003,
+                  -0.0001
+                ],
+                [
+                  0.0003,
+                  0.0001
+                ],
+                [
+                  0.0005,
+                  0.0001
+                ],
+                [
+                  0.0005,
+                  -0.0001
+                ],
+                [
+                  0.0003,
+                  -0.0001
+                ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "1.2"
+          }
+        }]
+      }
+    }
+  },
+  "pitch": 60,
+  "zoom": 18,
+  "layers": [
+    {
+      "id": "fill-extrusion",
+      "type": "fill-extrusion",
+      "source": "geojson",
+      "paint": {
+        "fill-extrusion-height": 10,
+        "fill-extrusion-base": 0,
+        "fill-extrusion-color": [
+          "coalesce",
+          [
+            "feature-state",
+            "color"
+          ],
+          "black"
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/feature-state/promote-id-fill/expected.png b/test/integration/render-tests/feature-state/promote-id-fill/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa7e7f3f27b186f468af64e852c83a550afc1ab4
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQm&pZjv*C{Zx0#@H8AiTHZcGH
zzc|uznbC2fNh+RNrZqY`?#zepemY;U?et9^{e>|a;-^}RkSG<;NlU!=UrVw|B&&X%
Q2sDtv)78&qol`;+0JLH!{Qv*}

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/feature-state/promote-id-fill/style.json b/test/integration/render-tests/feature-state/promote-id-fill/style.json
new file mode 100644
index 00000000000..31514683e4d
--- /dev/null
+++ b/test/integration/render-tests/feature-state/promote-id-fill/style.json
@@ -0,0 +1,114 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 32,
+      "operations": [
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "9007199254740992"
+          },
+          {
+            "color": "red"
+          }
+        ],
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "1.2"
+          },
+          {
+            "color": "blue"
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "zoom": 2,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "promoteId": "foo",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [{
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [ -5, -1 ],
+                [ -5, 1 ],
+                [ -3, 1 ],
+                [ -3, -1 ],
+                [ -5, -1 ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740992"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [ -1, -1 ],
+                [ -1, 1 ],
+                [ 1, 1 ],
+                [ 1, -1 ],
+                [ -0.5, -1 ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740993"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Polygon",
+            "coordinates": [
+              [
+                [ 3, -1 ],
+                [ 3, 1 ],
+                [ 5, 1 ],
+                [ 5, -1 ],
+                [ 3, -1 ]
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "1.2"
+          }
+        }]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "fill",
+      "type": "fill",
+      "source": "geojson",
+      "paint": {
+        "fill-antialias": false,
+        "fill-color": [
+          "coalesce",
+          [
+            "feature-state",
+            "color"
+          ],
+          "black"
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/feature-state/promote-id-line/expected.png b/test/integration/render-tests/feature-state/promote-id-line/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..55bfc9fa6404f125d3aa395c8d1ab6f6bd77ffe8
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQn{Wkjv*C{Zx3$dZFXQ_G5GJx
zHo4V@ZT7@jZAu~vvfILUK5UvRI(c#B2FvdUAHC>4y0Z4rtBm9`|3scXvMe+2C<@d&
t<+@Wt{OO{YDc!g@cakeQD)z4W%OLWI)8f%IhbExK44$rjF6*2UngEQhK(zn>

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/feature-state/promote-id-line/style.json b/test/integration/render-tests/feature-state/promote-id-line/style.json
new file mode 100644
index 00000000000..b2ec7836cde
--- /dev/null
+++ b/test/integration/render-tests/feature-state/promote-id-line/style.json
@@ -0,0 +1,116 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 32,
+      "operations": [
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "9007199254740992"
+          },
+          {
+            "color": "red"
+          }
+        ],
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "1.2"
+          },
+          {
+            "color": "blue"
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "promoteId": "foo",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [{
+          "type": "Feature",
+          "geometry": {
+            "type": "LineString",
+            "coordinates": [
+              [
+                -10,
+                -10
+              ],
+              [
+                -10,
+                 10
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740992"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "LineString",
+            "coordinates": [
+              [
+                 0,
+                -10
+              ],
+              [
+                  0,
+                 10
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740993"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "LineString",
+            "coordinates": [
+              [
+                 10,
+                -10
+              ],
+              [
+                 10,
+                 10
+              ]
+            ]
+          },
+          "properties": {
+            "foo": "1.2"
+          }
+        }]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "line",
+      "type": "line",
+      "source": "geojson",
+      "paint": {
+        "line-width": 5,
+        "line-color": [
+          "coalesce",
+          [
+            "feature-state",
+            "color"
+          ],
+          "black"
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/feature-state/promote-id-symbol/expected.png b/test/integration/render-tests/feature-state/promote-id-symbol/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c3d132c91ad29dcde29f00080eedcb3de1197a4
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0005|Nkl<ZcmeIf
zJ8M)~007|c+#yDyASNaug$O<xcM)Gf6a*!LVyZ0`^iQmRK+IgQvR`%=pIE3Mf}NFu
z&wzrWf-b15L@d@$qS0i+9DhLW+&N?G`94{eWm%SG*-t9?A#n^tn8OTVQI8^{ku~@h
zm<hD>ZUn<vzzpW~DCkMtjz6#;t1*Ws_=j*^f;PVdj^O}?FdumqIE|};w(d6J7!F|=
z3wVLExP(QC8j{5coWlfGp&u);5tB4$DIcm4*%LUA!&r@etO%^fBw8i+)!T-1_zi>T
z#{kx05)Iszs3A#Qi3`}OT0eHuoThxQLS$LwOklTaeHfqOamgFi3jBo$)fyPbOT3hz
zkmdk(sW*b(b+$LKPrX%vBRU($LG=c3RH8zfEeN{XL@ZSM6%E~OjP$9t8OwFI0Rs{g
zesYC0PY`wYiqKZ=DHe72I?z(>Ilk)d4dx^$q`66apx#GZ)!BXAQtwmbiq0P6hI(_j
zEKx&}vPJVh?8306W-&#$rh}4plULY*F-v{L$%2bIi})8?vDQ)xIEB9@YDiYTqdAS`
z7(@e~a2Ll37j;qcVTyZ!J`AD{vyth*37js8>iv&9C@_R&_>4y=@h9361wSN?5l0AL
z@Q$#kN0CvC;v3!uT6#BvQMB+D^Rg_<vMkH8EXj8ln}Izv8tB6S0000<MNUMnLSTaD
C&-c0j

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/feature-state/promote-id-symbol/style.json b/test/integration/render-tests/feature-state/promote-id-symbol/style.json
new file mode 100644
index 00000000000..374dc13e84e
--- /dev/null
+++ b/test/integration/render-tests/feature-state/promote-id-symbol/style.json
@@ -0,0 +1,103 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 32,
+      "operations": [
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "9007199254740992"
+          },
+          {
+            "color": "red"
+          }
+        ],
+        [
+          "setFeatureState",
+          {
+            "source": "geojson",
+            "id": "1.2"
+          },
+          {
+            "color": "blue"
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "zoom": 2,
+  "sprite": "local://sprites/sprite",
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "promoteId": "foo",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [{
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              0,
+              0
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740992"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              3,
+              0
+            ]
+          },
+          "properties": {
+            "foo": "9007199254740993"
+          }
+        }, {
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              -3,
+              0
+            ]
+          },
+          "properties": {
+            "foo": "1.2"
+          }
+        }]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "symbol",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "icon-image": "dot.sdf",
+        "icon-allow-overlap": true
+      },
+      "paint": {
+        "icon-color": [
+          "coalesce",
+          [
+            "feature-state",
+            "color"
+          ],
+          "black"
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/feature-state/promote-id/expected.png b/test/integration/render-tests/feature-state/promote-id/expected.png
deleted file mode 100644
index 7e58decb017795d53ed5d1c1f6aa35c45c4bb55d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003bNkl<ZcmeIf
zu}ULR6adik2HcOZwvZ4|*k&M>SwsVZUn&SuWT!MR&4NM*7S?`*f^Q3}FwD#wTkknS
z2qA<JLim}IZ^@@P#|LgnuO`aOu<~V{*qQDKS2(}}o=lWXl7HbJ=JqwDKMG_jY*5?R
zVv+b%<}a4^ZSfoL3RR|g#$4Bue5cF?wXPZ)W$v)lHOI3FD#h{{j`h1B9~zLEq1La?
z%nUokg?`64Q>aobUmKN|hOLZS8MZX;TA|7hS1Fcmj7p7RYvb02HOAd2R4JAo@uJ^7
z>CJ$|4y}G|VrSSJ?)7`Yqe7KwPO#P0kS>*3pw-o4q0A*3U0a-(Ao-SjigSG6mh@_(
v%nU1E)`^|zj&OwoJm5(PA%qY@2%*G({Y^m<C?#5~00000NkvXXu0mjfS(2G^