ol 9.0.0-dev.1707154322322 → 9.0.0-dev.1707413332477

package/renderer/canvas/VectorLayer.js

@@ -3,7 +3,11 @@
  */
 import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
 import CanvasLayerRenderer, {canvasPool} from './Layer.js';
-import ExecutorGroup from '../../render/canvas/ExecutorGroup.js';
+import ExecutorGroup, {
+  ALL,
+  DECLUTTER,
+  NON_DECLUTTER,
+} from '../../render/canvas/ExecutorGroup.js';
 import RenderEventType from '../../render/EventType.js';
 import ViewHint from '../../ViewHint.js';
 import {
@@ -139,11 +143,6 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
      */
     this.replayGroupChanged = true;
 
-    /**
-     * @type {import("../../render/canvas/ExecutorGroup").default}
-     */
-    this.declutterExecutorGroup = null;
-
     /**
      * Clipping to be performed by `renderFrame()`
      * @type {boolean}
@@ -166,9 +165,10 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
   /**
    * @param {ExecutorGroup} executorGroup Executor group.
    * @param {import("../../Map.js").FrameState} frameState Frame state.
-   * @param {import("rbush").default} [declutterTree] Declutter tree.
+   * @param {boolean} [declutterable] `true` to only render declutterable items,
+   *     `false` to only render non-declutterable items, `undefined` to render all.
    */
-  renderWorlds(executorGroup, frameState, declutterTree) {
+  renderWorlds(executorGroup, frameState, declutterable) {
     const extent = frameState.extent;
     const viewState = frameState.viewState;
     const center = viewState.center;
@@ -177,6 +177,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     const rotation = viewState.rotation;
     const projectionExtent = projection.getExtent();
     const vectorSource = this.getLayer().getSource();
+    const declutter = this.getLayer().getDeclutter();
     const pixelRatio = frameState.pixelRatio;
     const viewHints = frameState.viewHints;
     const snapToPixel = !(
@@ -206,12 +207,18 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       );
       executorGroup.execute(
         context,
-        1,
+        [context.canvas.width, context.canvas.height],
         transform,
         rotation,
         snapToPixel,
-        undefined,
-        declutterTree,
+        declutterable === undefined
+          ? ALL
+          : declutterable
+            ? DECLUTTER
+            : NON_DECLUTTER,
+        declutterable
+          ? declutter && frameState.declutter[declutter]
+          : undefined,
       );
     } while (++world < endWorld);
   }
@@ -246,15 +253,21 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
    * @param {import("../../Map.js").FrameState} frameState Frame state.
    */
   renderDeclutter(frameState) {
-    if (this.declutterExecutorGroup) {
-      this.setupCompositionContext_();
-      this.renderWorlds(
-        this.declutterExecutorGroup,
-        frameState,
-        frameState.declutterTree,
-      );
-      this.releaseCompositionContext_();
+    const declutter = this.getLayer().getDeclutter();
+    if (!declutter) {
+      return;
     }
+    this.setupCompositionContext_(); //FIXME Check if this works, or if we need to defer something.
+    this.renderWorlds(this.replayGroup_, frameState, true);
+    this.releaseCompositionContext_();
+  }
+
+  /**
+   * Render deferred instructions.
+   * @param {import("../../Map.js").FrameState} frameState Frame state.
+   */
+  renderDeferredInternal(frameState) {
+    this.replayGroup_.renderDeferred();
   }
 
   /**
@@ -278,10 +291,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     const canvas = context.canvas;
 
     const replayGroup = this.replayGroup_;
-    const declutterExecutorGroup = this.declutterExecutorGroup;
-    let render =
-      (replayGroup && !replayGroup.isEmpty()) ||
-      (declutterExecutorGroup && !declutterExecutorGroup.isEmpty());
+    let render = replayGroup && !replayGroup.isEmpty();
     if (!render) {
       const hasRenderListeners =
         this.getLayer().hasListener(RenderEventType.PRERENDER) ||
@@ -324,7 +334,11 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     }
 
     if (render) {
-      this.renderWorlds(replayGroup, frameState);
+      this.renderWorlds(
+        replayGroup,
+        frameState,
+        this.getLayer().getDeclutter() ? false : undefined,
+      );
     }
 
     if (clipped) {
@@ -501,9 +515,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
 
     let result;
     const executorGroups = [this.replayGroup_];
-    if (this.declutterExecutorGroup) {
-      executorGroups.push(this.declutterExecutorGroup);
-    }
+    const declutter = this.getLayer().getDeclutter();
     executorGroups.some((executorGroup) => {
       return (result = executorGroup.forEachFeatureAtCoordinate(
         coordinate,
@@ -511,9 +523,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         rotation,
         hitTolerance,
         featureCallback,
-        executorGroup === this.declutterExecutorGroup &&
-          frameState.declutterTree
-          ? frameState.declutterTree.all().map((item) => item.value)
+        declutter && frameState.declutter[declutter]
+          ? frameState.declutter[declutter].all().map((item) => item.value)
           : null,
       ));
     });
@@ -653,16 +664,6 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       pixelRatio,
     );
 
-    let declutterBuilderGroup;
-    if (this.getLayer().getDeclutter()) {
-      declutterBuilderGroup = new CanvasBuilderGroup(
-        getRenderTolerance(resolution, pixelRatio),
-        extent,
-        resolution,
-        pixelRatio,
-      );
-    }
-
     const userProjection = getUserProjection();
     let userTransform;
     if (userProjection) {
@@ -687,8 +688,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     const render =
       /**
        * @param {import("../../Feature.js").default} feature Feature.
+       * @param {number} index Index.
        */
-      (feature) => {
+      (feature, index) => {
         let styles;
         const styleFunction =
           feature.getStyleFunction() || vectorLayer.getStyleFunction();
@@ -702,7 +704,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
             styles,
             replayGroup,
             userTransform,
-            declutterBuilderGroup,
+            this.getLayer().getDeclutter(),
+            index,
           );
           ready = ready && !dirty;
         }
@@ -715,7 +718,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       features.sort(vectorLayerRenderOrder);
     }
     for (let i = 0, ii = features.length; i < ii; ++i) {
-      render(features[i]);
+      render(features[i], i);
     }
     this.renderedFeatures_ = features;
     this.ready = ready;
@@ -728,19 +731,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       vectorSource.getOverlaps(),
       replayGroupInstructions,
       vectorLayer.getRenderBuffer(),
+      !!frameState.declutter,
     );
 
