ol 10.7.1-dev.1764841052662 → 10.7.1-dev.1765294755337

package/package.json

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

package/style/IconImage.d.ts

@@ -90,6 +90,10 @@ declare class IconImage extends EventTarget {
      * @return {HTMLImageElement|HTMLCanvasElement|OffscreenCanvas|ImageBitmap} Image or Canvas element or image bitmap.
      */
     getImage(pixelRatio: number): HTMLImageElement | HTMLCanvasElement | OffscreenCanvas | ImageBitmap;
+    /**
+     * @param {HTMLImageElement|HTMLCanvasElement|OffscreenCanvas|ImageBitmap} image Image.
+     */
+    setImage(image: HTMLImageElement | HTMLCanvasElement | OffscreenCanvas | ImageBitmap): void;
     /**
      * @param {number} pixelRatio Pixel ratio.
      * @return {number} Image or Canvas element.

package/style/IconImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IconImage.d.ts","sourceRoot":"","sources":["IconImage.js"],"names":[],"mappings":"AA6SA;;;;;;;;GAQG;AACH,2BARW,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,GAAC,IAAI,YACnE,MAAM,GAAC,SAAS,eACf,MAAM,OAAA,cACP,GAAkC,GAAC,SAAS,SAC5C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,IAAI,YACvC,OAAO,GACN,SAAS,CAyBpB;;AA5TD;IACE;;;;;;OAMG;IACH,mBANW,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,GAAC,IAAI,OACnE,MAAM,GAAC,SAAS,eACf,MAAM,OAAA,cACP,GAAkC,GAAC,SAAS,SAC5C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,IAAI,EAgEjD;IA3DC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,qBAA+B;IAE/B;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,oBAA0E;IAE1E;;;OAGG;IACH,cAC2E;IAE3E;;;OAGG;IACH,aAAe;IAOf;;;OAGG;IACH,eAAkB;IAGpB;;OAEG;IACH,yBAKC;IAED;;;OAGG;IACH,mBAiBC;IAPK,8BAAqB;IAS3B;;OAEG;IACH,6BAEC;IAED;;OAEG;IACH,0BAGC;IAED;;OAEG;IACH,yBAIC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,CAQzE;IAED;;;OAGG;IACH,0BAHW,MAAM,GACL,MAAM,CAKjB;IAED;;OAEG;IACH,qBAEC;IAED;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,CAkBzE;IAED;;;OAGG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;OAEG;IACH,UAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;OAEG;IACH,aAwBC;IAED;;;OAGG;IACH,sBA2BC;IAED;;OAEG;IACH,SAFY,OAAO,CAAC,IAAI,CAAC,CAyBxB;CACF;wBAlSuB,qBAAqB"}
+{"version":3,"file":"IconImage.d.ts","sourceRoot":"","sources":["IconImage.js"],"names":[],"mappings":"AAoTA;;;;;;;;GAQG;AACH,2BARW,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,GAAC,IAAI,YACnE,MAAM,GAAC,SAAS,eACf,MAAM,OAAA,cACP,GAAkC,GAAC,SAAS,SAC5C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,IAAI,YACvC,OAAO,GACN,SAAS,CAyBpB;;AAnUD;IACE;;;;;;OAMG;IACH,mBANW,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,GAAC,IAAI,OACnE,MAAM,GAAC,SAAS,eACf,MAAM,OAAA,cACP,GAAkC,GAAC,SAAS,SAC5C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,IAAI,EAgEjD;IA3DC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,qBAA+B;IAE/B;;;OAGG;IACH,gBAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,oBAA0E;IAE1E;;;OAGG;IACH,cAC2E;IAE3E;;;OAGG;IACH,aAAe;IAOf;;;OAGG;IACH,eAAkB;IAGpB;;OAEG;IACH,yBAKC;IAED;;;OAGG;IACH,mBAiBC;IAPK,8BAAqB;IAS3B;;OAEG;IACH,6BAEC;IAED;;OAEG;IACH,0BAGC;IAED;;OAEG;IACH,yBAIC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,CAQzE;IAED;;OAEG;IACH,gBAFW,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,QAIxE;IAED;;;OAGG;IACH,0BAHW,MAAM,GACL,MAAM,CAKjB;IAED;;OAEG;IACH,qBAEC;IAED;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,eAAe,GAAC,WAAW,CAkBzE;IAED;;;OAGG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;OAEG;IACH,UAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;OAEG;IACH,aAwBC;IAED;;;OAGG;IACH,sBA2BC;IAED;;OAEG;IACH,SAFY,OAAO,CAAC,IAAI,CAAC,CAyBxB;CACF;wBAzSuB,qBAAqB"}

package/style/IconImage.js

@@ -156,6 +156,13 @@ class IconImage extends EventTarget {
     return this.canvas_[pixelRatio] ? this.canvas_[pixelRatio] : this.image_;
   }
 
+  /**
+   * @param {HTMLImageElement|HTMLCanvasElement|OffscreenCanvas|ImageBitmap} image Image.
+   */
+  setImage(image) {
+    this.image_ = image;
+  }
+
   /**
    * @param {number} pixelRatio Pixel ratio.
    * @return {number} Image or Canvas element.

package/style/RegularShape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAwBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;;OAKG;IACH,kBAJY,YAAY,CAqBvB;IAqBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;;OAGG;IACH,iCAHY,iBAAiB,GAAC,eAAe,CAU5C;IAED;;;;;;OAMG;IACH,8BALW,MAAM,GACL,iBAAiB,GAAC,eAAe,CA2B5C;IAsCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,kBAHW,MAAM,QAShB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GAAC,SAAS,QAS1B;IAYD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAoBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAKC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAQF;uBAnoBsB,YAAY"}
+{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAwBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAqFjB;IAvEC;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,kBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB;;OAEG;IACH,oBAGuB;IAOzB;;;;;OAKG;IACH,kBAJY,YAAY,CAqBvB;IAqBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;;OAGG;IACH,iCAHY,iBAAiB,GAAC,eAAe,CAU5C;IAED;;;;;;OAMG;IACH,8BALW,MAAM,GACL,iBAAiB,GAAC,eAAe,CAoC5C;IAsCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,kBAHW,MAAM,QAShB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GAAC,SAAS,QAS1B;IAYD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAoBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAKC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAQF;uBA5oBsB,YAAY"}

package/style/RegularShape.js

@@ -5,7 +5,7 @@
 import ImageState from '../ImageState.js';
 import {asArray} from '../color.js';
 import {asColorLike} from '../colorlike.js';
-import {createCanvasContext2D} from '../dom.js';
+import {createCanvasContext2D, releaseCanvas} from '../dom.js';
 import {
   defaultFillStyle,
   defaultLineCap,
@@ -252,12 +252,21 @@ class RegularShape extends ImageStyle {
       this.draw_(renderOptions, context, pixelRatio);
 
       image = context.canvas;
-      iconImageCache.set(
-        cacheKey,
+      const iconImage = new IconImage(
+        image,
+        undefined,
         null,
+        ImageState.LOADED,
         null,
-        new IconImage(image, undefined, null, ImageState.LOADED, null),
       );
+      iconImageCache.set(cacheKey, null, null, iconImage);
+      // Update the image in place to an ImageBitmap for better performance and lower memory usage
+      createImageBitmap(image).then((imageBitmap) => {
+        iconImage.setImage(imageBitmap);
+        if (this.hitDetectionCanvas_ !== image) {
+          releaseCanvas(context);
+        }
+      });
     }
     return image;
   }

package/util.js

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