From b0bdef03d3b8bd4846fdf62311713bf067c18684 Mon Sep 17 00:00:00 2001
From: Andrew Hay Kurtz <andrew.hay.kurtz@gmail.com>
Date: Tue, 28 May 2019 15:08:22 -0700
Subject: [PATCH 1/3] Fix #8273: Layer#setPaintProperty returns true for
 CrossFadedDataDriven properties

---
 src/style/style_layer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/style/style_layer.js b/src/style/style_layer.js
index 9cfd91bd62f..81113d8145d 100644
--- a/src/style/style_layer.js
+++ b/src/style/style_layer.js
@@ -155,13 +155,13 @@ class StyleLayer extends Evented {
             // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
             // Style#setPaintProperty
             const prop = this._transitionablePaint._values[name];
-            const newCrossFadedValue = prop.property.specification["property-type"] === 'cross-faded-data-driven' && !prop.value.value && value;
+            const isCrossFadedValue = prop.property.specification["property-type"] === 'cross-faded-data-driven';
 
             const wasDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
             this._transitionablePaint.setValue(name, value);
             const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
             this._handleSpecialPaintPropertyUpdate(name);
-            return isDataDriven || wasDataDriven || newCrossFadedValue;
+            return isDataDriven || wasDataDriven || isCrossFadedValue;
         }
     }
 

From c6703964673946cf1e9b356d51117eba3774ff54 Mon Sep 17 00:00:00 2001
From: Andrew Hay Kurtz <andrew.hay.kurtz@gmail.com>
Date: Tue, 28 May 2019 17:26:10 -0700
Subject: [PATCH 2/3] small refactor on StyleLayer#setPaintProperty

---
 src/style/style_layer.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/style/style_layer.js b/src/style/style_layer.js
index 81113d8145d..fa9ae6d4864 100644
--- a/src/style/style_layer.js
+++ b/src/style/style_layer.js
@@ -151,17 +151,19 @@ class StyleLayer extends Evented {
             this._transitionablePaint.setTransition(name.slice(0, -TRANSITION_SUFFIX.length), (value: any) || undefined);
             return false;
         } else {
-            // if a cross-faded value is changed, we need to make sure the new icons get added to each tile's iconAtlas
-            // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
-            // Style#setPaintProperty
-            const prop = this._transitionablePaint._values[name];
-            const isCrossFadedValue = prop.property.specification["property-type"] === 'cross-faded-data-driven';
+            const transitionable = this._transitionablePaint._values[name];
+            const isCrossFadedProperty = transitionable.property.specification["property-type"] === 'cross-faded-data-driven';
+            const wasDataDriven = transitionable.value.isDataDriven();
 
-            const wasDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
             this._transitionablePaint.setValue(name, value);
             const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
+
             this._handleSpecialPaintPropertyUpdate(name);
-            return isDataDriven || wasDataDriven || isCrossFadedValue;
+
+            // if a cross-faded value is changed, we need to make sure the new icons get added to each tile's iconAtlas
+            // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
+            // Style#setPaintProperty
+            return isDataDriven || wasDataDriven || isCrossFadedProperty;
         }
     }
 

From 8fd3c5c5e759e4edfbc9e82b58a6497611df301a Mon Sep 17 00:00:00 2001
From: Andrew Hay Kurtz <andrew.hay.kurtz@gmail.com>
Date: Thu, 30 May 2019 14:11:44 -0700
Subject: [PATCH 3/3] Add render-tests/regressions/mapbox-gl-js#8273

---
 src/style/style_layer.js                      |   4 +-
 .../mapbox-gl-js#8273/expected.png            | Bin 0 -> 4903 bytes
 .../regressions/mapbox-gl-js#8273/style.json  |  43 ++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#8273/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#8273/style.json

diff --git a/src/style/style_layer.js b/src/style/style_layer.js
index fa9ae6d4864..5f60525e0d4 100644
--- a/src/style/style_layer.js
+++ b/src/style/style_layer.js
@@ -156,10 +156,10 @@ class StyleLayer extends Evented {
             const wasDataDriven = transitionable.value.isDataDriven();
 
             this._transitionablePaint.setValue(name, value);
-            const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
-
             this._handleSpecialPaintPropertyUpdate(name);
 
+            const isDataDriven = this._transitionablePaint._values[name].value.isDataDriven();
+
             // if a cross-faded value is changed, we need to make sure the new icons get added to each tile's iconAtlas
             // so a call to _updateLayer is necessary, and we return true from this function so it gets called in
             // Style#setPaintProperty
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#8273/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#8273/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b2447069befe4be9934f083b31cbf08167a7573
GIT binary patch
literal 4903
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
Z{~HD+;*Z~lPW}J@002ovPDHLkV1mP8=D`2}

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#8273/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#8273/style.json
new file mode 100644
index 00000000000..a5786217e3f
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#8273/style.json
@@ -0,0 +1,43 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "operations": [
+        ["setPaintProperty", "line", "line-pattern", "zoo_icon"],
+        ["wait"]
+      ]
+    }
+  },
+  "sprite": "local://sprites/emerald",
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "LineString",
+        "coordinates": [
+          [
+            -20,
+            -20
+          ],
+          [
+            20,
+            20
+          ]
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "line",
+      "type": "line",
+      "source": "geojson",
+      "paint": {
+        "line-pattern": "generic_icon",
+        "line-width": 20
+      }
+    }
+  ]
+}