ol 6.9.1-dev.1637438726573 → 6.9.1-dev.1637596194857

package/functions.d.ts

@@ -24,4 +24,10 @@ export function VOID(): void;
  * @template ReturnType
  */
 export function memoizeOne<ReturnType_1>(fn: (...arg0: any[]) => ReturnType_1): (...arg0: any[]) => ReturnType_1;
+/**
+ * @template T
+ * @param {function(): (T | Promise<T>)} getter A function that returns a value or a promise for a value.
+ * @return {Promise<T>} A promise for the value.
+ */
+export function toPromise<T>(getter: () => T | Promise<T>): Promise<T>;
 //# sourceMappingURL=functions.d.ts.map

package/functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["src/functions.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,gCAEC;AAED;;;GAGG;AACH,iCAEC;AAED;;;;GAIG;AACH,6BAAyB;AAEzB;;;;;;;;GAQG;AACH,iHAqBC"}
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["src/functions.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,gCAEC;AAED;;;GAGG;AACH,iCAEC;AAED;;;;GAIG;AACH,6BAAyB;AAEzB;;;;;;;;GAQG;AACH,iHAqBC;AAED;;;;GAIG;AACH,uEAcC"}

package/functions.js

@@ -49,4 +49,25 @@ export function memoizeOne(fn) {
         return lastResult;
     };
 }
