Merge pull request #11543 from sweco-dkjesh/main

wmts matrixset null pointer fix and improved handling of Identifier
2020-09-09 17:51:33 +02:00
parent 915bca5114 df8da1158f
commit 5b69af64e8
1 changed files with 8 additions and 2 deletions
--- a/src/ol/source/WMTS.js
+++ b/src/ol/source/WMTS.js
@@ -459,10 +459,16 @@ export function optionsFromCapabilities(wmtsCap, config) {
  //in case of matrix limits, use matrix limits to calculate extent
  if (matrixLimits) {
    selectedMatrixLimit = matrixLimits[matrixLimits.length - 1];
-    matrix = find(
+    const m = find(
      matrixSetObj.TileMatrix,
-      (value) => value.Identifier === selectedMatrixLimit.TileMatrix
+      (tileMatrixValue) =>
+        tileMatrixValue.Identifier === selectedMatrixLimit.TileMatrix ||
+        matrixSetObj.Identifier + ':' + tileMatrixValue.Identifier ===
+          selectedMatrixLimit.TileMatrix
    );
+    if (m) {
+      matrix = m;
+    }
  }

  const resolution =