ol 7.3.0 → 7.3.1-dev.1678058258888

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "7.3.0",
+  "version": "7.3.1-dev.1678058258888",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/renderer/webgl/TileLayer.d.ts

@@ -1,3 +1,12 @@
+/**
+ * @typedef {Object} TileTextureLookup
+ * @property {Set<string>} tileIds The set of tile ids in the lookup.
+ * @property {Object<number, Set<TileTexture>>} texturesByZ Tile textures by zoom level.
+ */
+/**
+ * @return {TileTextureLookup} A new tile texture lookup.
+ */
+export function newTileTextureLookup(): TileTextureLookup;
 export namespace Uniforms {
     const TILE_TEXTURE_ARRAY: string;
     const TILE_TRANSFORM: string;
@@ -16,6 +25,18 @@ export namespace Attributes {
     const TEXTURE_COORD: string;
 }
 export default WebGLTileLayerRenderer;
+export type TileTextureLookup = {
+    /**
+     * The set of tile ids in the lookup.
+     */
+    tileIds: Set<string>;
+    /**
+     * Tile textures by zoom level.
+     */
+    texturesByZ: {
+        [x: number]: Set<TileTexture>;
+    };
+};
 export type Options = {
     /**
      * Vertex shader source.
@@ -162,12 +183,10 @@ declare class WebGLTileLayerRenderer extends WebGLLayerRenderer<import("../../la
      * @param {import("../../Map.js").FrameState} frameState Frame state.
      * @param {import("../../extent.js").Extent} extent The extent to be rendered.
      * @param {number} initialZ The zoom level.
-     * @param {Object<number, Array<TileTexture>>} tileTexturesByZ The zoom level.
+     * @param {TileTextureLookup} tileTextureLookup The zoom level.
      * @param {number} preload Number of additional levels to load.
      */
-    enqueueTiles(frameState: import("../../Map.js").FrameState, extent: import("../../extent.js").Extent, initialZ: number, tileTexturesByZ: {
-        [x: number]: Array<TileTexture>;
-    }, preload: number): void;
+    enqueueTiles(frameState: import("../../Map.js").FrameState, extent: import("../../extent.js").Extent, initialZ: number, tileTextureLookup: TileTextureLookup, preload: number): void;
     /**
      * Render the layer.
      * @param {import("../../Map.js").FrameState} frameState Frame state.
@@ -185,7 +204,7 @@ declare class WebGLTileLayerRenderer extends WebGLLayerRenderer<import("../../la
      * @param {import("../../tilegrid/TileGrid.js").default} tileGrid The tile grid.
      * @param {import("../../tilecoord.js").TileCoord} tileCoord The target tile coordinate.
      * @param {number} altZ The alternate zoom level.
-     * @param {Object<number, Array<import("../../webgl/TileTexture.js").default>>} tileTexturesByZ Lookup of
+     * @param {TileTextureLookup} tileTextureLookup Lookup of
      * tile textures by zoom level.
      * @return {boolean} The tile coordinate is covered by loaded tiles at the alternate zoom level.
      * @private
@@ -193,6 +212,6 @@ declare class WebGLTileLayerRenderer extends WebGLLayerRenderer<import("../../la
     private findAltTiles_;
     clearCache(): void;
 }
-import WebGLLayerRenderer from "./Layer.js";
 import TileTexture from "../../webgl/TileTexture.js";
+import WebGLLayerRenderer from "./Layer.js";
 //# sourceMappingURL=TileLayer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;kBAmIc,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;wBAQP,OAAO,0BAA0B,EAAE,OAAO;AAXvD;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EAyGjB;IAlGC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,kBAA6B;IAE7B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAEvB;;;OAGG;IACH,iBAAa;IAEb;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;;;;;;;;;;;;;;OAgBG;IACH,iBAAuE;IAKvE;;;OAGG;IACH,0BAAgD;IAEhD;;;OAGG;IACH,yBAAqD;IAErD;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,oBAA4B;IAG9B;;OAEG;IACH,eAFW,OAAO,QAgBjB;IAWD;;;;OAIG;IACH,wBASC;IA2BD;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM;YACC,MAAM,GAAE,MAAM,WAAW,CAAC;gBACjC,MAAM,QAwGhB;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CAmStB;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,CA4F7D;IAED;;;;;;;;;;OAUG;IACH,sBA+BC;IAED,mBAIC;CA6BF"}
+{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":"AAoFA;;;;GAIG;AAEH;;GAEG;AACH,wCAFY,iBAAiB,CAI5B;;;;;;;;;;;;;;;;;;;;;;;aATa,IAAI,MAAM,CAAC;;;;;YACJ,MAAM,GAAE,IAAI,WAAW,CAAC;;;;;;;kBAoE/B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;wBAQP,OAAO,0BAA0B,EAAE,OAAO;AAXvD;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EAyGjB;IAlGC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,kBAA6B;IAE7B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAEvB;;;OAGG;IACH,iBAAa;IAEb;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;;;;;;;;;;;;;;OAgBG;IACH,iBAAuE;IAKvE;;;OAGG;IACH,0BAAgD;IAEhD;;;OAGG;IACH,yBAAqD;IAErD;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,oBAA4B;IAG9B;;OAEG;IACH,eAFW,OAAO,QAgBjB;IAWD;;;;OAIG;IACH,wBASC;IA2BD;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,qBACN,iBAAiB,WACjB,MAAM,QA6GhB;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CAgStB;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,CA4F7D;IAED;;;;;;;;;;OAUG;IACH,sBAkCC;IAED,mBAIC;CA6BF"}

package/renderer/webgl/TileLayer.js

@@ -82,18 +82,42 @@ function depthForZ(z) {
   return 2 * (1 - 1 / (z + 1)) - 1;
 }
 
+/**
+ * @typedef {Object} TileTextureLookup
+ * @property {Set<string>} tileIds The set of tile ids in the lookup.
+ * @property {Object<number, Set<TileTexture>>} texturesByZ Tile textures by zoom level.
+ */
+
+/**
+ * @return {TileTextureLookup} A new tile texture lookup.
+ */
+export function newTileTextureLookup() {
+  return {tileIds: new Set(), texturesByZ: {}};
+}
+
+/**
+ * Check if a tile is already in the tile texture lookup.
+ * @param {TileTextureLookup} tileTextureLookup Lookup of tile textures by zoom level.
+ * @param {import("../../Tile.js").default} tile A tile.
+ * @return {boolean} The tile is already in the lookup.
+ */
+function lookupHasTile(tileTextureLookup, tile) {
+  return tileTextureLookup.tileIds.has(getUid(tile));
+}
+
 /**
  * Add a tile texture to the lookup.
- * @param {Object<number, Array<import("../../webgl/TileTexture.js").default>>} tileTexturesByZ Lookup of
- * tile textures by zoom level.
- * @param {import("../../webgl/TileTexture.js").default} tileTexture A tile texture.
+ * @param {TileTextureLookup} tileTextureLookup Lookup of tile textures by zoom level.
+ * @param {TileTexture} tileTexture A tile texture.
  * @param {number} z The zoom level.
  */
-function addTileTextureToLookup(tileTexturesByZ, tileTexture, z) {
-  if (!(z in tileTexturesByZ)) {
-    tileTexturesByZ[z] = [];
+function addTileTextureToLookup(tileTextureLookup, tileTexture, z) {
+  const texturesByZ = tileTextureLookup.texturesByZ;
+  if (!(z in texturesByZ)) {
+    texturesByZ[z] = new Set();
   }
-  tileTexturesByZ[z].push(tileTexture);
+  texturesByZ[z].add(tileTexture);
+  tileTextureLookup.tileIds.add(getUid(tileTexture.tile));
 }
 
 /**
@@ -330,10 +354,10 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
    * @param {import("../../Map.js").FrameState} frameState Frame state.
    * @param {import("../../extent.js").Extent} extent The extent to be rendered.
    * @param {number} initialZ The zoom level.
-   * @param {Object<number, Array<TileTexture>>} tileTexturesByZ The zoom level.
+   * @param {TileTextureLookup} tileTextureLookup The zoom level.
    * @param {number} preload Number of additional levels to load.
    */
-  enqueueTiles(frameState, extent, initialZ, tileTexturesByZ, preload) {
+  enqueueTiles(frameState, extent, initialZ, tileTextureLookup, preload) {
     const viewState = frameState.viewState;
     const tileLayer = this.getLayer();
     const tileSource = tileLayer.getRenderSource();
@@ -396,28 +420,33 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
               frameState.pixelRatio,
               viewState.projection
             );
-            if (!tileTexture) {
-              tileTexture = new TileTexture({
-                tile: tile,
-                grid: tileGrid,
-                helper: this.helper,
-                gutter: gutter,
-              });
-              tileTextureCache.set(cacheKey, tileTexture);
+          }
+
+          if (lookupHasTile(tileTextureLookup, tile)) {
+            continue;
+          }
+
+          if (!tileTexture) {
+            tileTexture = new TileTexture({
+              tile: tile,
+              grid: tileGrid,
+              helper: this.helper,
+              gutter: gutter,
+            });
+            tileTextureCache.set(cacheKey, tileTexture);
+          } else {
+            if (this.isDrawableTile_(tile)) {
+              tileTexture.setTile(tile);
             } else {
-              if (this.isDrawableTile_(tile)) {
-                tileTexture.setTile(tile);
-              } else {
-                const interimTile =
-                  /** @type {import("../../webgl/TileTexture").TileType} */ (
-                    tile.getInterimTile()
-                  );
-                tileTexture.setTile(interimTile);
-              }
+              const interimTile =
+                /** @type {import("../../webgl/TileTexture").TileType} */ (
+                  tile.getInterimTile()
+                );
+              tileTexture.setTile(interimTile);
             }
           }
 
-          addTileTextureToLookup(tileTexturesByZ, tileTexture, z);
+          addTileTextureToLookup(tileTextureLookup, tileTexture, z);
 
           const tileQueueKey = tile.getKey();
           wantedTiles[tileQueueKey] = true;
@@ -460,9 +489,9 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
     );
 
     /**
-     * @type {Object<number, Array<import("../../webgl/TileTexture.js").default>>}
+     * @type {TileTextureLookup}
      */
-    const tileTexturesByZ = {};
+    const tileTextureLookup = newTileTextureLookup();
 
     const preload = tileLayer.getPreload();
     if (frameState.nextExtent) {
@@ -475,19 +504,19 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
         frameState,
         nextExtent,
         targetZ,
-        tileTexturesByZ,
+        tileTextureLookup,
         preload
       );
     }
 
-    this.enqueueTiles(frameState, extent, z, tileTexturesByZ, 0);
+    this.enqueueTiles(frameState, extent, z, tileTextureLookup, 0);
     if (preload > 0) {
       setTimeout(() => {
         this.enqueueTiles(
           frameState,
           extent,
           z - 1,
-          tileTexturesByZ,
+          tileTextureLookup,
           preload - 1
         );
       }, 0);
@@ -506,9 +535,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
     let blend = false;
 
     // look for cached tiles to use if a target tile is not ready
-    const tileTextures = tileTexturesByZ[z];
-    for (let i = 0, ii = tileTextures.length; i < ii; ++i) {
-      const tileTexture = tileTextures[i];
+    for (const tileTexture of tileTextureLookup.texturesByZ[z]) {
       const tile = tileTexture.tile;
       if (
         (tile instanceof ReprojTile || tile instanceof ReprojDataTile) &&
@@ -536,7 +563,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
         tileGrid,
         tileCoord,
         z + 1,
-        tileTexturesByZ
+        tileTextureLookup
       );
 
       if (coveredByChildren) {
@@ -550,7 +577,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
           tileGrid,
           tileCoord,
           parentZ,
-          tileTexturesByZ
+          tileTextureLookup
         );
 
         if (coveredByParent) {
@@ -562,7 +589,8 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
     this.helper.useProgram(this.program_, frameState);
     this.helper.prepareDraw(frameState, !blend);
 
-    const zs = Object.keys(tileTexturesByZ).map(Number).sort(ascending);
+    const texturesByZ = tileTextureLookup.texturesByZ;
+    const zs = Object.keys(texturesByZ).map(Number).sort(ascending);
 
     const centerX = viewState.center[0];
     const centerY = viewState.center[1];
@@ -585,9 +613,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
       const tileScale = viewState.resolution / tileResolution;
 
       const depth = depthForZ(tileZ);
-      const tileTextures = tileTexturesByZ[tileZ];
-      for (let i = 0, ii = tileTextures.length; i < ii; ++i) {
-        const tileTexture = tileTextures[i];
+      for (const tileTexture of texturesByZ[tileZ]) {
         if (!tileTexture.loaded) {
           continue;
         }
@@ -835,12 +861,12 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
    * @param {import("../../tilegrid/TileGrid.js").default} tileGrid The tile grid.
    * @param {import("../../tilecoord.js").TileCoord} tileCoord The target tile coordinate.
    * @param {number} altZ The alternate zoom level.
-   * @param {Object<number, Array<import("../../webgl/TileTexture.js").default>>} tileTexturesByZ Lookup of
+   * @param {TileTextureLookup} tileTextureLookup Lookup of
    * tile textures by zoom level.
    * @return {boolean} The tile coordinate is covered by loaded tiles at the alternate zoom level.
    * @private
    */
-  findAltTiles_(tileGrid, tileCoord, altZ, tileTexturesByZ) {
+  findAltTiles_(tileGrid, tileCoord, altZ, tileTextureLookup) {
     const tileRange = tileGrid.getTileRangeForTileCoordAndZ(
       tileCoord,
       altZ,
@@ -860,8 +886,11 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
         let loaded = false;
         if (tileTextureCache.containsKey(cacheKey)) {
           const tileTexture = tileTextureCache.get(cacheKey);
-          if (tileTexture.loaded) {
-            addTileTextureToLookup(tileTexturesByZ, tileTexture, altZ);
+          if (
+            tileTexture.loaded &&
+            !lookupHasTile(tileTextureLookup, tileTexture.tile)
+          ) {
+            addTileTextureToLookup(tileTextureLookup, tileTexture, altZ);
             loaded = true;
           }
         }

package/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,4BAFY,KAAK,CAIhB;AASD;;;;;;;;GAQG;AACH,kCAHY,MAAM,CAKjB;AAED;;;GAGG;AACH,sBAFU,MAAM,CAEe"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,4BAFY,KAAK,CAIhB;AASD;;;;;;;;GAQG;AACH,kCAHY,MAAM,CAKjB;AAED;;;GAGG;AACH,sBAFU,MAAM,CAEiC"}

package/util.js

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