+/**
+ * @template T
+ * @param {function(): (T | Promise<T>)} getter A function that returns a value or a promise for a value.
+ * @return {Promise<T>} A promise for the value.
+ */
+export function toPromise(getter) {
+    function promiseGetter() {
+        var value;
+        try {
+            value = getter();
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
+        if (value instanceof Promise) {
+            return value;
+        }
+        return Promise.resolve(value);
+    }
+    return promiseGetter();
+}
 //# sourceMappingURL=functions.js.map

package/functions.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions.js","sourceRoot":"","sources":["src/functions.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,YAAY,CAAC;AAEjD;;;GAGG;AACH,MAAM,UAAU,IAAI;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,KAAK;IACnB,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,IAAI,KAAI,CAAC;AAEzB;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE;IAC3B,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,yBAAyB;IACzB,IAAI,UAAU,CAAC;IAEf,yBAAyB;IACzB,IAAI,QAAQ,CAAC;IAEb,IAAI,QAAQ,CAAC;IAEb,OAAO;QACL,IAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;YACpE,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,QAAQ,GAAG,QAAQ,CAAC;YACpB,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;SACxC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"functions.js","sourceRoot":"","sources":["src/functions.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,YAAY,CAAC;AAEjD;;;GAGG;AACH,MAAM,UAAU,IAAI;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,KAAK;IACnB,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,IAAI,KAAI,CAAC;AAEzB;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE;IAC3B,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,yBAAyB;IACzB,IAAI,UAAU,CAAC;IAEf,yBAAyB;IACzB,IAAI,QAAQ,CAAC;IAEb,IAAI,QAAQ,CAAC;IAEb,OAAO;QACL,IAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;YACpE,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,QAAQ,GAAG,QAAQ,CAAC;YACpB,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;SACxC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,MAAM;IAC9B,SAAS,aAAa;QACpB,IAAI,KAAK,CAAC;QACV,IAAI;YACF,KAAK,GAAG,MAAM,EAAE,CAAC;SAClB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,IAAI,KAAK,YAAY,OAAO,EAAE;YAC5B,OAAO,KAAK,CAAC;SACd;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "6.9.1-dev.1637438726573",
+  "version": "6.9.1-dev.1637596194857",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/DataTile.d.ts

@@ -1,10 +1,15 @@
 export default DataTileSource;
+/**
+ * Data tile loading function.  The function is called with z, x, and y tile coordinates and
+ * returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ */
+export type Loader = (arg0: number, arg1: number, arg2: number) => DataView | Uint8Array | Uint8ClampedArray | Float32Array | Promise<DataView | Uint8Array | Uint8ClampedArray | Float32Array>;
 export type Options = {
     /**
      * Data loader.  Called with z, x, and y tile coordinates.
-     * Returns a promise that resolves to a {@link import("../DataTile.js").Data}.
+     * Returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
      */
-    loader?: (arg0: number, arg1: number, arg2: number) => Promise<DataView | Uint8Array | Uint8ClampedArray | Float32Array>;
+    loader?: (arg0: number, arg1: number, arg2: number) => DataView | Uint8Array | Uint8ClampedArray | Float32Array | Promise<DataView | Uint8Array | Uint8ClampedArray | Float32Array>;
     /**
      * Optional max zoom level. Not used if `tileGrid` is provided.
      */
@@ -54,10 +59,15 @@ export type Options = {
      */
     bandCount?: number;
 };
+/**
+ * Data tile loading function.  The function is called with z, x, and y tile coordinates and
+ * returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ * @typedef {function(number, number, number) : (import("../DataTile.js").Data|Promise<import("../DataTile.js").Data>)} Loader
+ */
 /**
  * @typedef {Object} Options
- * @property {function(number, number, number) : Promise<import("../DataTile.js").Data>} [loader] Data loader.  Called with z, x, and y tile coordinates.
- * Returns a promise that resolves to a {@link import("../DataTile.js").Data}.
+ * @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.
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -73,7 +83,7 @@ export type Options = {
  */
 /**
  * @classdesc
- * Base class for sources providing tiles divided into a tile grid.
+ * A source for typed array data tiles.
  *
  * @fires import("./Tile.js").TileSourceEvent
  * @api
@@ -102,10 +112,10 @@ declare class DataTileSource extends TileSource {
      */
     bandCount: number;
     /**
-     * @param {function(number, number, number) : Promise<import("../DataTile.js").Data>} loader The data loader.
+     * @param {Loader} loader The data loader.
      * @protected
      */
-    protected setLoader(loader: (arg0: number, arg1: number, arg2: number) => Promise<DataView | Uint8Array | Uint8ClampedArray | Float32Array>): void;
+    protected setLoader(loader: (arg0: number, arg1: number, arg2: number) => DataView | Uint8Array | Uint8ClampedArray | Float32Array | Promise<DataView | Uint8Array | Uint8ClampedArray | Float32Array>): void;
     /**
      * @abstract
      * @param {number} z Tile coordinate z.

package/source/DataTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,8BA2CC;IAjBC;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAgD/B;;;OAGG;IACH,qEAoBC;IApEC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAG1E;;;OAGG;IACH,mJAEC;IAED;;;;;;;;OAQG;IACH,4HAmBC;CA2BF"}
+{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA;;;;GAIG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,8BA2CC;IAjBC;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmD/B;;;OAGG;IACH,qEAoBC;IAvEC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAG1E;;;OAGG;IACH,8MAEC;IAED;;;;;;;;OAQG;IACH,4HAsBC;CA2BF"}

package/source/DataTile.js

@@ -25,10 +25,16 @@ import { assign } from '../obj.js';
 import { createXYZ, extentFromProjection } from '../tilegrid.js';
 import { getKeyZXY } from '../tilecoord.js';
 import { getUid } from '../util.js';
+import { toPromise } from '../functions.js';
+/**
+ * Data tile loading function.  The function is called with z, x, and y tile coordinates and
+ * returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ * @typedef {function(number, number, number) : (import("../DataTile.js").Data|Promise<import("../DataTile.js").Data>)} Loader
+ */
 /**
  * @typedef {Object} Options
- * @property {function(number, number, number) : Promise<import("../DataTile.js").Data>} [loader] Data loader.  Called with z, x, and y tile coordinates.
- * Returns a promise that resolves to a {@link import("../DataTile.js").Data}.
+ * @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.
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -44,7 +50,7 @@ import { getUid } from '../util.js';
  */
 /**
  * @classdesc
- * Base class for sources providing tiles divided into a tile grid.
+ * A source for typed array data tiles.
  *
  * @fires import("./Tile.js").TileSourceEvent
  * @api
@@ -94,7 +100,7 @@ var DataTileSource = /** @class */ (function (_super) {
         return _this;
     }
     /**
-     * @param {function(number, number, number) : Promise<import("../DataTile.js").Data>} loader The data loader.
+     * @param {Loader} loader The data loader.
      * @protected
      */
     DataTileSource.prototype.setLoader = function (loader) {
@@ -116,7 +122,9 @@ var DataTileSource = /** @class */ (function (_super) {
         }
         var sourceLoader = this.loader_;
         function loader() {
-            return sourceLoader(z, x, y);
+            return toPromise(function () {
+                return sourceLoader(z, x, y);
+            });
         }
         var tile = new DataTile(assign({ tileCoord: [z, x, y], loader: loader }, this.tileOptions));
         tile.key = this.getKey();

package/source/DataTile.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.js","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataTile.js","sourceRoot":"","sources":["../src/source/DataTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,UAAU,EAAE,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AACtD,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,SAAS,EAAE,oBAAoB,EAAC,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C;;;;GAIG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;GAMG;AACH;IAA6B,kCAAU;IACrC;;OAEG;IACH,wBAAY,OAAO;QAAnB,iBA2CC;QA1CC,IAAM,UAAU,GACd,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAEtE,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,EAAE;YACxC,QAAQ,GAAG,SAAS,CAAC;gBACnB,MAAM,EAAE,oBAAoB,CAAC,UAAU,CAAC;gBACxC,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC,CAAC;SACJ;QAED,QAAA,kBAAM;YACJ,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,SAAC;QAEH;;;WAGG;QACH,KAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B;;WAEG;QACH,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,KAAI,CAAC,iBAAiB,GAAG,KAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAI,CAAC,CAAC;QAE3D;;WAEG;QACH,KAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,2BAA2B;;IACvG,CAAC;IAED;;;OAGG;IACH,kCAAS,GAAT,UAAU,MAAM;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED;;;;;;;;OAQG;IACH,gCAAO,GAAP,UAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU;QACrC,IAAM,YAAY,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE;YAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SACzC;QAED,IAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC;QAElC,SAAS,MAAM;YACb,OAAO,SAAS,CAAC;gBACf,OAAO,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAM,IAAI,GAAG,IAAI,QAAQ,CACvB,MAAM,CAAC,EAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CACjE,CAAC;QACF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEhE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,0CAAiB,GAAjB,UAAkB,KAAK;QACrB,IAAM,IAAI,GAAG,2CAA2C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxE,IAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC;QACT,IAAI,SAAS,IAAI,SAAS,CAAC,OAAO,EAAE;YAClC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YAClC,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC;SACpC;aAAM,IAAI,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI;gBACF,SAAS,IAAI,SAAS,CAAC,KAAK;oBAC1B,CAAC,CAAC,aAAa,CAAC,aAAa;oBAC7B,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM;wBAC/B,CAAC,CAAC,aAAa,CAAC,WAAW;wBAC3B,CAAC,CAAC,SAAS,CAAC;SACjB;QACD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,aAAa,CAAC,IAAI,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SACrD;IACH,CAAC;IACH,qBAAC;AAAD,CAAC,AAnHD,CAA6B,UAAU,GAmHtC;AAED,eAAe,cAAc,CAAC"}

package/src/functions.js

@@ -58,3 +58,24 @@ export function memoizeOne(fn) {
     return lastResult;
   };
 }
+
+/**
+ * @template T
+ * @param {function(): (T | Promise<T>)} getter A function that returns a value or a promise for a value.
+ * @return {Promise<T>} A promise for the value.
+ */
+export function toPromise(getter) {
+  function promiseGetter() {
+    let value;
+    try {
+      value = getter();
+    } catch (err) {
+      return Promise.reject(err);
+    }
+    if (value instanceof Promise) {
+      return value;
+    }
+    return Promise.resolve(value);
+  }
+  return promiseGetter();
+}

package/src/source/DataTile.js

@@ -10,11 +10,18 @@ import {assign} from '../obj.js';
 import {createXYZ, extentFromProjection} from '../tilegrid.js';
 import {getKeyZXY} from '../tilecoord.js';
 import {getUid} from '../util.js';
+import {toPromise} from '../functions.js';
+
+/**
+ * Data tile loading function.  The function is called with z, x, and y tile coordinates and
+ * returns {@link import("../DataTile.js").Data data} for a tile or a promise for the same.
+ * @typedef {function(number, number, number) : (import("../DataTile.js").Data|Promise<import("../DataTile.js").Data>)} Loader
+ */
 
 /**
  * @typedef {Object} Options
- * @property {function(number, number, number) : Promise<import("../DataTile.js").Data>} [loader] Data loader.  Called with z, x, and y tile coordinates.
- * Returns a promise that resolves to a {@link import("../DataTile.js").Data}.
+ * @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.
  * @property {number} [maxZoom=42] Optional max zoom level. Not used if `tileGrid` is provided.
  * @property {number} [minZoom=0] Optional min zoom level. Not used if `tileGrid` is provided.
  * @property {number|import("../size.js").Size} [tileSize=[256, 256]] The pixel width and height of the tiles.
@@ -31,7 +38,7 @@ import {getUid} from '../util.js';
 
 /**
  * @classdesc
- * Base class for sources providing tiles divided into a tile grid.
+ * A source for typed array data tiles.
  *
  * @fires import("./Tile.js").TileSourceEvent
  * @api
@@ -86,7 +93,7 @@ class DataTileSource extends TileSource {
   }
 
   /**
-   * @param {function(number, number, number) : Promise<import("../DataTile.js").Data>} loader The data loader.
+   * @param {Loader} loader The data loader.
    * @protected
    */
   setLoader(loader) {
@@ -109,8 +116,11 @@ class DataTileSource extends TileSource {
     }
 
     const sourceLoader = this.loader_;
+
     function loader() {
-      return sourceLoader(z, x, y);
+      return toPromise(function () {
+        return sourceLoader(z, x, y);
+      });
     }
 
     const tile = new DataTile(

package/util.js

@@ -31,5 +31,5 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export var VERSION = '6.9.1-dev.1637438726573';
+export var VERSION = '6.9.1-dev.1637596194857';
 //# sourceMappingURL=util.js.map