-    if (declutterBuilderGroup) {
-      this.declutterExecutorGroup = new ExecutorGroup(
-        extent,
-        resolution,
-        pixelRatio,
-        vectorSource.getOverlaps(),
-        declutterBuilderGroup.finish(),
-        vectorLayer.getRenderBuffer(),
-      );
-    }
-
     this.renderedResolution_ = resolution;
     this.renderedRevision_ = vectorLayerRevision;
     this.renderedRenderOrder_ = vectorLayerRenderOrder;
@@ -762,7 +755,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
    * @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
    * @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Builder group.
    * @param {import("../../proj.js").TransformFunction} [transform] Transform from user to view projection.
-   * @param {import("../../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+   * @param {boolean} [declutter] Enable decluttering.
+   * @param {number} [index] Render order index.
    * @return {boolean} `true` if an image is loading.
    */
   renderFeature(
@@ -771,7 +765,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     styles,
     builderGroup,
     transform,
-    declutterBuilderGroup,
+    declutter,
+    index,
   ) {
     if (!styles) {
       return false;
@@ -787,7 +782,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
             squaredTolerance,
             this.boundHandleStyleImageChange_,
             transform,
-            declutterBuilderGroup,
+            declutter,
+            index,
           ) || loading;
       }
     } else {
@@ -798,7 +794,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         squaredTolerance,
         this.boundHandleStyleImageChange_,
         transform,
-        declutterBuilderGroup,
+        declutter,
+        index,
       );
     }
     return loading;

package/renderer/canvas/VectorTileLayer.d.ts

@@ -27,11 +27,21 @@ declare class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer<impo
      * @type {number}
      */
     private renderedRotation_;
+    /**
+     * @private
+     * @type {number}
+     */
+    private renderedOpacity_;
     /**
      * @private
      * @type {import("../../transform.js").Transform}
      */
     private tmpTransform_;
+    /**
+     * @private
+     * @type {Array<ZIndexContext>}
+     */
+    private tileClipContexts_;
     /**
      * @param {import("../../VectorRenderTile.js").default} tile Tile.
      * @param {number} pixelRatio Pixel ratio.
@@ -67,16 +77,18 @@ declare class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer<impo
      * @param {import("../../layer/Layer.js").State} layerState Layer state.
      */
     renderDeclutter(frameState: import("../../Map.js").FrameState, layerState: import("../../layer/Layer.js").State): void;
