Merge pull request #15851 from ahocevar/declutter-group

Fix execute() arguments
openlayers · May 21, 2024 · 5f139d5 · 5f139d5
2 parents 97a4d6a + 4c42fab
commit 5f139d5
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js
@@ -779,7 +779,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
           rotation,
           hifi,
           replayTypes,
-          frameState.declutter === null ? undefined : frameState.declutter,
+          frameState.declutter?.[declutter],
         );
       }
       if (contextSaved) {

diff --git a/test/browser/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/browser/spec/ol/renderer/canvas/vectortilelayer.test.js
@@ -806,4 +806,48 @@ describe('ol/renderer/canvas/VectorTileLayer', function () {
       });
     });
   });
+
+  describe('mixed declutter settings', () => {
+    let map;
+    beforeEach((done) => {
+      const extent = [
+        1824704.739223726, 6141868.096770482, 1827150.7241288517,
+        6144314.081675608,
+      ];
+      const source = new VectorTileSource({
+        format: new MVT(),
+        url: 'spec/ol/data/14-8938-5680.vector.pbf',
+        minZoom: 14,
+        maxZoom: 14,
+      });
+      const layer1 = new VectorTileLayer({
+        declutter: true,
+        extent: extent,
+        source: source,
+      });
+      const layer2 = new VectorTileLayer({
+        declutter: true,
+        extent: extent,
+        source: source,
+      });
+      map = new Map({
+        target: createMapDiv(100, 100),
+        layers: [layer1, layer2],
+        view: new View({
+          center: getCenter(extent),
+          zoom: 14,
+        }),
+      });
+      map.once('rendercomplete', () => done());
+    });
+
+    afterEach(() => {
+      disposeMap(map);
+    });
+
+    it('works with a mix of decluttering enabled and disabled', () => {
+      map.getLayers().item(1).declutter_ = false;
+      expect(() => map.renderSync()).to.not.throwException();
+    });
+  });
 });