Allow updating *-occlusion-opacity properties (internal-6010)

GitOrigin-RevId: 50a9223bc077a50487d4286c3ec6f47b704ecdcb

Author: ibesora

src/render/draw_symbol.ts

@@ -389,7 +389,7 @@ function drawLayerSymbols(
                 return;
             }
 
-            if (!layer.hasInitialOcclusionOpacityProperties) {
+            if (!layer.hasOcclusionOpacityProperties) {
                 // Occlusion against terrain only
                 if (painter.terrain) {
                     defines.push('DEPTH_D24');

src/render/painter.ts

@@ -797,7 +797,7 @@ class Painter {
             } else if (layer.type === 'building') {
                 buildingLayer = layer;
             } else if (layer.type === 'symbol') {
-                if (layer.hasInitialOcclusionOpacityProperties) {
+                if (layer.hasOcclusionOpacityProperties) {
                     layersRequireFinalDepth = true;
                 } else {
                     layersRequireTerrainDepth = true;

src/style/style.ts

@@ -1141,15 +1141,15 @@ class Style extends Evented<MapEvents> {
             const l1 = mergedLayers[layerName1];
             const l2 = mergedLayers[layerName2];
 
-            if ((l1 as SymbolStyleLayer).hasInitialOcclusionOpacityProperties) {
+            if ((l1 as SymbolStyleLayer).hasOcclusionOpacityProperties) {
                 if (l2.is3D(!!this.terrain)) {
                     return 1;
                 }
                 return 0;
             }
 
             if (l1.is3D(!!this.terrain)) {
-                if ((l2 as SymbolStyleLayer).hasInitialOcclusionOpacityProperties) {
+                if ((l2 as SymbolStyleLayer).hasOcclusionOpacityProperties) {
                     return -1;
                 }
                 return 0;

src/style/style_layer/symbol_style_layer.ts

@@ -77,12 +77,18 @@ class SymbolStyleLayer extends StyleLayer {
     _brightnessMin: number;
     _brightnessMax: number;
 
-    hasInitialOcclusionOpacityProperties: boolean;
+    hasOcclusionOpacityProperties: boolean;
 
     constructor(layer: LayerSpecification, scope: string, lut: LUT | null, options?: ConfigOptions | null) {
         super(layer, getProperties(), scope, lut, options, layer.layout ? layer.layout['icon-image-use-theme'] : null);
         this._colorAdjustmentMatrix = mat4.identity([] as unknown as mat4);
-        this.hasInitialOcclusionOpacityProperties = (layer.paint !== undefined) && (('icon-occlusion-opacity' in layer.paint) || ('text-occlusion-opacity' in layer.paint));
+        this.hasOcclusionOpacityProperties = (layer.paint !== undefined) && (('icon-occlusion-opacity' in layer.paint) || ('text-occlusion-opacity' in layer.paint));
+    }
+
+    override _handleSpecialPaintPropertyUpdate(name: string) {
+        if (name === 'icon-occlusion-opacity' || name === 'text-occlusion-opacity') {
+            this.hasOcclusionOpacityProperties = true;
+        }
     }
 
     override recalculate(parameters: EvaluationParameters, availableImages: ImageId[]) {

test/integration/render-tests/occlusion/symbol-occlusion-setProperty/expected.png

@@ -0,0 +1,94 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 100,
+      "width": 200,
+      "operations": [
+        [
+          "waitFrameReady",
+          30
+        ],
+        [
+            "setPaintProperty",
+            "symbols",
+            "icon-occlusion-opacity",
+            0.6
+        ],
+        [
+          "waitFrameReady",
+          100
+        ]
+      ]
+    }
+  },
+  "center": [
+    -113.32694547094238,
+    35.93455626259847
+  ],
+  "zoom": 12.2,
+  "pitch": 60,
+  "bearing": -20,
+  "terrain": {
+    "source": "rgbterrain"
+  },
+  "sources": {
+    "rgbterrain": {
+      "type": "raster-dem",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.terrain.png"
+      ],
+      "maxzoom": 12,
+      "tileSize": 256
+    },
+    "satellite": {
+      "type": "raster",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.satellite.png"
+      ],
+      "maxzoom": 17,
+      "tileSize": 256
+    },
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "MultiPoint",
+        "coordinates": [
+          [
+            -113.32599,
+            35.93355626259847
+          ],
+          [
+            -113.33341462261518,
+            35.9294218694216
+          ],
+          [
+            -113.3220882006336,
+            35.9418831745696
+          ]
+        ]
+      }
+    }
+  },
+  "sprite": "local://sprites/sprite",
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "raster",
+      "type": "raster",
+      "source": "satellite",
+      "paint": {
+        "raster-fade-duration": 0
+      }
+    },
+    {
+      "id": "symbols",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "icon-image": "bar-12",
+        "symbol-placement": "point"
+      }
+    }
+  ]
+}