ol 10.3.0 → 10.3.1-dev.1733000076141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.3.0",
+  "version": "10.3.1-dev.1733000076141",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/DataTile.d.ts

@@ -203,10 +203,9 @@ declare class DataTileSource<TileType extends import("../Tile.js").default = Dat
      */
     private crossOrigin_;
     /**
-     * @protected
-     * @type {import("../transform.js").Transform}
+     * @type {import("../transform.js").Transform|null}
      */
-    protected transformMatrix: import("../transform.js").Transform;
+    transformMatrix: import("../transform.js").Transform | null;
     /**
      * Set the source tile sizes.  The length of the array is expected to match the number of
      * levels in the tile grid.

package/source/DataTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";mCAoBa,WAAW,GAAC,iBAAiB;;;;;YAK5B,WAAW;;;;;;;;;;;;;;;qBASZ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAa,EAAb,aAAa,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBvH,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAjCjD;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH;;;;;;;;GAQG;AACH,6BAJ6C,QAAQ,SAAxC,OAAQ,YAAY,EAAE,OAAQ;IAKzC;;OAEG;IACH,qBAFW,OAAO,EAuFjB;IAxDC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAkN/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IAnOC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,qBAAsD;IAEtD;;;OAGG;IACH,2BAFU,OAAO,iBAAiB,EAAE,SAAS,CAElB;IAG7B;;;;;OAKG;IACH,kCAFW,KAAK,CAAC,OAAO,YAAY,EAAE,IAAI,CAAC,QAI1C;IAED;;;;;;OAMG;IACH,yBAHW,MAAM,GACL,OAAO,YAAY,EAAE,IAAI,CAWpC;IAmBD;;;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,CA6CpB;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,eACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,QAAQ,GAAC,IAAI,CAiExB;IAmDD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CACF;qBA7ZoB,gBAAgB;uBAIK,WAAW"}
+{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";mCAoBa,WAAW,GAAC,iBAAiB;;;;;YAK5B,WAAW;;;;;;;;;;;;;;;qBASZ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAa,EAAb,aAAa,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBvH,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAjCjD;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH;;;;;;;;GAQG;AACH,6BAJ6C,QAAQ,SAAxC,OAAQ,YAAY,EAAE,OAAQ;IAKzC;;OAEG;IACH,qBAFW,OAAO,EAsFjB;IAvDC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAiN/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IAlOC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,qBAAsD;IAEtD;;OAEG;IACH,iBAFU,OAAO,iBAAiB,EAAE,SAAS,GAAC,IAAI,CAEvB;IAG7B;;;;;OAKG;IACH,kCAFW,KAAK,CAAC,OAAO,YAAY,EAAE,IAAI,CAAC,QAI1C;IAED;;;;;;OAMG;IACH,yBAHW,MAAM,GACL,OAAO,YAAY,EAAE,IAAI,CAWpC;IAmBD;;;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,CA6CpB;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,eACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,QAAQ,GAAC,IAAI,CAiExB;IAmDD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CACF;qBA5ZoB,gBAAgB;uBAIK,WAAW"}

package/source/DataTile.js

@@ -159,8 +159,7 @@ class DataTileSource extends TileSource {
     this.crossOrigin_ = options.crossOrigin || 'anonymous';
 
     /**
-     * @protected
-     * @type {import("../transform.js").Transform}
+     * @type {import("../transform.js").Transform|null}
      */
     this.transformMatrix = null;
   }

package/source/TileDebug.d.ts

