Fixes #1924: better handling of WMTS caps parsing and improved matrix…

…set guess algorithm
geosolutions-it · Jun 12, 2017 · 1729ee0 · 1729ee0
1 parent ba2b14a
commit 1729ee0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/web/client/components/map/leaflet/plugins/WMTSLayer.js b/web/client/components/map/leaflet/plugins/WMTSLayer.js
@@ -21,7 +21,7 @@ L.tileLayer.wmts = function(urls, options, matrixOptions) {
 
 function wmtsToLeafletOptions(options) {
     const srs = CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS);
-    const tileMatrixSet = WMTSUtils.getTileMatrixSet(options.tileMatrixSet, srs, options.allowedSRS);
+    const tileMatrixSet = WMTSUtils.getTileMatrixSet(options.tileMatrixSet, srs, options.allowedSRS, options.matrixIds);
     return assign({
         layer: options.name,
         style: options.style || "",

diff --git a/web/client/components/map/openlayers/plugins/WMTSLayer.js b/web/client/components/map/openlayers/plugins/WMTSLayer.js
@@ -23,7 +23,7 @@ Layers.registerType('wmts', {
     create: (options) => {
         const urls = getWMSURLs(isArray(options.url) ? options.url : [options.url]);
         const srs = CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS);
-        const tileMatrixSet = WMTSUtils.getTileMatrixSet(options.tileMatrixSet, srs, options.allowedSRS);
+        const tileMatrixSet = WMTSUtils.getTileMatrixSet(options.tileMatrixSet, srs, options.allowedSRS, options.matrixIds);
         const resolutions = options.resolutions || mapUtils.getResolutions();
         const matrixIds = WMTSUtils.limitMatrix(options.matrixIds && WMTSUtils.getMatrixIds(options.matrixIds, tileMatrixSet || srs) || WMTSUtils.getDefaultMatrixId(options), resolutions.length);
         const extent = options.bbox ? ol.extent.applyTransform([parseFloat(options.bbox.bounds.minx), parseFloat(options.bbox.bounds.miny), parseFloat(options.bbox.bounds.maxx), parseFloat(options.bbox.bounds.maxy)], ol.proj.getTransform(options.bbox.crs, options.srs)) : null;

diff --git a/web/client/utils/CatalogUtils.js b/web/client/utils/CatalogUtils.js
@@ -10,7 +10,7 @@ const assign = require('object-assign');
 const {head, isArray, isString} = require('lodash');
 const urlUtil = require('url');
 const CoordinatesUtils = require('./CoordinatesUtils');
-const {castArray} = require('lodash');
+const {castArray, isObject} = require('lodash');
 
 const getWMSBBox = (record) => {
     let layer = record;
@@ -45,6 +45,10 @@ const getWMTSBBox = (record) => {
     return bbox;
 };
 
+const getNodeText = (node) => {
+    return isObject(node) && node._ || node;
+};
+
 const converters = {
     csw: (records, options) => {
         let result = records;
@@ -176,9 +180,9 @@ const converters = {
             return records.records.map((record) => {
                 const bbox = getWMTSBBox(record);
                 return {
-                title: record["ows:Title"] || record["ows:Identifier"],
-                description: record["ows:Abstract"] || record["ows:Title"] || record["ows:Identifier"],
-                identifier: record["ows:Identifier"],
+                title: getNodeText(record["ows:Title"] || record["ows:Identifier"]),
+                description: getNodeText(record["ows:Abstract"] || record["ows:Title"] || record["ows:Identifier"]),
+                identifier: getNodeText(record["ows:Identifier"]),
                 tags: "",
                 tileMatrixSet: record.TileMatrixSet,
                 matrixIds: castArray(record.TileMatrixSetLink).reduce((previous, current) => {

diff --git a/web/client/utils/WMTSUtils.js b/web/client/utils/WMTSUtils.js
@@ -38,8 +38,8 @@ const WMTSUtils = {
         if (tileMatrixSet) {
             return CoordinatesUtils.getEquivalentSRS(srs, allowedSRS).reduce((previous, current) => {
                 if (isArray(tileMatrixSet)) {
-                    const matching = head(tileMatrixSet.filter((matrix) => (matrix["ows:Identifier"] === current || CoordinatesUtils.getEPSGCode(matrix["ows:SupportedCRS"]) === current)));
-                    return matching && matching["ows:Identifier"] && !matrixIds[previous] ? current : previous;
+                    const matching = head(tileMatrixSet.filter((matrix) => ((matrix["ows:Identifier"] === current || CoordinatesUtils.getEPSGCode(matrix["ows:SupportedCRS"]) === current) && matrixIds[matrix["ows:Identifier"]])));
+                    return matching && matching["ows:Identifier"] ? matching["ows:Identifier"] : previous;
                 } else if (isObject(tileMatrixSet)) {
                     return tileMatrixSet[current] || previous;
                 }

diff --git a/web/client/utils/mapinfo/wmts.js b/web/client/utils/mapinfo/wmts.js
@@ -31,7 +31,7 @@ module.exports = {
         let centerProjected = CoordinatesUtils.reproject(center, 'EPSG:4326', props.map.projection);
 
         const srs = CoordinatesUtils.normalizeSRS(layer.srs || props.map.projection || 'EPSG:3857', layer.allowedSRS);
-        const tileMatrixSet = WMTSUtils.getTileMatrixSet(layer.tileMatrixSet, srs, layer.allowedSRS);
+        const tileMatrixSet = WMTSUtils.getTileMatrixSet(layer.tileMatrixSet, srs, layer.allowedSRS, layer.matrixIds);
 
         const fx = (centerProjected.x - tileOrigin[0]) / (resolution * tileSize);
         const fy = (tileOrigin[1] - centerProjected.y) / (resolution * tileSize);