ol 10.4.1-dev.1739394158290 → 10.4.1-dev.1739437265514

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.4.1-dev.1739394158290",
+  "version": "10.4.1-dev.1739437265514",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/renderer/Layer.d.ts

@@ -61,9 +61,9 @@ declare class LayerRenderer<LayerType extends import("../layer/Layer.js").defaul
      * @abstract
      * @param {import("../Map.js").FrameState} frameState Frame state.
      * @param {HTMLElement|null} target Target that may be used to render content to.
-     * @return {HTMLElement|null} The rendered element.
+     * @return {HTMLElement} The rendered element.
      */
-    renderFrame(frameState: import("../Map.js").FrameState, target: HTMLElement | null): HTMLElement | null;
+    renderFrame(frameState: import("../Map.js").FrameState, target: HTMLElement | null): HTMLElement;
     /**
      * @abstract
      * @param {import("../coordinate.js").Coordinate} coordinate Coordinate.

package/renderer/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAUA;;GAEG;AACH,4BAFmD,SAAS,SAA/C,OAAQ,mBAAmB,EAAE,OAAQ;IAGhD;;OAEG;IACH,mBAFW,SAAS,EA+BnB;IA1BC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,mBAA6B;IAE7B;;;OAGG;IACH,wBAHU,MAAM,CAGgB;IAGlC;;OAEG;IACH,gBAFY,KAAK,CAAC,MAAM,CAAC,CAIxB;IAED;;OAEG;IACH,qBAFW,MAAM,QAOhB;IAED;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,OAAO,CAAC,KAAK,CAAC,OAAO,YAAY,EAAE,WAAW,CAAC,CAAC,CAK3D;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GAAC,IAAI,GACf,WAAW,GAAC,IAAI,CAI3B;IAED;;;;;;;;;OASG;IACH,2BAFa,CAAC,cANH,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,YACN,OAAO,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,WACxC,KAAK,CAAC,OAAO,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpC,CAAC,GAAC,SAAS,CAWtB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAQC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,aAAa,EAAE,OAAO,GAC5B,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;IAED;;OAEG;IACH,2BAFW,OAAO,WAAW,EAAE,UAAU,QAEZ;CAU9B;uBA9LsB,kBAAkB"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAUA;;GAEG;AACH,4BAFmD,SAAS,SAA/C,OAAQ,mBAAmB,EAAE,OAAQ;IAGhD;;OAEG;IACH,mBAFW,SAAS,EA+BnB;IA1BC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,eAAmB;IAEnB;;;OAGG;IACH,mBAA6B;IAE7B;;;OAGG;IACH,wBAHU,MAAM,CAGgB;IAGlC;;OAEG;IACH,gBAFY,KAAK,CAAC,MAAM,CAAC,CAIxB;IAED;;OAEG;IACH,qBAFW,MAAM,QAOhB;IAED;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,OAAO,CAAC,KAAK,CAAC,OAAO,YAAY,EAAE,WAAW,CAAC,CAAC,CAK3D;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GAAC,IAAI,GACf,WAAW,CAItB;IAED;;;;;;;;;OASG;IACH,2BAFa,CAAC,cANH,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,YACN,OAAO,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,WACxC,KAAK,CAAC,OAAO,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpC,CAAC,GAAC,SAAS,CAWtB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAQC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,aAAa,EAAE,OAAO,GAC5B,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;IAED;;OAEG;IACH,2BAFW,OAAO,WAAW,EAAE,UAAU,QAEZ;CAU9B;uBA9LsB,kBAAkB"}

package/renderer/Layer.js

@@ -96,7 +96,7 @@ class LayerRenderer extends Observable {
    * @abstract
    * @param {import("../Map.js").FrameState} frameState Frame state.
    * @param {HTMLElement|null} target Target that may be used to render content to.
-   * @return {HTMLElement|null} The rendered element.
+   * @return {HTMLElement} The rendered element.
    */
   renderFrame(frameState, target) {
     return abstract();

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

@@ -1 +1 @@
-{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IACE;;OAEG;IACH,mBAFW,OAAO,4BAA4B,EAAE,OAAO,EA4BtD;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAYjD;;;;;OAKG;IACH,4BAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,OAAO,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAY1D;IAkHD;;OAEG;IACH,2BAAc;IAEd;;OAEG;IACH,4BAAe;IAEf;OACG;IACH,wBAAoB;CAoCrB;qCAlOoC,iBAAiB"}
+{"version":3,"file":"VectorImageLayer.d.ts","sourceRoot":"","sources":["VectorImageLayer.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IACE;;OAEG;IACH,mBAFW,OAAO,4BAA4B,EAAE,OAAO,EA4BtD;IAvBC;;;OAGG;IACH,wBAA2D;IAE3D;;;OAGG;IACH,yBAA6C;IAE7C;;;OAGG;IACH,0CAAiD;IAEjD;;;OAGG;IACH,4CAA+C;IAYjD;;;;;OAKG;IACH,4BAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,OAAO,CAAC,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CAY1D;IA+GD;;OAEG;IACH,2BAAc;IAEd;;OAEG;IACH,4BAAe;IAEf;OACG;IACH,wBAAoB;CAoCrB;qCA/NoC,iBAAiB"}

package/renderer/canvas/VectorImageLayer.js

@@ -133,7 +133,6 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
           [declutter]: new RBush(9),
         };
       }
-      let emptyImage = true;
       const image = new ImageCanvas(
         renderedExtent,
         viewResolution,
@@ -145,11 +144,9 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
             vectorRenderer.replayGroupChanged
           ) {
             vectorRenderer.clipping = false;
-            if (vectorRenderer.renderFrame(imageFrameState, null)) {
-              vectorRenderer.renderDeclutter(imageFrameState);
-              vectorRenderer.renderDeferred(imageFrameState);
-              emptyImage = false;
-            }
+            vectorRenderer.renderFrame(imageFrameState, null);
+            vectorRenderer.renderDeclutter(imageFrameState);
+            vectorRenderer.renderDeferred(imageFrameState);
             callback();
           }
         },