@@ -18,6 +18,12 @@ export type Options = {
      * zoom levels. See {@link module :ol/tilegrid/TileGrid~TileGrid#getZForResolution}.
      */
     zDirection?: number | import("../array.js").NearestDirectionFunction | undefined;
+    /**
+     * Tile source.
+     * This allows `projection`, `tileGrid`, `wrapX` and `zDirection` to be copied from another source.
+     * If both `source` and individual options are specified the individual options will have precedence.
+     */
+    source?: import("./Tile.js").default<import("../Tile.js").default> | undefined;
     /**
      * Template for labeling the tiles.
      * Should include `{x}`, `{y}` or `{-y}`, and `{z}` placeholders.
@@ -33,6 +39,9 @@ export type Options = {
  * Set to `1` when debugging `VectorTile` sources with a default configuration.
  * Choose whether to use tiles with a higher or lower zoom level when between integer
  * zoom levels. See {@link module:ol/tilegrid/TileGrid~TileGrid#getZForResolution}.
+ * @property {import("./Tile.js").default} [source] Tile source.
+ * This allows `projection`, `tileGrid`, `wrapX` and `zDirection` to be copied from another source.
+ * If both `source` and individual options are specified the individual options will have precedence.
  * @property {string} [template='z:{z} x:{x} y:{y}'] Template for labeling the tiles.
  * Should include `{x}`, `{y}` or `{-y}`, and `{z}` placeholders.
  */

package/source/TileDebug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileDebug.d.ts","sourceRoot":"","sources":["TileDebug.js"],"names":[],"mappings":";;;;;iBAUc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;AAFjD;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EAkCjB;CACF;sBA7DqB,gBAAgB"}
+{"version":3,"file":"TileDebug.d.ts","sourceRoot":"","sources":["TileDebug.js"],"names":[],"mappings":";;;;;iBAcc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;AAFjD;;;;;;;;;;;;;;GAcG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,sBAFW,OAAO,EAyFjB;CACF;sBAzHqB,gBAAgB"}

package/source/TileDebug.js

@@ -2,9 +2,13 @@
  * @module ol/source/TileDebug
  */
 
+import DataTile from './DataTile.js';
+import EventType from '../events/EventType.js';
 import ImageTile from './ImageTile.js';
 import {createCanvasContext2D} from '../dom.js';
+import {get as getProjection} from '../proj.js';
 import {renderXYZTemplate} from '../uri.js';
+import {toSize} from '../size.js';
 
 /**
  * @typedef {Object} Options
@@ -15,6 +19,9 @@ import {renderXYZTemplate} from '../uri.js';
  * Set to `1` when debugging `VectorTile` sources with a default configuration.
  * Choose whether to use tiles with a higher or lower zoom level when between integer
  * zoom levels. See {@link module:ol/tilegrid/TileGrid~TileGrid#getZForResolution}.
+ * @property {import("./Tile.js").default} [source] Tile source.
+ * This allows `projection`, `tileGrid`, `wrapX` and `zDirection` to be copied from another source.
+ * If both `source` and individual options are specified the individual options will have precedence.
  * @property {string} [template='z:{z} x:{x} y:{y}'] Template for labeling the tiles.
  * Should include `{x}`, `{y}` or `{-y}`, and `{z}` placeholders.
  */
@@ -36,20 +43,62 @@ class TileDebug extends ImageTile {
      */
     options = options || {};
     const template = options.template || 'z:{z} x:{x} y:{y}';
+    const source = options.source;
 
     super({
       transition: 0,
-      projection: options.projection,
-      tileGrid: options.tileGrid,
-      wrapX: options.wrapX !== undefined ? options.wrapX : true,
-      zDirection: options.zDirection,
-      loader: (z, x, y, loaderOptions) => {
+      wrapX:
+        options.wrapX !== undefined
+          ? options.wrapX
+          : source !== undefined
+            ? source.getWrapX()
+            : undefined,
+    });
+
+    const setReady = () => {
+      this.projection =
+        options.projection !== undefined
+          ? getProjection(options.projection)
+          : source !== undefined
+            ? source.getProjection()
+            : this.projection;
+      this.tileGrid =
+        options.tileGrid !== undefined
+          ? options.tileGrid
+          : source !== undefined
+            ? source.getTileGrid()
+            : this.tileGrid;
+      this.zDirection =
+        options.zDirection !== undefined
+          ? options.zDirection
+          : source !== undefined
+            ? source.zDirection
+            : this.zDirection;
+
+      if (source instanceof DataTile) {
+        this.transformMatrix = source.transformMatrix?.slice() || null;
+      }
+
+      const tileGrid = this.tileGrid;
+      if (tileGrid) {
+        this.setTileSizes(
+          tileGrid
+            .getResolutions()
+            .map((r, i) =>
+              toSize(tileGrid.getTileSize(i)).map((s) =>
+                Math.max(Math.floor(s), 1),
+              ),
+            ),
+        );
+      }
+
+      this.setLoader((z, x, y, loaderOptions) => {
         const text = renderXYZTemplate(template, z, x, y, loaderOptions.maxY);
-        const tileSize = this.getTileSize(z);
-        const context = createCanvasContext2D(tileSize[0], tileSize[1]);
+        const [width, height] = this.getTileSize(z);
+        const context = createCanvasContext2D(width, height);
 
         context.strokeStyle = 'grey';
-        context.strokeRect(0.5, 0.5, tileSize[0] + 0.5, tileSize[1] + 0.5);
+        context.strokeRect(0.5, 0.5, width + 0.5, height + 0.5);
 
         context.fillStyle = 'grey';
         context.strokeStyle = 'white';
@@ -57,11 +106,24 @@ class TileDebug extends ImageTile {
         context.textBaseline = 'middle';
         context.font = '24px sans-serif';
         context.lineWidth = 4;
-        context.strokeText(text, tileSize[0] / 2, tileSize[1] / 2, tileSize[0]);
-        context.fillText(text, tileSize[0] / 2, tileSize[1] / 2, tileSize[0]);
+        context.strokeText(text, width / 2, height / 2, width);
+        context.fillText(text, width / 2, height / 2, width);
         return context.canvas;
-      },
-    });
+      });
+      this.setState('ready');
+    };
+
+    if (source === undefined || source.getState() === 'ready') {
+      setReady();
+    } else {
+      const handler = () => {
+        if (source.getState() === 'ready') {
+          source.removeEventListener(EventType.CHANGE, handler);
+          setReady();
+        }
+      };
+      source.addEventListener(EventType.CHANGE, handler);
+    }
   }
 }
 

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,CAEgB"}
+{"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,CAEkC"}

package/util.js

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