ol 10.7.1-dev.1764736468522 → 10.7.1-dev.1764840646882

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.7.1-dev.1764736468522",
+  "version": "10.7.1-dev.1764840646882",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/render/canvas/ExecutorGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutorGroup.d.ts","sourceRoot":"","sources":["ExecutorGroup.js"],"names":[],"mappings":"AAidA;;;;;;GAMG;AACH,2CAHW,MAAM,GACL,KAAK,CAAC,MAAM,CAAC,CA2CxB;AAlfD;;;GAGG;AACH,kBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CASjD;AAEF;;;GAGG;AACH,wBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAER;AAE3C;;;GAGG;AACH,4BAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAIjD;;AAEF;IACE;;;;;;;;;;;;OAYG;IACH,uBAZW,OAAO,iBAAiB,EAAE,MAAM,cAIhC,MAAM,cACN,MAAM,YACN,OAAO,mBACP;YAAQ,MAAM,GAAE,GAA4F;KAAC,iBAE7G,MAAM,sBACN,OAAO,EAwEjB;IA7DC;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,kBAAyB;IAEzB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,sBAAiC;IAEjC;;;OAGG;IACH,2BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,gCAAiC;IAKnC;;;OAGG;IACH,cAHW,wBAAwB,GAAC,iCAAiC,aAC1D,OAAO,oBAAoB,EAAE,SAAS,QAUhD;IAED;;;;;OAKG;IACH,yBAmBC;IAED;;;OAGG;IACH,wBAHW,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,GACxC,OAAO,CAYlB;IAED;;;;;;;;;OASG;IACH,2BAFa,CAAC,cAPH,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,gBACN,MAAM,YACN,CAAS,IAAsC,EAAtC,OAAO,kBAAkB,EAAE,WAAW,EAAE,IAA8C,EAA9C,OAAO,8BAA8B,EAAE,OAAO,EAAE,IAAM,EAAN,MAAM,KAAG,CAAC,uBAC3G,KAAK,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,GAC5C,CAAC,GAAC,SAAS,CA+HtB;IAED;;;OAGG;IACH,yBAHW,OAAO,oBAAoB,EAAE,SAAS,GACrC,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI,CAc7B;IAED;;OAEG;IACH,WAFY,OAAO,CAIlB;IAED;;;;;;;;;;OAUG;IACH,uBAVW,wBAAwB,GAAC,iCAAiC,oBAC1D,OAAO,eAAe,EAAE,IAAI,aAC5B,OAAO,oBAAoB,EAAE,SAAS,gBACtC,MAAM,eACN,OAAO,iBACP,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,kBAEzC,OAAO,OAAO,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,cAAc,CAAC,GAAC,IAAI,QAgF9E;IAED;;MAEC;IAED,mFAEC;IAED,uBAUC;CACF"}
+{"version":3,"file":"ExecutorGroup.d.ts","sourceRoot":"","sources":["ExecutorGroup.js"],"names":[],"mappings":"AAqfA;;;;;;GAMG;AACH,2CAHW,MAAM,GACL,KAAK,CAAC,MAAM,CAAC,CA2CxB;AAthBD;;;GAGG;AACH,kBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CASjD;AAEF;;;GAGG;AACH,wBAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAER;AAE3C;;;GAGG;AACH,4BAFU,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,CAIjD;;AAqCF;IACE;;;;;;;;;;;;OAYG;IACH,uBAZW,OAAO,iBAAiB,EAAE,MAAM,cAIhC,MAAM,cACN,MAAM,YACN,OAAO,mBACP;YAAQ,MAAM,GAAE,GAA4F;KAAC,iBAE7G,MAAM,sBACN,OAAO,EAwEjB;IA7DC;;;OAGG;IACH,mBAA2B;IAE3B;;;OAGG;IACH,kBAAyB;IAEzB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,sBAAiC;IAEjC;;;OAGG;IACH,2BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,yBAA4B;IAE5B;;;OAGG;IACH,gCAAiC;IAKnC;;;OAGG;IACH,cAHW,wBAAwB,GAAC,iCAAiC,aAC1D,OAAO,oBAAoB,EAAE,SAAS,QAUhD;IAED;;;;;OAKG;IACH,yBAmBC;IAED;;;OAGG;IACH,wBAHW,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,GACxC,OAAO,CAYlB;IAED;;;;;;;;;OASG;IACH,2BAFa,CAAC,cAPH,OAAO,qBAAqB,EAAE,UAAU,cACxC,MAAM,YACN,MAAM,gBACN,MAAM,YACN,CAAS,IAAsC,EAAtC,OAAO,kBAAkB,EAAE,WAAW,EAAE,IAA8C,EAA9C,OAAO,8BAA8B,EAAE,OAAO,EAAE,IAAM,EAAN,MAAM,KAAG,CAAC,uBAC3G,KAAK,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,GAC5C,CAAC,GAAC,SAAS,CAgItB;IAED;;;OAGG;IACH,yBAHW,OAAO,oBAAoB,EAAE,SAAS,GACrC,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI,CAc7B;IAED;;OAEG;IACH,WAFY,OAAO,CAIlB;IAED;;;;;;;;;;OAUG;IACH,uBAVW,wBAAwB,GAAC,iCAAiC,oBAC1D,OAAO,eAAe,EAAE,IAAI,aAC5B,OAAO,oBAAoB,EAAE,SAAS,gBACtC,MAAM,eACN,OAAO,iBACP,KAAK,CAAC,OAAO,cAAc,EAAE,WAAW,CAAC,kBAEzC,OAAO,OAAO,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,cAAc,CAAC,GAAC,IAAI,QAgF9E;IAED;;MAEC;IAED,mFAEC;IAED,uBAUC;CACF"}

