ol 9.0.0-dev.1707149076355 → 9.0.0-dev.1707341212133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.0.0-dev.1707149076355",
+  "version": "9.0.0-dev.1707341212133",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/WMTS.js

@@ -361,7 +361,7 @@ export default WMTS;
  */
 export function optionsFromCapabilities(wmtsCap, config) {
   const layers = wmtsCap['Contents']['Layer'];
-  const l = layers.find(function (elt) {
+  const l = layers?.find(function (elt) {
     return elt['Identifier'] == config['layer'];
   });
   if (!l) {

package/source/ogcTileUtil.d.ts

@@ -135,6 +135,10 @@ export type TileMatrixSet = {
      * The coordinate reference system.
      */
     crs: string;
+    /**
+     * Axis order.
+     */
+    orderedAxes?: string[] | undefined;
     /**
      * Array of tile matrices.
      */

package/source/ogcTileUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["ogcTileUtil.js"],"names":[],"mappings":"AAmFA;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AACH,6CAJW,MAAM,IAAI,CAAC,mCAEV,MAAM,CA6BjB;AAED;;;;;GAKG;AACH,gDALW,MAAM,IAAI,CAAC,+EAGV,MAAM,CAiDjB;AAoND;;;GAGG;AACH,2CAHW,UAAU,GACT,QAAQ,WAAW,CAAC,CAM/B;;;;;iBAjUa,MAAM;;;;UACN,OAAO,yBAAyB,EAAE,OAAO;;;;iBACzC,OAAO,YAAY,EAAE,WAAW;;;;;;SAKhC,MAAM;;;;eACN,MAAM;;;;;;;;gBAEN,OAAO,uBAAuB,EAAE,OAAO;;;;;;uBAjFxC,KAAK,GAAG,QAAQ;6BAIhB,SAAS,GAAG,YAAY;;;;;cAKvB,QAAQ;;;;;;;;;;;;;;;;WAIR,MAAM,IAAI,CAAC;;;;;;SAKX,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;gBAKN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;;;QAKN,MAAM;;;;SACN,MAAM;;;;kBACN,MAAM,UAAU,CAAC;;;;;;QAKjB,MAAM;;;;cACN,MAAM;;;;mBACN,MAAM,MAAM,CAAC;;;;;;;;iBAEb,MAAM;;;;kBACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM"}
+{"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["ogcTileUtil.js"],"names":[],"mappings":"AAoFA;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AACH,6CAJW,MAAM,IAAI,CAAC,mCAEV,MAAM,CA6BjB;AAED;;;;;GAKG;AACH,gDALW,MAAM,IAAI,CAAC,+EAGV,MAAM,CAiDjB;AA2ND;;;GAGG;AACH,2CAHW,UAAU,GACT,QAAQ,WAAW,CAAC,CAM/B;;;;;iBAxUa,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,MAAM,IAAI,CAAC;;;;;;SAKX,MAAM;;;;UACN,MAAM;;;;UACN,MAAM;;;;;;gBAKN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;gBACN,MAAM;;;;;;QAKN,MAAM;;;;SACN,MAAM;;;;;;;;kBAEN,MAAM,UAAU,CAAC;;;;;;QAKjB,MAAM;;;;cACN,MAAM;;;;mBACN,MAAM,MAAM,CAAC;;;;;;;;iBAEb,MAAM;;;;kBACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM"}

package/source/ogcTileUtil.js

@@ -48,6 +48,7 @@ import {getIntersection as intersectExtents} from '../extent.js';
  * @typedef {Object} TileMatrixSet
  * @property {string} id The tile matrix set identifier.
  * @property {string} crs The coordinate reference system.
+ * @property {Array<string>} [orderedAxes] Axis order.
  * @property {Array<TileMatrix>} tileMatrices Array of tile matrices.
  */
 
@@ -206,7 +207,14 @@ function parseTileMatrixSet(
       throw new Error(`Unsupported CRS: ${tileMatrixSet.crs}`);
     }
   }
-  const backwards = projection.getAxisOrientation().substr(0, 2) !== 'en';
+  const orderedAxes = tileMatrixSet.orderedAxes;
+  const backwards =
+    (orderedAxes
+      ? orderedAxes
+          .slice(0, 2)
+          .map((s) => s.replace(/E|X|Lon/i, 'e').replace(/N|Y|Lat/i, 'n'))
+          .join('')
+      : projection.getAxisOrientation().substr(0, 2)) !== 'en';
 
   const matrices = tileMatrixSet.tileMatrices;
 

package/util.js

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