@@ -159,7 +156,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
         if (image.getState() !== ImageState.LOADED) {
           return;
         }
-        this.image = emptyImage ? null : image;
+        this.image = image;
         const imagePixelRatio = image.getPixelRatio();
         const renderedResolution =
           (fromResolutionLike(image.getResolution()) * pixelRatio) /
@@ -184,7 +181,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
         frameState.pixelToCoordinateTransform.slice();
     }
 
-    return !!this.image;
+    return !this.getLayer().getSource().loading && !!this.image;
   }
 
   /**

package/renderer/canvas/VectorLayer.js

@@ -297,7 +297,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
    * Render the layer.
    * @param {import("../../Map.js").FrameState} frameState Frame state.
    * @param {HTMLElement|null} target Target that may be used to render content to.
-   * @return {HTMLElement|null} The rendered element.
+   * @return {HTMLElement} The rendered element.
    * @override
    */
   renderFrame(frameState, target) {
@@ -315,7 +315,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
         this.getLayer().hasListener(RenderEventType.PRERENDER) ||
         this.getLayer().hasListener(RenderEventType.POSTRENDER);
       if (!hasRenderListeners) {
-        return null;
+        return this.container;
       }
     }
 

package/source/UTFGrid.d.ts

@@ -194,6 +194,11 @@ declare class UTFGrid extends TileSource<Tile> {
      * @type {boolean}
      */
     private jsonp_;
+    /**
+     * @private
+     * @type {LRUCache}
+     */
+    private tileCache_;
     /**
      * @private
      * @param {Event} event The load event.

package/source/UTFGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"AAeA;;;;;GAKG;AAEH;IACE;;;;;;;OAOG;IACH,uBAPW,OAAO,iBAAiB,EAAE,SAAS,mBAEnC,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,OAAO,SACP,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,aAAe;IAEf;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAGrB;;;OAGG;IACH,YAFY,gBAAgB,CAI3B;IAED;;;;OAIG;IACH,oBAHW,OAAO,kBAAkB,EAAE,UAAU,GACpC,GAAC,CAoCZ;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,kBAAkB,EAAE,UAAU,YACrC,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,YACjB,OAAO,QAmBjB;IAWD;;OAEG;IACH,qBAGC;IAED;;;OAGG;IACH,oBAOC;IAED;;OAEG;IACH,sBAiBC;IAED;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;CAYF;;;;;;UApOa,KAAK,CAAC,MAAM,CAAC;;;;UACb,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAdV,YAAY;AAmP7B;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsDjB;IA5CC;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,yBAA2C;IAE3C;;;OAGG;IACH,kBAA0B;IAE1B;;;OAGG;IACH,eAAoC;IAuBtC;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,eAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;;;;;;OAUG;IACH,6CAPW,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,YACN,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,YACjB,OAAO,QA2BjB;IAED;;OAEG;IACH,sCAEC;IAED;;;;OAIG;IACH,2CAFW,OAAO,eAAe,EAAE,MAAM,QA8CxC;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,UAAU,CAmBtB;CACF;uBA7dsB,WAAW"}
+{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AAEH;IACE;;;;;;;OAOG;IACH,uBAPW,OAAO,iBAAiB,EAAE,SAAS,mBAEnC,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,OAAO,SACP,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,aAAe;IAEf;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAGrB;;;OAGG;IACH,YAFY,gBAAgB,CAI3B;IAED;;;;OAIG;IACH,oBAHW,OAAO,kBAAkB,EAAE,UAAU,GACpC,GAAC,CAoCZ;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,kBAAkB,EAAE,UAAU,YACrC,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,YACjB,OAAO,QAmBjB;IAWD;;OAEG;IACH,qBAGC;IAED;;;OAGG;IACH,oBAOC;IAED;;OAEG;IACH,sBAiBC;IAED;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;CAYF;;;;;;UApOa,KAAK,CAAC,MAAM,CAAC;;;;UACb,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAhBV,YAAY;AAqP7B;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4DjB;IAlDC;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,yBAA2C;IAE3C;;;OAGG;IACH,kBAA0B;IAE1B;;;OAGG;IACH,eAAoC;IAEpC;;;OAGG;IACH,mBAAmC;IAuBrC;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,eAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;;;;;;OAUG;IACH,6CAPW,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,YACN,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,YACjB,OAAO,QA8BjB;IAED;;OAEG;IACH,sCAEC;IAED;;;;OAIG;IACH,2CAFW,OAAO,eAAe,EAAE,MAAM,QA8CxC;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,UAAU,CAyBtB;CACF;uBA5esB,WAAW"}

package/source/UTFGrid.js

@@ -9,6 +9,8 @@ import {listenOnce} from '../events.js';
 import {applyTransform, intersects} from '../extent.js';
 import {jsonp as requestJSONP} from '../net.js';
 import {get as getProjection, getTransformFromProjections} from '../proj.js';
+import LRUCache from '../structs/LRUCache.js';
+import {getKeyZXY} from '../tilecoord.js';
 import {createXYZ, extentFromProjection} from '../tilegrid.js';
 import {createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js';
 import TileSource from './Tile.js';
@@ -307,6 +309,12 @@ class UTFGrid extends TileSource {
      */
     this.jsonp_ = options.jsonp || false;
 
+    /**
+     * @private
+     * @type {LRUCache}
+     */
+    this.tileCache_ = new LRUCache(512);
+
     if (options.url) {
       if (this.jsonp_) {
         requestJSONP(
@@ -392,6 +400,9 @@ class UTFGrid extends TileSource {
           this.getProjection(),
         )
       );
+      if (tile.getState() == TileState.IDLE) {
+        tile.load();
+      }
       tile.forDataAtCoordinate(coordinate, callback, request);
     } else {
       if (request === true) {
@@ -478,6 +489,11 @@ class UTFGrid extends TileSource {
       projection,
     );
     const tileUrl = this.tileUrlFunction_(urlTileCoord, pixelRatio, projection);
+    const tileKey = `${this.getKey()},${getKeyZXY(z, x, y)}`;
+    if (this.tileCache_.containsKey(tileKey)) {
+      return this.tileCache_.get(tileKey);
+    }
+    this.tileCache_.expireCache();
     const tile = new CustomTile(
       tileCoord,
       tileUrl !== undefined ? TileState.IDLE : TileState.EMPTY,
@@ -486,6 +502,7 @@ class UTFGrid extends TileSource {
       this.preemptive_,
       this.jsonp_,
     );
+    this.tileCache_.set(tileKey, tile);
     return tile;
   }
 }

package/util.js

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