Use setPaintProperty's optional worker roundtrip to reparse fill-extr…

…ude buckets when necessary (fix #3386)
mapbox · Oct 26, 2016 · 19c12a0 · 19c12a0
1 parent b9d9509
commit 19c12a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/js/data/bucket.js b/js/data/bucket.js
@@ -131,9 +131,7 @@ const subclasses = {
 Bucket.create = function(options) {
     const layer = options.layers[0];
     let type = layer.type;
-    if (type === 'fill' && (!layer.isPaintValueFeatureConstant('fill-extrude-height') ||
-        !layer.isPaintValueZoomConstant('fill-extrude-height') ||
-        layer.getPaintValue('fill-extrude-height', {zoom: options.zoom}) !== 0)) {
+    if (type === 'fill' && layer.isExtruded({ zoom: this.zoom })) {
         type = 'fillextrusion';
     }
     return new subclasses[type](options);

diff --git a/js/render/painter.js b/js/render/painter.js
@@ -272,10 +272,7 @@ class Painter {
         this.id = layer.id;
 
         let type = layer.type;
-        if (type === 'fill' &&
-            (!layer.isPaintValueFeatureConstant('fill-extrude-height') ||
-            !layer.isPaintValueZoomConstant('fill-extrude-height') ||
-            layer.getPaintValue('fill-extrude-height', {zoom: this.transform.zoom}) !== 0)) {
+        if (type === 'fill' && layer.isExtruded({zoom: this.transform.zoom})) {
             type = 'extrusion';
         }
 

diff --git a/js/style/style.js b/js/style/style.js
@@ -557,6 +557,7 @@ class Style extends Evented {
         if (util.deepEqual(layer.getPaintProperty(name, klass), value)) return this;
 
         const wasFeatureConstant = layer.isPaintValueFeatureConstant(name);
+        const wasExtruded = layer.type === 'fill' && layer.isExtruded({ zoom: this.zoom });
         layer.setPaintProperty(name, value, klass);
 
         const isFeatureConstant = !(
@@ -566,7 +567,14 @@ class Style extends Evented {
             value.property !== undefined
         );
 
-        if (!isFeatureConstant || !wasFeatureConstant) {
+        const switchBuckets = (
+            layer.type === 'fill' &&
+            name === 'fill-extrude-height' &&
+            (!wasExtruded && value) ||
+            (wasExtruded && value === 0)
+        );
+
+        if (!isFeatureConstant || !wasFeatureConstant || switchBuckets) {
             this._updates.layers[layerId] = true;
             if (layer.source) {
                 this._updates.sources[layer.source] = true;

diff --git a/js/style/style_layer/fill_style_layer.js b/js/style/style_layer/fill_style_layer.js
@@ -43,6 +43,12 @@ class FillStyleLayer extends StyleLayer {
             return super.isPaintValueZoomConstant(name);
         }
     }
+
+    isExtruded(globalProperties) {
+        return !this.isPaintValueFeatureConstant('fill-extrude-height') ||
+            !this.isPaintValueZoomConstant('fill-extrude-height') ||
+            this.getPaintValue('fill-extrude-height', globalProperties) !== 0;
+    }
 }
 
 module.exports = FillStyleLayer;