ol 10.2.2-dev.1728931292932 → 10.2.2-dev.1729019374816

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.2.2-dev.1728931292932",
+  "version": "10.2.2-dev.1729019374816",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/OGCMapTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OGCMapTile.d.ts","sourceRoot":"","sources":["OGCMapTile.js"],"names":[],"mappings":";;;;;SASc,MAAM;;;;;;;;;;;;;;;;iBAKN,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAPjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH;;;;;;;;GAQG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2BjB;IAED;;;OAGG;IACH,2BAIC;IAED;;;OAGG;IACH,qBAGC;CACF;sBA9FqB,gBAAgB"}
+{"version":3,"file":"OGCMapTile.d.ts","sourceRoot":"","sources":["OGCMapTile.js"],"names":[],"mappings":";;;;;SASc,MAAM;;;;;;;;;;;;;;;;iBAKN,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAPjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH;;;;;;;;GAQG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2BjB;IAED;;;OAGG;IACH,2BAKC;IAED;;;OAGG;IACH,qBAGC;CACF;sBA/FqB,gBAAgB"}

package/source/OGCMapTile.js

@@ -83,6 +83,7 @@ class OGCMapTile extends TileImage {
    */
   handleTileSetInfo_(tileSetInfo) {
     this.tileGrid = tileSetInfo.grid;
+    this.projection = tileSetInfo.projection;
     this.setTileUrlFunction(tileSetInfo.urlFunction, tileSetInfo.urlTemplate);
     this.setState('ready');
   }

package/source/OGCVectorTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OGCVectorTile.d.ts","sourceRoot":"","sources":["OGCVectorTile.js"],"names":[],"mappings":";oBASoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;;;;SAEpC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAaN,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAhBjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH;;;;;;;;;;;;;;GAcG;AACH,4BAHoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;IAIhD;;OAEG;IACH,qBAFW,OAAO,CAAC,WAAW,CAAC,EA6B9B;IAED;;;OAGG;IACH,2BAIC;IAED;;;OAGG;IACH,qBAGC;CACF;6BAtG4B,iBAAiB"}
+{"version":3,"file":"OGCVectorTile.d.ts","sourceRoot":"","sources":["OGCVectorTile.js"],"names":[],"mappings":";oBASoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;;;;SAEpC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAaN,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAhBjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH;;;;;;;;;;;;;;GAcG;AACH,4BAHoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;IAIhD;;OAEG;IACH,qBAFW,OAAO,CAAC,WAAW,CAAC,EA6B9B;IAED;;;OAGG;IACH,2BAKC;IAED;;;OAGG;IACH,qBAGC;CACF;6BAvG4B,iBAAiB"}

package/source/OGCVectorTile.js

@@ -92,6 +92,7 @@ class OGCVectorTile extends VectorTileSource {
    */
   handleTileSetInfo_(tileSetInfo) {
     this.tileGrid = tileSetInfo.grid;
+    this.projection = tileSetInfo.projection;
     this.setTileUrlFunction(tileSetInfo.urlFunction, tileSetInfo.urlTemplate);
     this.setState('ready');
   }

package/source/ogcTileUtil.d.ts

@@ -1,6 +1,7 @@
 /**
  * @typedef {Object} TileSetInfo
  * @property {string} urlTemplate The tile URL template.
+ * @property {import("../proj/Projection.js").default} projection The source projection.
  * @property {import("../tilegrid/TileGrid.js").default} grid The tile grid.
  * @property {import("../Tile.js").UrlFunction} urlFunction The tile URL function.
  */
@@ -44,6 +45,10 @@ export type TileSetInfo = {
      * The tile URL template.
      */
     urlTemplate: string;
+    /**
+     * The source projection.
+     */
+    projection: import("../proj/Projection.js").default;
     /**
      * The tile grid.
      */
@@ -147,7 +152,7 @@ export type TileMatrixSet = {
     /**
      * The coordinate reference system.
      */
-    crs: string;
+    crs: string | CrsUri | CrsWkt | CrsReferenceSystem;
     /**
      * Axis order.
      */
@@ -157,6 +162,24 @@ export type TileMatrixSet = {
      */
     tileMatrices: Array<TileMatrix>;
 };
+export type CrsUri = {
+    /**
+     * Reference to one coordinate reference system (CRS).
+     */
+    uri: string;
+};
+export type CrsWkt = {
+    /**
+     * JSON encoding for WKT representation of CRS 2.0.
+     */
+    wkt: any;
+};
+export type CrsReferenceSystem = {
+    /**
+     * Data structure as defined in the MD_ReferenceSystem of the ISO 19115.
+     */
+    referenceSystem: any;
+};
 export type TileMatrix = {
     /**
      * The tile matrix identifier.

package/source/ogcTileUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["ogcTileUtil.js"],"names":[],"mappings":"AAqFA;;;;;GAKG;AAEH;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,6DAJW,MAAM,eACN,KAAK,CAAC,MAAM,CAAC,GACZ,MAAM,CA6BjB;AAED;;;;;GAKG;AACH,6CALW,KAAK,CAAC,IAAI,CAAC,uEAGV,MAAM,CAiCjB;AAED;;;;;;GAMG;AACH,gDANW,KAAK,CAAC,IAAI,CAAC,mHAIV,MAAM,CAsDjB;AA6ND;;;GAGG;AACH,2CAHW,UAAU,GACT,OAAO,CAAC,WAAW,CAAC,CAM/B;;;;;iBAxXa,MAAM;;;;UACN,OAAO,yBAAyB,EAAE,OAAO;;;;iBACzC,OAAO,YAAY,EAAE,WAAW;;;;;;SAKhC,MAAM;;;;eACN,MAAM;;;;;;;;gBAEN,OAAO,uBAAuB,EAAE,OAAO;;;;;;;;;;uBAlFxC,KAAK,GAAG,QAAQ;6BAIhB,SAAS,GAAG,YAAY;;;;;cAKvB,QAAQ;;;;;;;;;;;;;;;;WAIR,KAAK,CAAC,IAAI,CAAC;;;;;;SAKX,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;gBAKN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;;;QAKN,MAAM;;;;SACN,MAAM;;;;;;;;kBAEN,KAAK,CAAC,UAAU,CAAC;;;;;;QAKjB,MAAM;;;;cACN,MAAM;;;;mBACN,KAAK,CAAC,MAAM,CAAC;;;;;;;;iBAEb,MAAM;;;;kBACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM"}
+{"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["ogcTileUtil.js"],"names":[],"mappings":"AAoGA;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,6DAJW,MAAM,eACN,KAAK,CAAC,MAAM,CAAC,GACZ,MAAM,CA6BjB;AAED;;;;;GAKG;AACH,6CALW,KAAK,CAAC,IAAI,CAAC,uEAGV,MAAM,CAiCjB;AAED;;;;;;GAMG;AACH,gDANW,KAAK,CAAC,IAAI,CAAC,mHAIV,MAAM,CAsDjB;AAkOD;;;GAGG;AACH,2CAHW,UAAU,GACT,OAAO,CAAC,WAAW,CAAC,CAM/B;;;;;iBA9Xa,MAAM;;;;gBACN,OAAO,uBAAuB,EAAE,OAAO;;;;UACvC,OAAO,yBAAyB,EAAE,OAAO;;;;iBACzC,OAAO,YAAY,EAAE,WAAW;;;;;;SAKhC,MAAM;;;;eACN,MAAM;;;;;;;;gBAEN,OAAO,uBAAuB,EAAE,OAAO;;;;;;;;;;uBAlGxC,KAAK,GAAG,QAAQ;6BAIhB,SAAS,GAAG,YAAY;;;;;cAKvB,QAAQ;;;;;;;;;;;;;;;;WAIR,KAAK,CAAC,IAAI,CAAC;;;;;;SAKX,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;gBAKN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;;;QAKN,MAAM;;;;SACN,MAAM,GAAC,MAAM,GAAC,MAAM,GAAC,kBAAkB;;;;;;;;kBAEvC,KAAK,CAAC,UAAU,CAAC;;;;;;SAKjB,MAAM;;;;;;;;;;;;;;;;;;QAeN,MAAM;;;;cACN,MAAM;;;;mBACN,KAAK,CAAC,MAAM,CAAC;;;;;;;;iBAEb,MAAM;;;;kBACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM"}

package/source/ogcTileUtil.js

@@ -48,11 +48,26 @@ import {error as logError} from '../console.js';
 /**
  * @typedef {Object} TileMatrixSet
  * @property {string} id The tile matrix set identifier.
- * @property {string} crs The coordinate reference system.
+ * @property {string|CrsUri|CrsWkt|CrsReferenceSystem} crs The coordinate reference system.
  * @property {Array<string>} [orderedAxes] Axis order.
  * @property {Array<TileMatrix>} tileMatrices Array of tile matrices.
  */
 
+/**
+ * @typedef {Object} CrsUri
+ * @property {string} uri Reference to one coordinate reference system (CRS).
+ */
+
+/**
+ * @typedef {Object} CrsWkt
+ * @property {Object} wkt JSON encoding for WKT representation of CRS 2.0.
+ */
+
+/**
+ * @typedef {Object} CrsReferenceSystem
+ * @property {Object} referenceSystem Data structure as defined in the MD_ReferenceSystem of the ISO 19115.
+ */
+
 /**
  * @typedef {Object} TileMatrix
  * @property {string} id The tile matrix identifier.
@@ -86,6 +101,7 @@ const knownVectorMediaTypes = {
 /**
  * @typedef {Object} TileSetInfo
  * @property {string} urlTemplate The tile URL template.
+ * @property {import("../proj/Projection.js").default} projection The source projection.
  * @property {import("../tilegrid/TileGrid.js").default} grid The tile grid.
  * @property {import("../Tile.js").UrlFunction} urlFunction The tile URL function.
  */
@@ -249,9 +265,13 @@ function parseTileMatrixSet(
 ) {
   let projection = sourceInfo.projection;
   if (!projection) {
-    projection = getProjection(tileMatrixSet.crs);
+    if (typeof tileMatrixSet.crs === 'string') {
+      projection = getProjection(tileMatrixSet.crs);
+    } else if ('uri' in tileMatrixSet.crs) {
+      projection = getProjection(tileMatrixSet.crs.uri);
+    }
     if (!projection) {
-      throw new Error(`Unsupported CRS: ${tileMatrixSet.crs}`);
+      throw new Error(`Unsupported CRS: ${JSON.stringify(tileMatrixSet.crs)}`);
     }
   }
   const orderedAxes = tileMatrixSet.orderedAxes;
@@ -390,6 +410,7 @@ function parseTileMatrixSet(
 
   return {
     grid: tileGrid,
+    projection: projection,
     urlTemplate: tileUrlTemplate,
     urlFunction: tileUrlFunction,
   };

package/util.js

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