@opengeoweb/webmap 19.2.0 → 19.4.0

package/dist/index.esm.js

@@ -1517,23 +1517,27 @@ var getLegendGraphicURLForLayer = function getLegendGraphicURLForLayer(layer, wi
       return undefined;
     }
     try {
-      var mapDimURL = getMapDimURL(layer).toString();
-      if (mapDimURL) {
-        legendURL += "&" + mapDimURL;
-      }
-      if (layer.sldURL) {
-        legendURL += "&SLD=" + encodeURI(layer.sldURL);
-      }
-      legendURL += '&transparent=true';
-      // append width and height parameters when not present
-      if (!legendURL.includes('&width=') && !legendURL.includes('&height=')) {
-        legendURL += "&width=" + width + "&height=" + height;
+      if (layer.layerType !== LayerType.wmtsMapLayer) {
+        var mapDimURL = getMapDimURL(layer).toString();
+        if (mapDimURL) {
+          legendURL += "&" + mapDimURL;
+        }
+        if (layer.sldURL) {
+          legendURL += "&SLD=" + encodeURI(layer.sldURL);
+        }
+        legendURL += '&transparent=true';
+        // append width and height parameters when not present
+        if (!legendURL.includes('&width=') && !legendURL.includes('&height=')) {
+          legendURL += "&width=" + width + "&height=" + height;
+        }
       }
     } catch (_e) {
       return undefined;
     }
     // Handle WMS extensions
-    legendURL += layer.wmsextensions.url;
+    if (layer.layerType !== LayerType.wmtsMapLayer) {
+      legendURL += layer.wmsextensions.url;
+    }
     return legendURL;
   }
   return undefined;