package/render/canvas/ExecutorGroup.js

@@ -40,6 +40,41 @@ export const NON_DECLUTTER = ALL.filter(
   (builderType) => !DECLUTTER.includes(builderType),
 );
 
+/** @type {boolean|undefined} */
+let willReadFrequently = false;
+
+/** @type {boolean|undefined} */
+let canvasReadsBenchmarked = false;
+
+/** Determine if canvas read operations are faster with willReadFrequently set to true or false */
+function benchmarkCanvasReads() {
+  let bestResult = 0;
+  /**
+   * @param {boolean} willReadFrequently Will read frequently.
+   * @return {number} Operation count.
+   */
+  const measure = (willReadFrequently) => {
+    const context = createCanvasContext2D(1, 1, null, {willReadFrequently});
+    let count = 0;
+    const start = performance.now();
+    for (; performance.now() - start < 50; ++count) {
+      context.fillStyle = `rgba(255,0,${count % 256},1)`;
+      context.fillRect(0, 0, 1, 1);
+      context.getImageData(0, 0, 1, 1);
+    }
+    bestResult = count > bestResult ? count : bestResult;
+    return count;
+  };
+
+  const measures = {
+    [measure(true)]: true,
+    [measure(false)]: false,
+    [measure(undefined)]: undefined,
+  };
+  willReadFrequently = measures[bestResult];
+  canvasReadsBenchmarked = true;
+}
+
 class ExecutorGroup {
   /**
    * @param {import("../../extent.js").Extent} maxExtent Max extent for clipping. When a
@@ -201,6 +236,10 @@ class ExecutorGroup {
     callback,
     declutteredFeatures,
   ) {
+    if (canvasReadsBenchmarked === false) {
+      benchmarkCanvasReads();
+    }
+
     hitTolerance = Math.round(hitTolerance);
     const contextSize = hitTolerance * 2 + 1;
     const transform = composeTransform(
@@ -216,14 +255,11 @@ class ExecutorGroup {
 
     const newContext = !this.hitDetectionContext_;
     if (newContext) {
-      // Refrain from adding a 'willReadFrequently' hint in the options here.
-      // While it will remove the "Canvas2D: Multiple readback operations using
-      // getImageData are faster with the willReadFrequently attribute set
-      // to true" warnings in the console, it makes hitDetection extremely
-      // slow in Chrome when there are many features on the map
       this.hitDetectionContext_ = createCanvasContext2D(
         contextSize,
         contextSize,
+        null,
+        {willReadFrequently},
       );
     }
     const context = this.hitDetectionContext_;

package/reproj/Tile.d.ts

@@ -4,7 +4,11 @@ export type TileOffset = {
     /**
      * Tile.
      */
-    tile: import("../ImageTile.js").default;
+    tile?: import("../ImageTile.js").default | undefined;
+    /**
+     * Tile getter.
+     */
+    getTile: () => import("../ImageTile.js").default;
     /**
      * Offset.
      */
@@ -15,7 +19,8 @@ export type TileOffset = {
  */
 /**
  * @typedef {Object} TileOffset
- * @property {import("../ImageTile.js").default} tile Tile.
+ * @property {import("../ImageTile.js").default} [tile] Tile.
+ * @property {function(): import("../ImageTile.js").default} getTile Tile getter.
  * @property {number} offset Offset.
  */
 /**

package/reproj/Tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":";2BAoBa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,KAAI,CAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;;;;;UAK7E,OAAO,iBAAiB,EAAE,OAAO;;;;YACjC,MAAM;;AAPpB;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH,wBAdW,OAAO,uBAAuB,EAAE,OAAO,kBACvC,OAAO,yBAAyB,EAAE,OAAO,cACzC,OAAO,uBAAuB,EAAE,OAAO,kBACvC,OAAO,yBAAyB,EAAE,OAAO,aACzC,OAAO,iBAAiB,EAAE,SAAS,oBACnC,OAAO,iBAAiB,EAAE,SAAS,cACnC,MAAM,UACN,MAAM,mBACN,YAAY,mBAEZ,MAAM,gBACN,OAAO,YACP,OAAO,YAAY,EAAE,OAAO,EAmNtC;IAjMC;;;OAGG;IACH,qBAAmE;IAEnE;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,wBAAqC;IAErC;;;OAGG;IACH,wBAAqC;IAErC;;;OAGG;IACH,0BAAwE;IAExE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAEjB;;;OAGG;IACH,oBAEa;IAiDb;;;OAGG;IACH,uBAOC;IAqEH;;;OAGG;IACH,YAFY,iBAAiB,GAAC,eAAe,CAI5C;IAED;;OAEG;IACH,mBAwDC;IAmDD;;OAEG;IACH,yBAGC;CAkBF;iBAhZgB,YAAY"}
+{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":";2BAoBa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,KAAI,CAAC,OAAO,iBAAiB,EAAE,OAAO,CAAC;;;;;;;;;aAM7E,MAAY,OAAO,iBAAiB,EAAE,OAAO;;;;YAC7C,MAAM;;AARpB;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;GAKG;AACH;IACE;;;;;;;;;;;;;;OAcG;IACH,wBAdW,OAAO,uBAAuB,EAAE,OAAO,kBACvC,OAAO,yBAAyB,EAAE,OAAO,cACzC,OAAO,uBAAuB,EAAE,OAAO,kBACvC,OAAO,yBAAyB,EAAE,OAAO,aACzC,OAAO,iBAAiB,EAAE,SAAS,oBACnC,OAAO,iBAAiB,EAAE,SAAS,cACnC,MAAM,UACN,MAAM,mBACN,YAAY,mBAEZ,MAAM,gBACN,OAAO,YACP,OAAO,YAAY,EAAE,OAAO,EAoNtC;IAlMC;;;OAGG;IACH,qBAAmE;IAEnE;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,wBAAqC;IAErC;;;OAGG;IACH,wBAAqC;IAErC;;;OAGG;IACH,0BAAwE;IAExE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAEjB;;;OAGG;IACH,oBAEa;IAiDb;;;OAGG;IACH,uBAOC;IAsEH;;;OAGG;IACH,YAFY,iBAAiB,GAAC,eAAe,CAI5C;IAED;;OAEG;IACH,mBAwDC;IAsDD;;OAEG;IACH,yBAGC;CAmBF;iBAtZgB,YAAY"}

package/reproj/Tile.js

@@ -23,7 +23,8 @@ import {ERROR_THRESHOLD} from './common.js';
 
 /**
  * @typedef {Object} TileOffset
- * @property {import("../ImageTile.js").default} tile Tile.
+ * @property {import("../ImageTile.js").default} [tile] Tile.
+ * @property {function(): import("../ImageTile.js").default} getTile Tile getter.
  * @property {number} offset Offset.
  */
 
@@ -244,11 +245,12 @@ class ReprojTile extends Tile {
 
         for (let srcX = sourceRange.minX; srcX <= sourceRange.maxX; srcX++) {
           for (let srcY = sourceRange.minY; srcY <= sourceRange.maxY; srcY++) {
-            const tile = getTileFunction(this.sourceZ_, srcX, srcY, pixelRatio);
-            if (tile) {
-              const offset = worldsAway * worldWidth;
-              this.sourceTiles_.push({tile, offset});
-            }
+            const offset = worldsAway * worldWidth;
+            this.sourceTiles_.push({
+              getTile: () =>
+                getTileFunction(this.sourceZ_, srcX, srcY, pixelRatio),
+              offset,
+            });
           }
         }
         ++worldsAway;
@@ -334,6 +336,9 @@ class ReprojTile extends Tile {
    * @override
    */
   load() {
+    for (const sourceTile of this.sourceTiles_) {
+      sourceTile.tile = sourceTile.getTile();
+    }
     if (this.state == TileState.IDLE) {
       this.state = TileState.LOADING;
       this.changed();
@@ -400,6 +405,7 @@ class ReprojTile extends Tile {
       canvasPool.push(this.canvas_);
       this.canvas_ = null;
     }
+    this.sourceTiles_.length = 0;
     super.release();
   }
 }

package/util.js

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