+    renderDeferredInternal(): void;
     getTileRenderTransform(tile: any, frameState: any): number[];
     /**
      * @param {import("../../Feature.js").FeatureLike} feature Feature.
      * @param {number} squaredTolerance Squared tolerance.
      * @param {import("../../style/Style.js").default|Array<import("../../style/Style.js").default>} styles The style or array of styles.
      * @param {import("../../render/canvas/BuilderGroup.js").default} builderGroup Replay group.
-     * @param {import("../../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder group for decluttering.
+     * @param {boolean} [declutter] Enable decluttering.
+     * @param {number} [index] Render order index.
      * @return {boolean} `true` if an image is loading.
      */
-    renderFeature(feature: import("../../Feature.js").FeatureLike, squaredTolerance: number, styles: import("../../style/Style.js").default | Array<import("../../style/Style.js").default>, builderGroup: import("../../render/canvas/BuilderGroup.js").default, declutterBuilderGroup?: CanvasBuilderGroup | undefined): boolean;
+    renderFeature(feature: import("../../Feature.js").FeatureLike, squaredTolerance: number, styles: import("../../style/Style.js").default | Array<import("../../style/Style.js").default>, builderGroup: import("../../render/canvas/BuilderGroup.js").default, declutter?: boolean | undefined, index?: number | undefined): boolean;
     /**
      * @param {import("../../VectorRenderTile.js").default} tile Tile.
      * @return {boolean} A new tile image was rendered.
@@ -91,5 +103,4 @@ declare class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer<impo
     private renderTileImage_;
 }
 import CanvasTileLayerRenderer from './TileLayer.js';
-import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
 //# sourceMappingURL=VectorTileLayer.d.ts.map

package/renderer/canvas/VectorTileLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AAwDA;;;;;GAKG;AACH;IACE;;OAEG;IACH,mBAFW,OAAO,2BAA2B,EAAE,OAAO,EA+BrD;IA1BC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,+BAA2B;IAE3B;;;OAGG;IACH,4CAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,sBAAsC;IAGxC;;;;;OAKG;IACH,kBALW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,GAAC,SAAS,CAY5B;IAkCD;;;OAGG;IACH,qBAHW,OAAO,2BAA2B,EAAE,OAAO,GAC1C,OAAO,CAUlB;IAED;;OAEG;IACH,6BAEC;IAgBD;;;;;OAKG;IACH,6BAmIC;IA6ND;;;;OAIG;IACH,gCAEC;IAED;;;;OAIG;IACH,4BAHW,OAAO,cAAc,EAAE,UAAU,cACjC,OAAO,sBAAsB,EAAE,KAAK,QAiC9C;IAED,6DA+BC;IAgHD;;;;;;;OAOG;IACH,uBAPW,OAAO,kBAAkB,EAAE,WAAW,oBACtC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,2DAEpD,OAAO,CAsClB;IAED;;;;OAIG;IACH,8BAcC;IAED;;;;OAIG;IACH,yBAoDC;CACF;oCAl1BmC,gBAAgB;+BAFrB,qCAAqC"}
+{"version":3,"file":"VectorTileLayer.d.ts","sourceRoot":"","sources":["VectorTileLayer.js"],"names":[],"mappings":";AA4DA;;;;;GAKG;AACH;IACE;;OAEG;IACH,mBAFW,OAAO,2BAA2B,EAAE,OAAO,EA2CrD;IAtCC,eAAe;IACf,qCAA2E;IAE3E;;;OAGG;IACH,+BAA2B;IAE3B;;;OAGG;IACH,4CAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,yBAAyB;IAEzB;;;OAGG;IACH,sBAAsC;IAEtC;;;OAGG;IACH,0BAA6B;IAG/B;;;;;OAKG;IACH,kBALW,OAAO,2BAA2B,EAAE,OAAO,cAC3C,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,GAAC,SAAS,CAY5B;IAkCD;;;OAGG;IACH,qBAHW,OAAO,2BAA2B,EAAE,OAAO,GAC1C,OAAO,CAUlB;IAED;;OAEG;IACH,6BAEC;IAgBD;;;;;OAKG;IACH,6BAqHC;IAyND;;;;OAIG;IACH,gCAEC;IAED;;;;OAIG;IACH,4BAHW,OAAO,cAAc,EAAE,UAAU,cACjC,OAAO,sBAAsB,EAAE,KAAK,QAiC9C;IAED,+BA6CC;IAED,6DA+BC;IAgID;;;;;;;;OAQG;IACH,uBARW,OAAO,kBAAkB,EAAE,WAAW,oBACtC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,gEAGpD,OAAO,CAyClB;IAED;;;;OAIG;IACH,8BAcC;IAED;;;;OAIG;IACH,yBAwDC;CACF;oCAr5BmC,gBAAgB"}