@@ -3783,11 +3787,98 @@ var makeQueryKeyFroMServiceUrl = function makeQueryKeyFroMServiceUrl(serviceUrl)
  * @returns
  */
 var handleWMTSGetCapabilities = function handleWMTSGetCapabilities(getCapabilities) {
-  var _getCapabilities$Capa;
-  var getCapLayer = (_getCapabilities$Capa = getCapabilities.Capabilities) == null || (_getCapabilities$Capa = _getCapabilities$Capa.Contents) == null ? void 0 : _getCapabilities$Capa.Layer;
+  var _getCapabilities$Capa, _getFeatureInfoOperat, _getFeatureInfoGets$, _getCapabilities$Capa2;
+  var toArray = function toArray(value) {
+    if (!value) {
+      return [];
+    }
+    return Array.isArray(value) ? value : [value];
+  };
+  var getOperationByName = function getOperationByName(operations, operationName) {
+    return operations.find(function (operation) {
+      var _operation$attr;
+      return ((_operation$attr = operation.attr) == null ? void 0 : _operation$attr.name) === operationName;
+    });
+  };
+  var getEncodingFromOperation = function getEncodingFromOperation(operationGets) {
+    for (var _iterator2 = _createForOfIteratorHelperLoose(operationGets), _step2; !(_step2 = _iterator2()).done;) {
+      var operationGet = _step2.value;
+      var constraints = toArray(operationGet.Constraint);
+      var encodingConstraint = constraints.find(function (constraint) {
+        var _constraint$attr;
+        return ((_constraint$attr = constraint.attr) == null ? void 0 : _constraint$attr.name) === 'GetEncoding';
+      });
+      if (encodingConstraint) {
+        var _encodingConstraint$A;
+        var allowedValues = toArray((_encodingConstraint$A = encodingConstraint.AllowedValues) == null ? void 0 : _encodingConstraint$A.Value);
+        if (allowedValues.length > 0 && allowedValues[0].value) {
+          return allowedValues[0].value;
+        }
+      }
+    }
+    return undefined;
+  };
+  var getLegendUrlFromStyle = function getLegendUrlFromStyle(style) {
+    var _genericImageLegend$a, _legendUrls$;
+    var normalizeWmtsLegendUrl = function normalizeWmtsLegendUrl(legendUrl) {
+      try {
+        var parsedUrl = new URL(legendUrl);
+        var format = parsedUrl.searchParams.get('FORMAT');
+        if (format) {
+          var decodedFormat = decodeURIComponent(format);
+          if (decodedFormat !== format) {
+            parsedUrl.searchParams.set('FORMAT', decodedFormat);
+          }
+        }
+        return parsedUrl.toString();
+      } catch (_error) {
+        return legendUrl;
+      }
+    };
+    if (!style) {
+      return '';
+    }
+    var legendUrls = toArray(style.LegendURL);
+    if (legendUrls.length === 0) {
+      return '';
+    }
+    var preferredFormats = ['image/svg+xml', 'image/png'];
+    var _loop = function _loop() {
+        var _match$attr;
+        var preferredFormat = _preferredFormats[_i];
+        var match = legendUrls.find(function (legendURL) {
+          var _legendURL$attr;
+          return (legendURL == null || (_legendURL$attr = legendURL.attr) == null ? void 0 : _legendURL$attr.format) === preferredFormat;
+        });
+        if (match != null && (_match$attr = match.attr) != null && _match$attr['xlink:href']) {
+          return {
+            v: normalizeWmtsLegendUrl(match.attr['xlink:href'])
+          };
+        }
+      },
+      _ret;
+    for (var _i = 0, _preferredFormats = preferredFormats; _i < _preferredFormats.length; _i++) {
+      _ret = _loop();
+      if (_ret) return _ret.v;
+    }
+    var genericImageLegend = legendUrls.find(function (legendURL) {
+      var _legendURL$attr2;
+      return legendURL == null || (_legendURL$attr2 = legendURL.attr) == null || (_legendURL$attr2 = _legendURL$attr2.format) == null ? void 0 : _legendURL$attr2.startsWith('image/');
+    });
+    if (genericImageLegend != null && (_genericImageLegend$a = genericImageLegend.attr) != null && _genericImageLegend$a['xlink:href']) {
+      return normalizeWmtsLegendUrl(genericImageLegend.attr['xlink:href']);
+    }
+    return (_legendUrls$ = legendUrls[0]) != null && (_legendUrls$ = _legendUrls$.attr) != null && _legendUrls$['xlink:href'] ? normalizeWmtsLegendUrl(legendUrls[0].attr['xlink:href']) : '';
+  };
+  var operations = toArray((_getCapabilities$Capa = getCapabilities.Capabilities) == null || (_getCapabilities$Capa = _getCapabilities$Capa.OperationsMetadata) == null ? void 0 : _getCapabilities$Capa.Operation);
+  var getFeatureInfoOperation = getOperationByName(operations, 'GetFeatureInfo');
+  var getFeatureInfoGets = toArray(getFeatureInfoOperation == null || (_getFeatureInfoOperat = getFeatureInfoOperation.DCP) == null || (_getFeatureInfoOperat = _getFeatureInfoOperat.HTTP) == null ? void 0 : _getFeatureInfoOperat.Get);
+  var wmtsGetFeatureInfoURL = ((_getFeatureInfoGets$ = getFeatureInfoGets[0]) == null || (_getFeatureInfoGets$ = _getFeatureInfoGets$.attr) == null ? void 0 : _getFeatureInfoGets$['xlink:href']) || '';
+  var wmtsGetFeatureInfoEncoding = getEncodingFromOperation(getFeatureInfoGets) || '';
+  var getCapLayer = (_getCapabilities$Capa2 = getCapabilities.Capabilities) == null || (_getCapabilities$Capa2 = _getCapabilities$Capa2.Contents) == null ? void 0 : _getCapabilities$Capa2.Layer;
   var layers = Array.isArray(getCapLayer) ? getCapLayer : [getCapLayer]; // Can be either array or single object
   return layers.map(function (layer) {
-    var _layer$Abstract;
+    var _defaultStyle$Identif, _toArray$find, _layer$Abstract;
     if (!layer) {
       return null;
     }
@@ -3810,13 +3901,51 @@ var handleWMTSGetCapabilities = function handleWMTSGetCapabilities(getCapabiliti
         layerDimensions.push(dimension);
       }
     });
-    // Styles are probably not defined for WMTS layers, but we create a default style
-    var layerStyles = [{
-      name: 'default',
-      title: 'default',
-      legendURL: '',
-      "abstract": ''
-    }];
+    var layerStyles = toArray(layer.Style).map(function (style) {
+      var _style$Identifier, _style$Title;
+      var styleName = (style == null || (_style$Identifier = style.Identifier) == null ? void 0 : _style$Identifier.value) || 'default';
+      var styleTitle = (style == null || (_style$Title = style.Title) == null ? void 0 : _style$Title.value) || styleName;
+      return {
+        name: styleName,
+        title: styleTitle,
+        legendURL: getLegendUrlFromStyle(style),
+        "abstract": ''
+      };
+    });
+    if (layerStyles.length === 0) {
+      layerStyles.push({
+        name: 'default',
+        title: 'default',
+        legendURL: '',
+        "abstract": ''
+      });
+    }
+    var defaultStyle = toArray(layer.Style).find(function (style) {
+      var _style$attr;
+      return (style == null || (_style$attr = style.attr) == null ? void 0 : _style$attr.isDefault) === 'true';
+    });
+    if (defaultStyle != null && (_defaultStyle$Identif = defaultStyle.Identifier) != null && _defaultStyle$Identif.value) {
+      var defaultStyleIndex = layerStyles.findIndex(function (style) {
+        var _defaultStyle$Identif2;
+        return style.name === ((_defaultStyle$Identif2 = defaultStyle.Identifier) == null ? void 0 : _defaultStyle$Identif2.value);
+      });
+      if (defaultStyleIndex > 0) {
+        var _layerStyles$splice = layerStyles.splice(defaultStyleIndex, 1),
+          defaultStyleItem = _layerStyles$splice[0];
+        layerStyles.unshift(defaultStyleItem);
+      }
+    }
+    var layerInfoFormats = toArray(layer.InfoFormat).map(function (format) {
+      return (format == null ? void 0 : format.value) || '';
+    }).filter(Boolean);
+    var preferredInfoFormats = ['text/html', 'application/json', 'text/xml'];
+    var layerInfoFormat = preferredInfoFormats.find(function (preferredInfoFormat) {
+      return layerInfoFormats.includes(preferredInfoFormat);
+    }) || layerInfoFormats[0];
+    var tileMatrixSet = (_toArray$find = toArray(layer.TileMatrixSetLink).find(function (tileMatrixSetLink) {
+      var _tileMatrixSetLink$Ti;
+      return !!((_tileMatrixSetLink$Ti = tileMatrixSetLink.TileMatrixSet) != null && _tileMatrixSetLink$Ti.value);
+    })) == null || (_toArray$find = _toArray$find.TileMatrixSet) == null ? void 0 : _toArray$find.value;
     return {
       title: layer.Title.value,
       name: layer.Identifier.value,
@@ -3825,7 +3954,11 @@ var handleWMTSGetCapabilities = function handleWMTSGetCapabilities(getCapabiliti
       path: [],
       styles: layerStyles,
       dimensions: layerDimensions,
-      ogctype: OGCTYPE.WMTS
+      ogctype: OGCTYPE.WMTS,
+      wmtsGetFeatureInfoURL: wmtsGetFeatureInfoURL,
+      wmtsGetFeatureInfoEncoding: wmtsGetFeatureInfoEncoding,
+      wmtsInfoFormat: layerInfoFormat,
+      wmtsTileMatrixSet: tileMatrixSet
     };
   }).filter(function (x) {
     return !!x;
@@ -4571,6 +4704,9 @@ var WMLayer = /*#__PURE__*/function () {
     this.getmapURL = undefined;
     this.getfeatureinfoURL = undefined;
     this.getlegendgraphicURL = undefined;
+    this.wmtsGetFeatureInfoEncoding = '';
+    this.wmtsInfoFormat = '';
+    this.wmtsTileMatrixSet = '';
     this.keepOnTop = false;
     this.transparent = true;
     this.hasError = false;
@@ -4753,8 +4889,11 @@ var WMLayer = /*#__PURE__*/function () {
             configureDimensions(layerProps, this);
             configureGeographicBoundingBox(layerProps, this);
             configureStyles(layerProps, this);
-            this.getfeatureinfoURL = '';
-            this.getlegendgraphicURL = '';
+            this.getfeatureinfoURL = layerProps.wmtsGetFeatureInfoURL || '';
+            this.wmtsGetFeatureInfoEncoding = layerProps.wmtsGetFeatureInfoEncoding || '';
+            this.wmtsInfoFormat = layerProps.wmtsInfoFormat || '';
+            this.wmtsTileMatrixSet = layerProps.wmtsTileMatrixSet || '';
+            this.getlegendgraphicURL = this.legendGraphic || '';
             this.isConfigured = true;
             return _context.a(2, this);
           case 7:
@@ -4790,6 +4929,13 @@ var WMLayer = /*#__PURE__*/function () {
     newLayer.name = this.name;
     newLayer.layerType = this.layerType;
     newLayer.refTimeDimensionMode = this.refTimeDimensionMode;
+    newLayer.currentStyle = this.currentStyle;
+    newLayer.getfeatureinfoURL = this.getfeatureinfoURL;
+    newLayer.getlegendgraphicURL = this.getlegendgraphicURL;
+    newLayer.wmtsGetFeatureInfoEncoding = this.wmtsGetFeatureInfoEncoding;
+    newLayer.wmtsInfoFormat = this.wmtsInfoFormat;
+    newLayer.wmtsTileMatrixSet = this.wmtsTileMatrixSet;
+    newLayer.olSource = this.olSource;
     this.dimensions.forEach(function (dim) {
       newLayer.dimensions.push(dim.clone());
     });

package/dist/src/lib/components/WMLayer.d.ts

@@ -27,6 +27,9 @@ export default class WMLayer {
     getmapURL: string;
     getfeatureinfoURL: string;
     getlegendgraphicURL: string;
+    wmtsGetFeatureInfoEncoding: string;
+    wmtsInfoFormat: string;
+    wmtsTileMatrixSet: string;
     keepOnTop: boolean;
     transparent: boolean;
     wms130bboxcompatibilitymode: boolean;

package/dist/src/lib/components/types.d.ts

@@ -79,6 +79,10 @@ export interface LayerProps {
     queryable?: boolean;
     crs?: CoordinateReferenceSystem[];
     ogctype?: OGCTYPE;
+    wmtsGetFeatureInfoURL?: string;
+    wmtsGetFeatureInfoEncoding?: string;
+    wmtsInfoFormat?: string;
+    wmtsTileMatrixSet?: string;
 }
 /**
  * Represents the layers as advertised in the WMS GetCapabilities document
@@ -193,17 +197,78 @@ export interface WMTDimension {
         value: string;
     }[];
 }
+export interface WMTLegendURL {
+    attr?: {
+        format?: string;
+        'xlink:href'?: string;
+    };
+}
+export interface WMTStyle {
+    attr?: {
+        isDefault?: string;
+    };
+    Identifier?: {
+        value: string;
+    };
+    Title?: {
+        value: string;
+    };
+    LegendURL?: WMTLegendURL | WMTLegendURL[];
+}
 export interface WMTLayer {
     Abstract: {
         value: string;
     };
-    Dimension?: WMTDimension[];
+    Dimension?: WMTDimension | WMTDimension[];
     Identifier: {
         value: string;
     };
     Title: {
         value: string;
     };
+    Style?: WMTStyle | WMTStyle[];
+    InfoFormat?: {
+        value: string;
+    } | {
+        value: string;
+    }[];
+    TileMatrixSetLink?: {
+        TileMatrixSet?: {
+            value: string;
+        };
+    } | {
+        TileMatrixSet?: {
+            value: string;
+        };
+    }[];
+}
+export interface WMTOperationConstraint {
+    attr?: {
+        name?: string;
+    };
+    AllowedValues?: {
+        Value?: {
+            value?: string;
+        } | {
+            value?: string;
+        }[];
+    };
+}
+export interface WMTOperationGet {
+    attr?: {
+        'xlink:href'?: string;
+    };
+    Constraint?: WMTOperationConstraint | WMTOperationConstraint[];
+}
+export interface WMTOperation {
+    attr?: {
+        name?: string;
+    };
+    DCP?: {
+        HTTP?: {
+            Get?: WMTOperationGet | WMTOperationGet[];
+        };
+    };
 }
 export interface WMTSGetCapabilities {
     Capabilities?: {
@@ -218,6 +283,9 @@ export interface WMTSGetCapabilities {
                 value: string;
             };
         };
+        OperationsMetadata?: {
+            Operation?: WMTOperation | WMTOperation[];
+        };
         Contents?: {
             Layer?: WMTLayer | WMTLayer[];
         };

package/dist/src/lib/query/fakeApiWmtsQueries.d.ts

@@ -99,11 +99,25 @@ export declare const wmtsResponseGetCapabilities: {
                         attr: {};
                         value: string;
                     };
+                    Title: {
+                        attr: {};
+                        value: string;
+                    };
+                    LegendURL: {
+                        attr: {
+                            format: string;
+                            'xlink:href': string;
+                        };
+                    }[];
                 };
                 Format: {
                     attr: {};
                     value: string;
                 };
+                InfoFormat: {
+                    attr: {};
+                    value: string;
+                };
                 Dimension: {
                     attr: {};
                     Identifier: {
@@ -197,6 +211,10 @@ export declare const wmtsResponseLayerList: {
     name: string;
     path: never[];
     ogctype: string;
+    wmtsGetFeatureInfoEncoding: string;
+    wmtsGetFeatureInfoURL: string;
+    wmtsInfoFormat: string;
+    wmtsTileMatrixSet: string;
     styles: {
         abstract: string;
         legendURL: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "19.2.0",
+  "version": "19.4.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {