ol 7.1.1-dev.1667574553768 → 7.1.1-dev.1667678878080

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "7.1.1-dev.1667574553768",
+  "version": "7.1.1-dev.1667678878080",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/reproj/DataTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";gCAoBsB,MAAM,QAAE,MAAM,QAAE,MAAM,QAAE,MAAM,KAAI,OAAO,gBAAgB,EAAE,OAAO;;;;;gBAK1E,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;gBACzC,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;eACzC,OAAO,iBAAiB,EAAE,SAAS;;;;;;;;gBAEnC,MAAM;;;;YACN,MAAM;;;;qBACN,UAAU;;;;;;;;;;;;;;;;AAdxB;;GAEG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2LjB;IAjLC;;;OAGG;IACH,oBAAqC;IAErC;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAA4B;IAE5B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,0BAAsE;IAEtE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAqDjB;;;OAGG;IACH,uBAOC;IA2EH;;OAEG;IACH,mBA2JC;IAyDD;;OAEG;IACH,yBAGC;CACF"}
+{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";gCAoBsB,MAAM,QAAE,MAAM,QAAE,MAAM,QAAE,MAAM,KAAI,OAAO,gBAAgB,EAAE,OAAO;;;;;gBAK1E,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;gBACzC,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;eACzC,OAAO,iBAAiB,EAAE,SAAS;;;;;;;;gBAEnC,MAAM;;;;YACN,MAAM;;;;qBACN,UAAU;;;;;;;;;;;;;;;;AAdxB;;GAEG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2LjB;IAjLC;;;OAGG;IACH,oBAAqC;IAErC;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAA4B;IAE5B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,0BAAsE;IAEtE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAqDjB;;;OAGG;IACH,uBAOC;IA2EH;;OAEG;IACH,mBAoKC;IAyDD;;OAEG;IACH,yBAGC;CACF"}

package/reproj/DataTile.js

@@ -3,7 +3,7 @@
  */
 import {ERROR_THRESHOLD} from './common.js';
 
-import DataTile from '../DataTile.js';
+import DataTile, {asArrayLike, asImageLike, toArray} from '../DataTile.js';
 import EventType from '../events/EventType.js';
 import TileState from '../TileState.js';
 import Triangulation from './Triangulation.js';
@@ -271,7 +271,16 @@ class ReprojDataTile extends DataTile {
       }
       const size = tile.getSize();
       const gutter = this.gutter_;
-      const tileData = tile.getData();
+      /**
+       * @type {import("../DataTile.js").ArrayLike}
+       */
+      let tileData;
+      const arrayData = asArrayLike(tile.getData());
+      if (arrayData) {
+        tileData = arrayData;
+      } else {
+        tileData = toArray(asImageLike(tile.getData()));
+      }
       const pixelSize = [size[0] + 2 * gutter, size[1] + 2 * gutter];
       const isFloat = tileData instanceof Float32Array;
       const pixelCount = pixelSize[0] * pixelSize[1];

package/source/DataTile.d.ts

@@ -8,6 +8,7 @@ export type Options = {
     /**
      * Data loader.  Called with z, x, and y tile coordinates.
      * Returns {@link import ("../DataTile.js").Data data} for a tile or a promise for the same.
+     * For loaders that generate images, the promise should not resolve until the image is loaded.
      */
     loader?: Loader | undefined;
     /**
@@ -84,6 +85,7 @@ export type Options = {
  * @typedef {Object} Options
  * @property {Loader} [loader] Data loader.  Called with z, x, and y tile coordinates.
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ * For loaders that generate images, the promise should not resolve until the image is loaded.
  * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
  * @property {boolean} [attributionsCollapsible=true] Attributions are collapsible.
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.

package/source/DataTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";;;;;4BAwBsB,MAAM,QAAE,MAAM,QAAE,MAAM,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,QAAQ,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiBxG,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AApBjD;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA6EjB;IA/CC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmL/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IAvMC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,gCAAiC;IAGnC;;;;;OAKG;IACH,kCAFW,MAAM,OAAO,YAAY,EAAE,IAAI,CAAC,QAI1C;IAED;;;;;;OAMG;IACH,yBAHW,MAAM,GACL,OAAO,YAAY,EAAE,IAAI,CAWpC;IAeD;;;OAGG;IACH,4BAHW,MAAM,QAKhB;IAED;;;;;;;OAOG;IACH,kBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,cACvC,OAAO,uBAAuB,EAAE,OAAO,GACrC,QAAQ,CAmDpB;IAED;;;;;;;OAOG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,QAAQ,CAyCpB;IA8CD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CAyCF"}
+{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";;;;;4BAwBsB,MAAM,QAAE,MAAM,QAAE,MAAM,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,QAAQ,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBxG,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AArBjD;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA6EjB;IA/CC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmL/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IAvMC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,gCAAiC;IAGnC;;;;;OAKG;IACH,kCAFW,MAAM,OAAO,YAAY,EAAE,IAAI,CAAC,QAI1C;IAED;;;;;;OAMG;IACH,yBAHW,MAAM,GACL,OAAO,YAAY,EAAE,IAAI,CAWpC;IAeD;;;OAGG;IACH,4BAHW,MAAM,QAKhB;IAED;;;;;;;OAOG;IACH,kBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,cACvC,OAAO,uBAAuB,EAAE,OAAO,GACrC,QAAQ,CAmDpB;IAED;;;;;;;OAOG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,QAAQ,CAyCpB;IA8CD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CAyCF"}

package/source/DataTile.js

@@ -29,6 +29,7 @@ import {toSize} from '../size.js';
  * @typedef {Object} Options
  * @property {Loader} [loader] Data loader.  Called with z, x, and y tile coordinates.
  * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ * For loaders that generate images, the promise should not resolve until the image is loaded.
  * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
  * @property {boolean} [attributionsCollapsible=true] Attributions are collapsible.
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.

package/util.js

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

package/webgl/TileTexture.d.ts

@@ -71,13 +71,30 @@ declare class TileTexture extends EventTarget {
     setTile(tile: TileType): void;
     loaded: boolean | undefined;
     uploadTile_(): void;
+    /**
+     * @param {import("../DataTile.js").ImageLike} image The image.
+     * @param {number} renderCol The column index (in rendered tile space).
+     * @param {number} renderRow The row index (in rendered tile space).
+     * @return {Uint8ClampedArray|null} The data.
+     * @private
+     */
+    private getImagePixelData_;
+    /**
+     * @param {import("../DataTile.js").ArrayLike} data The data.
+     * @param {import("../size.js").Size} sourceSize The size.
+     * @param {number} renderCol The column index (in rendered tile space).
+     * @param {number} renderRow The row index (in rendered tile space).
+     * @return {import("../DataTile.js").ArrayLike|null} The data.
+     * @private
+     */
+    private getArrayPixelData_;
     /**
      * Get data for a pixel.  If the tile is not loaded, null is returned.
      * @param {number} renderCol The column index (in rendered tile space).
      * @param {number} renderRow The row index (in rendered tile space).
-     * @return {import("../DataTile.js").Data|null} The data.
+     * @return {import("../DataTile.js").ArrayLike|null} The data.
      */
-    getPixelData(renderCol: number, renderRow: number): import("../DataTile.js").Data | null;
+    getPixelData(renderCol: number, renderRow: number): import("../DataTile.js").ArrayLike | null;
 }
 import ImageTile from "../ImageTile.js";
 import ReprojTile from "../reproj/Tile.js";

package/webgl/TileTexture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileTexture.d.ts","sourceRoot":"","sources":["TileTexture.js"],"names":[],"mappings":";uBAoIa,OAAO,gBAAgB,EAAE,OAAO,GAAC,SAAS,GAAC,UAAU;;;;;UAKpD,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AARlD;;GAEG;AAEH;;;;;;GAMG;AAEH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4DjB;IAvDC;;OAEG;IACH,MAFU,QAAQ,CAET;IAET;;OAEG;IACH,UAFU,MAAM,YAAY,CAAC,CAEX;IAiKpB,0BAMC;IApKC;;;OAGG;IACH,oBAEC;IAED;;;OAGG;IACH,gBAAkC;IAElC;;OAEG;IACH,WAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,gBAA6B;IAe7B;;OAEG;IACH,QAFU,gBAAgB,CAEN;IAKtB;;OAEG;IACH,cAFW,QAAQ,QAsBlB;IAbG,4BAAkD;IAetD,oBAqFC;IAmBD;;;;;OAKG;IACH,wBAJW,MAAM,aACN,MAAM,GACL,OAAO,gBAAgB,EAAE,IAAI,GAAC,IAAI,CAkE7C;CACF"}
+{"version":3,"file":"TileTexture.d.ts","sourceRoot":"","sources":["TileTexture.js"],"names":[],"mappings":";uBAoIa,OAAO,gBAAgB,EAAE,OAAO,GAAC,SAAS,GAAC,UAAU;;;;;UAKpD,QAAQ;;;;UACR,OAAO,yBAAyB,EAAE,OAAO;;;;YACzC,OAAO,oBAAoB,EAAE,OAAO;;;;;;AARlD;;GAEG;AAEH;;;;;;GAMG;AAEH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4DjB;IAvDC;;OAEG;IACH,MAFU,QAAQ,CAET;IAET;;OAEG;IACH,UAFU,MAAM,YAAY,CAAC,CAEX;IA8KpB,0BAMC;IAjLC;;;OAGG;IACH,oBAEC;IAED;;;OAGG;IACH,gBAAkC;IAElC;;OAEG;IACH,WAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,gBAA6B;IAe7B;;OAEG;IACH,QAFU,gBAAgB,CAEN;IAKtB;;OAEG;IACH,cAFW,QAAQ,QAsBlB;IAbG,4BAAkD;IAetD,oBAkGC;IAmBD;;;;;;OAMG;IACH,2BAgCC;IAED;;;;;;;OAOG;IACH,2BA0BC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,aACN,MAAM,GACL,OAAO,gBAAgB,EAAE,SAAS,GAAC,IAAI,CAuBlD;CACF"}

package/webgl/TileTexture.js

@@ -2,7 +2,7 @@
  * @module ol/webgl/TileTexture
  */
 
-import DataTile from '../DataTile.js';
+import DataTile, {asArrayLike, asImageLike} from '../DataTile.js';
 import EventTarget from '../events/Target.js';
 import EventType from '../events/EventType.js';
 import ImageTile from '../ImageTile.js';
@@ -30,7 +30,7 @@ function bindAndConfigure(gl, texture, interpolate) {
 /**
  * @param {WebGLRenderingContext} gl The WebGL context.
  * @param {WebGLTexture} texture The texture.
- * @param {HTMLImageElement|HTMLCanvasElement|HTMLVideoElement} image The image.
+ * @param {import("../DataTile.js").ImageLike} image The image.
  * @param {boolean} interpolate Interpolate when resampling.
  */
 function uploadImageTexture(gl, texture, image, interpolate) {
@@ -42,7 +42,7 @@ function uploadImageTexture(gl, texture, image, interpolate) {
 /**
  * @param {import("./Helper.js").default} helper The WebGL helper.
  * @param {WebGLTexture} texture The texture.
- * @param {import("../DataTile.js").Data} data The pixel data.
+ * @param {import("../DataTile.js").ArrayLike} data The pixel data.
  * @param {import("../size.js").Size} size The pixel size.
  * @param {number} bandCount The band count.
  * @param {boolean} interpolate Interpolate when resampling.
@@ -235,20 +235,33 @@ class TileTexture extends EventTarget {
     const gl = helper.getGL();
     const tile = this.tile;
 
+    /**
+     * @type {import("../DataTile.js").Data}
+     */
+    let data;
+
     if (tile instanceof ImageTile || tile instanceof ReprojTile) {
+      data = tile.getImage();
+    } else {
+      data = tile.getData();
+    }
+
+    const image = asImageLike(data);
+    if (image) {
       const texture = gl.createTexture();
       this.textures.push(texture);
       this.bandCount = 4;
-      uploadImageTexture(gl, texture, tile.getImage(), tile.interpolate);
+      uploadImageTexture(gl, texture, image, tile.interpolate);
       return;
     }
 
-    const sourceTileSize = tile.getSize();
+    data = asArrayLike(data);
+
+    const sourceTileSize = /** @type {DataTile} */ (tile).getSize();
     const pixelSize = [
       sourceTileSize[0] + 2 * this.gutter_,
       sourceTileSize[1] + 2 * this.gutter_,
     ];
-    const data = tile.getData();
     const isFloat = data instanceof Float32Array;
     const pixelCount = pixelSize[0] * pixelSize[1];
     const DataType = isFloat ? Float32Array : Uint8Array;
@@ -335,53 +348,22 @@ class TileTexture extends EventTarget {
   }
 
   /**
-   * Get data for a pixel.  If the tile is not loaded, null is returned.
+   * @param {import("../DataTile.js").ImageLike} image The image.
    * @param {number} renderCol The column index (in rendered tile space).
    * @param {number} renderRow The row index (in rendered tile space).
-   * @return {import("../DataTile.js").Data|null} The data.
+   * @return {Uint8ClampedArray|null} The data.
+   * @private
    */
-  getPixelData(renderCol, renderRow) {
-    if (!this.loaded) {
-      return null;
-    }
+  getImagePixelData_(image, renderCol, renderRow) {
+    const gutter = this.gutter_;
     const renderWidth = this.renderSize_[0];
     const renderHeight = this.renderSize_[1];
-    const gutter = this.gutter_;
-
-    if (this.tile instanceof DataTile) {
-      const sourceSize = this.tile.getSize();
-
-      const sourceWidthWithoutGutter = sourceSize[0];
-      const sourceHeightWithoutGutter = sourceSize[1];
-      const sourceWidth = sourceWidthWithoutGutter + 2 * gutter;
-      const sourceHeight = sourceHeightWithoutGutter + 2 * gutter;
-
-      const sourceCol =
-        gutter +
-        Math.floor(sourceWidthWithoutGutter * (renderCol / renderWidth));
-
-      const sourceRow =
-        gutter +
-        Math.floor(sourceHeightWithoutGutter * (renderRow / renderHeight));
-
-      const data = this.tile.getData();
-      if (data instanceof DataView) {
-        const bytesPerPixel = data.byteLength / (sourceWidth * sourceHeight);
-        const offset = bytesPerPixel * (sourceRow * sourceWidth + sourceCol);
-        const buffer = data.buffer.slice(offset, offset + bytesPerPixel);
-        return new DataView(buffer);
-      }
-
-      const offset = this.bandCount * (sourceRow * sourceWidth + sourceCol);
-      return data.slice(offset, offset + this.bandCount);
-    }
 
     if (!pixelContext) {
       createPixelContext();
     }
     pixelContext.clearRect(0, 0, 1, 1);
 
-    const image = this.tile.getImage();
     const sourceWidth = image.width;
     const sourceHeight = image.height;
 
@@ -405,6 +387,71 @@ class TileTexture extends EventTarget {
     }
     return data;
   }
+
+  /**
+   * @param {import("../DataTile.js").ArrayLike} data The data.
+   * @param {import("../size.js").Size} sourceSize The size.
+   * @param {number} renderCol The column index (in rendered tile space).
+   * @param {number} renderRow The row index (in rendered tile space).
+   * @return {import("../DataTile.js").ArrayLike|null} The data.
+   * @private
+   */
+  getArrayPixelData_(data, sourceSize, renderCol, renderRow) {
+    const gutter = this.gutter_;
+    const renderWidth = this.renderSize_[0];
+    const renderHeight = this.renderSize_[1];
+
+    const sourceWidthWithoutGutter = sourceSize[0];
+    const sourceHeightWithoutGutter = sourceSize[1];
+    const sourceWidth = sourceWidthWithoutGutter + 2 * gutter;
+    const sourceHeight = sourceHeightWithoutGutter + 2 * gutter;
+
+    const sourceCol =
+      gutter + Math.floor(sourceWidthWithoutGutter * (renderCol / renderWidth));
+
+    const sourceRow =
+      gutter +
+      Math.floor(sourceHeightWithoutGutter * (renderRow / renderHeight));
+
+    if (data instanceof DataView) {
+      const bytesPerPixel = data.byteLength / (sourceWidth * sourceHeight);
+      const offset = bytesPerPixel * (sourceRow * sourceWidth + sourceCol);
+      const buffer = data.buffer.slice(offset, offset + bytesPerPixel);
+      return new DataView(buffer);
+    }
+
+    const offset = this.bandCount * (sourceRow * sourceWidth + sourceCol);
+    return data.slice(offset, offset + this.bandCount);
+  }
+
+  /**
+   * Get data for a pixel.  If the tile is not loaded, null is returned.
+   * @param {number} renderCol The column index (in rendered tile space).
+   * @param {number} renderRow The row index (in rendered tile space).
+   * @return {import("../DataTile.js").ArrayLike|null} The data.
+   */
+  getPixelData(renderCol, renderRow) {
+    if (!this.loaded) {
+      return null;
+    }
+
+    if (this.tile instanceof DataTile) {
+      const data = this.tile.getData();
+      const arrayData = asArrayLike(data);
+      if (arrayData) {
+        const sourceSize = this.tile.getSize();
+        return this.getArrayPixelData_(
+          arrayData,
+          sourceSize,
+          renderCol,
+          renderRow
+        );
+      }
+      return this.getImagePixelData_(asImageLike(data), renderCol, renderRow);
+    }
+
+    return this.getImagePixelData_(this.tile.getImage(), renderCol, renderRow);
+  }
 }
 
 export default TileTexture;