ol 9.1.1-dev.1714793032589 → 9.1.1-dev.1714987740907

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.1.1-dev.1714793032589",
+  "version": "9.1.1-dev.1714987740907",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/renderer/canvas/Layer.js

@@ -283,7 +283,7 @@ class CanvasLayerRenderer extends LayerRenderer {
         canvas.width = width;
         canvas.height = height;
       } else {
-        this.getRenderContext(frameState).clearRect(0, 0, width, height);
+        this.context.clearRect(0, 0, width, height);
       }
       if (canvasTransform !== canvas.style.transform) {
         canvas.style.transform = canvasTransform;

package/renderer/canvas/VectorLayer.d.ts

@@ -20,9 +20,15 @@ declare class CanvasVectorLayerRenderer extends CanvasLayerRenderer<any> {
      */
     hitDetectionImageData_: ImageData | null;
     /**
+     * @private
+     * @type {boolean}
+     */
+    private clipped_;
+    /**
+     * @private
      * @type {Array<import("../../Feature.js").default>}
      */
-    renderedFeatures_: Array<import("../../Feature.js").default>;
+    private renderedFeatures_;
     /**
      * @private
      * @type {number}

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

@@ -1 +1 @@
-{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFA8GC;IA3GC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,GAAC,IAAI,CAEU;IAElC;;OAEG;IACH,mBAFU,MAAM,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAEtB;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6CAyD3C;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAgFD;;;;;OAKG;IACH,mBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CA8F1D;IA4FD;;;;OAIG;IACH,gCAEC;IA0MD;;;;;;;;;OASG;IACH,uBATW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,mIAIpD,OAAO,CA0ClB;CACF;gCAtxB6C,YAAY;0BAKnD,sCAAsC"}
+{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AA4CA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFAqHC;IAlHC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,GAAC,IAAI,CAEU;IAElC;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6CA4D3C;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAmFD;;;;;OAKG;IACH,mBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CA8F1D;IA4FD;;;;OAIG;IACH,gCAEC;IA0MD;;;;;;;;;OASG;IACH,uBATW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,mIAIpD,OAAO,CA0ClB;CACF;gCAnyB6C,YAAY;0BAKnD,sCAAsC"}

package/renderer/canvas/VectorLayer.js

@@ -68,6 +68,13 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     this.hitDetectionImageData_ = null;
 
     /**
+     * @private
+     * @type {boolean}
+     */
+    this.clipped_ = false;
+
+    /**
+     * @private
      * @type {Array<import("../../Feature.js").default>}
      */
     this.renderedFeatures_ = null;
@@ -197,7 +204,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       ? Math.floor((extent[0] - projectionExtent[0]) / worldWidth)
       : 0;
     do {
-      const transform = this.getRenderTransform(
+      let transform = this.getRenderTransform(
         center,
         resolution,
         0,
@@ -206,6 +213,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         height,
         world * worldWidth,
       );
+      if (frameState.declutter) {
+        transform = transform.slice(0);
+      }
       executorGroup.execute(
         context,
         [context.canvas.width, context.canvas.height],
@@ -274,6 +284,9 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       return;
     }
     this.replayGroup_.renderDeferred();
+    if (this.clipped_) {
+      this.context.restore();
+    }
     this.resetDrawContext_();
   }
 
@@ -309,12 +322,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
     const projection = viewState.projection;
 
     // clipped rendering if layer extent is set
-    let clipped = false;
+    this.clipped_ = false;
     if (render && layerState.extent && this.clipping) {
       const layerExtent = fromUserExtent(layerState.extent, projection);
       render = intersectsExtent(layerExtent, frameState.extent);
-      clipped = render && !containsExtent(layerExtent, frameState.extent);
-      if (clipped) {
+      this.clipped_ = render && !containsExtent(layerExtent, frameState.extent);
+      if (this.clipped_) {
         this.clipUnrotated(context, frameState, layerExtent);
       }
     }
@@ -327,7 +340,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
       );
     }
 
-    if (clipped) {
+    if (!frameState.declutter && this.clipped_) {
       context.restore();
     }
 

package/renderer/webgl/VectorLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;EAKE;;0BAGW,OAAO,2CAA2C,EAAE,WAAW;;;;;;;;;WAM9D,WAAW,GAAC,MAAM,WAAW,CAAC;;;;;;;;;;;AAP5C;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,6BAAwD;IAExD;;;OAGG;IACH,yBAAqB;IAErB,wBAAyB;IAEzB,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAA0C;IAE1C,qBAAwB;IACxB,wBAAsC;IACtC,mBAA4B;IAE5B;;;OAGG;IACH,oCAAoD;IAEpD;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,iBAAkB;IAIlB;;OAEG;IACH,eAAsC;IAEtC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,0BAA6B;IAG/B;;;OAGG;IACH,4BAqCC;IAED;;;OAGG;IACH,sBAIC;IAED;;OAEG;IACH,yBAMC;IAED,0BAMC;IASD;;;;OAIG;IACH,kCAGC;IAED;;;OAGG;IACH,oCAGC;IAED;;;OAGG;IACH,mCAGC;IAED;;OAEG;IACH,kCAEC;IAED;;;OAGG;IACH,uBAsBC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA+BtB;IAoED;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAoChB;CAqDF;+BA9e8B,YAAY"}
+{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;EAKE;;0BAGW,OAAO,2CAA2C,EAAE,WAAW;;;;;;;;;WAM9D,WAAW,GAAC,MAAM,WAAW,CAAC;;;;;;;;;;;AAP5C;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,6BAAwD;IAExD;;;OAGG;IACH,yBAAqB;IAErB,wBAAyB;IAEzB,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAA0C;IAE1C,qBAAwB;IACxB,wBAAsC;IACtC,mBAA4B;IAE5B;;;OAGG;IACH,oCAAoD;IAEpD;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,iBAAkB;IAIlB;;OAEG;IACH,eAAsC;IAEtC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,0BAA6B;IAG/B;;;OAGG;IACH,4BAqCC;IAED;;;OAGG;IACH,sBAIC;IAED;;OAEG;IACH,yBAMC;IAED,0BAMC;IASD;;;;OAIG;IACH,kCAGC;IAED;;;OAGG;IACH,oCAGC;IAED;;;OAGG;IACH,mCAGC;IAED;;OAEG;IACH,kCAEC;IAED;;;OAGG;IACH,uBAsBC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA+BtB;IAoED;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAuChB;CAqDF;+BAjf8B,YAAY"}

package/renderer/webgl/VectorLayer.js

@@ -428,12 +428,16 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
       );
     }
 
-    this.currentFrameStateTransform_ = this.helper.makeProjectionTransform(
-      frameState,
-      this.currentFrameStateTransform_,
-    );
-
     do {
+      this.helper.makeProjectionTransform(
+        frameState,
+        this.currentFrameStateTransform_,
+      );
+      translateTransform(
+        this.currentFrameStateTransform_,
+        world * worldWidth,
+        0,
+      );
       for (let i = 0, ii = this.styleRenderers_.length; i < ii; i++) {
         const renderer = this.styleRenderers_[i];
         const buffers = this.buffers_[i];
@@ -445,7 +449,6 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
           this.helper.applyHitDetectionUniform(forHitDetection);
         });
       }
-      translateTransform(this.currentFrameStateTransform_, worldWidth, 0);
     } while (++world < endWorld);
   }
 

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '9.1.1-dev.1714793032589';
+export const VERSION = '9.1.1-dev.1714987740907';