qwc2 2026.4.2 → 2026.4.13

package/LICENSE

@@ -1,6 +1,5 @@
 Copyright (c) 2015-2016 GeoSolutions Sas
-Copyright (c) 2016-2024 Sourcepole AG
-Copyright (c) 2021 Oslandia SAS <infos+qwc2@oslandia.com>
+Copyright (c) QWC Contributors <https://github.com/qgis/qwc2/graphs/contributors>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are
@@ -22,7 +21,3 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRU
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies,
-either expressed or implied, of the MapStore2 Project.

package/README.md

@@ -8,18 +8,22 @@ The `qwc2` NPM package can be used as a dependency to build a custom QWC applica
 
 ![Screenshot](https://github.com/qgis/qwc2/blob/gh-pages/Screenshot.jpg?raw=true)
 
-### Main Features
+## Homepage
+
+See [qwc.app](https://qwc.app).
+
+## Main Features
 
 See [qwc.app/features](https://qwc.app/features).
 
 ## Quick start
 
-See [qwc-services.github.io/master/QuickStart/](https://qwc-services.github.io/master/QuickStart/)
+See [docs.qwc.app/master/QuickStart/](https://docs.qwc.app/master/QuickStart/).
 
 ## Documentation
 
-* [qwc-services.github.io](https://qwc-services.github.io/)
-* [ChangeLog](https://qwc-services.github.io/master/release_notes/ChangeLog/)
+* [docs.qwc.app](https://docs.qwc.app)
+* [ChangeLog](https://docs.qwc.app/master/release_notes/ChangeLog/)
 
 ## Help
 

package/components/AppMenu.js

@@ -373,7 +373,8 @@ _defineProperty(AppMenu, "propTypes", {
   showOnStartup: PropTypes.bool
 });
 _defineProperty(AppMenu, "defaultProps", {
-  onMenuToggled: function onMenuToggled() {}
+  onMenuToggled: function onMenuToggled() {},
+  menuDisplayMode: "normal"
 });
 export default connect(function (state) {
   return {

package/components/SearchBox.js

@@ -490,6 +490,14 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         onClick: function onClick(ev) {
           return _this.toggleLayerInfo(ev, provider, group, result, key, parent);
         }
+      }) : null, result.layer.link ? /*#__PURE__*/React.createElement(Icon, {
+        className: "searchbox-entry-link",
+        icon: "info-sign",
+        onClick: function onClick(ev) {
+          var _result$label4;
+          return _this.openUrl(ev, result.layer.link, result.target, (_result$label4 = result.label) !== null && _result$label4 !== void 0 ? _result$label4 : result.text);
+        },
+        title: LocaleUtils.tr("layercatalog.openlink")
       }) : null), _this.state.activeLayerInfo === key ? /*#__PURE__*/React.createElement("div", {
         className: "searchbox-result-abstract",
         dangerouslySetInnerHTML: {
@@ -505,7 +513,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }) : null].flat();
     });
     _defineProperty(_this, "renderThemeResult", function (provider, group, result) {
-      var _result$label4;
+      var _result$label5;
       var addThemes = ConfigUtils.getConfigProp("allowAddingOtherThemes", _this.props.theme);
       return /*#__PURE__*/React.createElement("div", {
         className: "searchbox-result",
@@ -527,7 +535,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         dangerouslySetInnerHTML: {
           __html: DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig, ' ')
         },
-        title: (_result$label4 = result.label) !== null && _result$label4 !== void 0 ? _result$label4 : result.text
+        title: (_result$label5 = result.label) !== null && _result$label5 !== void 0 ? _result$label5 : result.text
       }), result.theme && addThemes ? /*#__PURE__*/React.createElement(Icon, {
         icon: "plus",
         onClick: function onClick(ev) {

package/components/map/layers/MVTLayer.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import axios from 'axios';
 import { applyStyle } from 'ol-mapbox-style';
 import ol from 'openlayers';
-export var createLayer = function createLayer(options) {
+function createLayer(url, options) {
   return new ol.layer.VectorTile(_objectSpread({
     minResolution: options.minResolution,
     maxResolution: options.maxResolution,
@@ -23,37 +23,75 @@ export var createLayer = function createLayer(options) {
     source: new ol.source.VectorTile(_objectSpread({
       projection: options.projection,
       format: new ol.format.MVT({}),
-      url: options.url,
+      url: url,
       tileGrid: options.tileGridConfig ? new ol.tilegrid.TileGrid(_objectSpread({}, options.tileGridConfig)) : undefined
     }, options.sourceConfig || {}))
   }, options.layerConfig || {}));
-};
+}
+export function createFromStyle(style, options, callback) {
+  axios.get(style).then(function (response) {
+    var _glStyle$sprite, _glStyle$glyphs;
+    var glStyle = response.data;
+    ((_glStyle$sprite = glStyle.sprite) === null || _glStyle$sprite === void 0 ? void 0 : _glStyle$sprite.startsWith(".")) && (glStyle.sprite = new URL(glStyle.sprite, options.style).href);
+    ((_glStyle$glyphs = glStyle.glyphs) === null || _glStyle$glyphs === void 0 ? void 0 : _glStyle$glyphs.startsWith(".")) && (glStyle.glyphs = new URL(glStyle.glyphs, options.style).href);
+    // Collect used sources
+    var usedSources = new Set(glStyle.layers.map(function (l) {
+      return l.source;
+    }).filter(Boolean));
+    // Create layer for each source
+    usedSources.forEach(function (sourceName) {
+      var _source$url, _source$tiles;
+      var source = glStyle.sources[sourceName];
+      if (source.type !== 'vector' && source.type !== 'geojson') {
+        return;
+      }
+      ((_source$url = source.url) === null || _source$url === void 0 ? void 0 : _source$url.startsWith(".")) && (source.url = new URL(source.url, options.style).href);
+      if ((_source$tiles = source.tiles) !== null && _source$tiles !== void 0 && _source$tiles.length) {
+        var layer = createLayer(source.tiles[0], options);
+        applyStyle(layer, style, sourceName, options.styleOptions).then(function () {
+          callback(layer);
+        })["catch"](function (e) {
+          /* eslint-disable-next-line */
+          console.warn("Unable to apply style " + sourceName + ": " + String(e));
+        });
+      } else if (source.url) {
+        axios.get(source.url).then(function (response2) {
+          var _response2$data;
+          if ((_response2$data = response2.data) !== null && _response2$data !== void 0 && (_response2$data = _response2$data.tiles) !== null && _response2$data !== void 0 && _response2$data.length) {
+            var _layer = createLayer(response2.data.tiles[0], options, callback);
+            applyStyle(_layer, style, sourceName, options.styleOptions).then(function () {
+              callback(_layer);
+            })["catch"](function (e) {
+              /* eslint-disable-next-line */
+              console.warn("Unable to apply style " + sourceName + ": " + String(e));
+            });
+          } else {
+            /* eslint-disable-next-line */
+            console.warn("Could not find source tile URL for style " + sourceName);
+          }
+        })["catch"](function () {
+          /* eslint-disable-next-line */
+          console.warn("Could not find source tile URL for style " + sourceName);
+        });
+      } else {
+        /* eslint-disable-next-line */
+        console.warn("Could not find source tile URL for style " + sourceName);
+      }
+    });
+  })["catch"](function (e) {
+    /* eslint-disable-next-line */
+    console.warn("Unable to load style " + options.style + ": " + String(e));
+  });
+}
 export default {
   create: function create(options) {
     var group = new ol.layer.Group();
     if (options.style) {
-      axios.get(options.style).then(function (response) {
-        var _glStyle$sprite, _glStyle$glyphs;
-        var glStyle = response.data;
-        ((_glStyle$sprite = glStyle.sprite) === null || _glStyle$sprite === void 0 ? void 0 : _glStyle$sprite.startsWith(".")) && (glStyle.sprite = new URL(glStyle.sprite, options.style).href);
-        ((_glStyle$glyphs = glStyle.glyphs) === null || _glStyle$glyphs === void 0 ? void 0 : _glStyle$glyphs.startsWith(".")) && (glStyle.glyphs = new URL(glStyle.glyphs, options.style).href);
-        Object.keys(glStyle.sources).forEach(function (styleSource) {
-          var _glStyle$sources$styl;
-          ((_glStyle$sources$styl = glStyle.sources[styleSource].url) === null || _glStyle$sources$styl === void 0 ? void 0 : _glStyle$sources$styl.startsWith(".")) && (glStyle.sources[styleSource].url = new URL(glStyle.sources[styleSource].url, options.style).href);
-          var layer = createLayer(options);
-          applyStyle(layer, glStyle, styleSource, options.styleOptions).then(function () {
-            group.getLayers().push(layer);
-          })["catch"](function (e) {
-            /* eslint-disable-next-line */
-            console.warn("Unable to apply style " + options.style + ": " + String(e));
-          });
-        });
-      })["catch"](function (e) {
-        /* eslint-disable-next-line */
-        console.warn("Unable to load style " + options.style + ": " + String(e));
+      createFromStyle(options.style, options, function (layer) {
+        group.getLayers().push(layer);
       });
     } else {
-      group.getLayers().push(createLayer(options));
+      group.getLayers().push(createLayer(options.url, options));
     }
     return group;
   }

package/components/map3d/ColorLayer3D.js

@@ -130,7 +130,8 @@ var ColorLayer3D = /*#__PURE__*/function (_React$Component) {
     value: function componentDidUpdate(prevProps) {
       var layerCreator = LayerRegistry3D[this.props.options.type];
       if (this.mapLayer && layerCreator) {
-        layerCreator.update3d(this.mapLayer, this.props.options, prevProps.options, this.props.sceneContext.mapCrs);
+        var _layerCreator$update;
+        (_layerCreator$update = layerCreator.update3d) === null || _layerCreator$update === void 0 || _layerCreator$update.call(layerCreator, this.mapLayer, this.props.options, prevProps.options, this.props.sceneContext.mapCrs);
         this.applyLayerOptions(layerCreator, prevProps.options);
       }
     }

package/components/map3d/layers/MVTLayer3D.js

@@ -8,18 +8,15 @@
 
 import ColorLayer from '@giro3d/giro3d/core/layer/ColorLayer';
 import VectorTileSource from "@giro3d/giro3d/sources/VectorTileSource.js";
-import axios from 'axios';
-import { applyStyle } from 'ol-mapbox-style';
-import { createLayer } from '../../map/layers/MVTLayer';
+import { createFromStyle } from '../../map/layers/MVTLayer';
 import { LayerGroup3D } from './Layer3D';
 export default {
   create3d: function create3d(options, projection) {
-    var create3dLayer = function create3dLayer() {
-      var style = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var create3dLayer = function create3dLayer(url) {
+      var style = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var source = new VectorTileSource({
-        url: options.url,
-        style: style,
-        backgroundColor: "white"
+        url: url,
+        style: style
       });
       return new ColorLayer({
         name: options.name,
@@ -28,28 +25,11 @@ export default {
     };
     var group = new LayerGroup3D(options.id);
     if (options.style) {
-      axios.get(options.style).then(function (response) {
-        var _glStyle$sprite, _glStyle$glyphs;
-        var glStyle = response.data;
-        ((_glStyle$sprite = glStyle.sprite) === null || _glStyle$sprite === void 0 ? void 0 : _glStyle$sprite.startsWith(".")) && (glStyle.sprite = new URL(glStyle.sprite, options.style).href);
-        ((_glStyle$glyphs = glStyle.glyphs) === null || _glStyle$glyphs === void 0 ? void 0 : _glStyle$glyphs.startsWith(".")) && (glStyle.glyphs = new URL(glStyle.glyphs, options.style).href);
-        Object.keys(glStyle.sources).forEach(function (styleSource) {
-          var _glStyle$sources$styl;
-          ((_glStyle$sources$styl = glStyle.sources[styleSource].url) === null || _glStyle$sources$styl === void 0 ? void 0 : _glStyle$sources$styl.startsWith(".")) && (glStyle.sources[styleSource].url = new URL(glStyle.sources[styleSource].url, options.style).href);
-          var olLayer = createLayer(options);
-          applyStyle(olLayer, glStyle, styleSource, options.styleOptions).then(function () {
-            group.addLayer(create3dLayer(olLayer.getStyle()));
-          })["catch"](function (e) {
-            /* eslint-disable-next-line */
-            console.warn("Unable to apply style " + options.style + ": " + String(e));
-          });
-        });
-      })["catch"](function (e) {
-        /* eslint-disable-next-line */
-        console.warn("Unable to load style " + options.style + ": " + String(e));
+      createFromStyle(options.style, options, function (olLayer) {
+        group.addLayer(create3dLayer(olLayer.getSource().getUrls()[0], olLayer.getStyle()));
       });
     } else {
-      group.addLayer(create3dLayer());
+      group.addLayer(create3dLayer(options.url));
     }
     return group;
   },

package/components/style/SearchBox.css

@@ -136,3 +136,14 @@ div.searchbox-filter-options-geometry > div.combobox {
     flex: 1 1 auto;
     height: 2em;
 }
+
+.searchbox-entry-link {
+    margin-right: 0.5em;
+    margin-left: 0.5em;
+    opacity: 0.6;
+    transition: opacity 0.2s;
+}
+ 
+.searchbox-entry-link:hover {
+    opacity: 1;
+}

package/components/widgets/LayerCatalogWidget.js

@@ -27,7 +27,7 @@ import { remove as removeDiacritics } from 'diacritics';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { addLayer, removeLayer, replacePlaceholderLayer, LayerRole } from '../../actions/layers';
-import { NotificationType, showNotification, closeWindow } from '../../actions/windows';
+import { openExternalUrl, NotificationType, showNotification, closeWindow } from '../../actions/windows';
 import LayerUtils from '../../utils/LayerUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
 import MiscUtils from '../../utils/MiscUtils';
@@ -172,6 +172,15 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
         }
       }
     });
+    _defineProperty(_this, "openUrl", function (ev, url, target, title) {
+      MiscUtils.killEvent(ev);
+      if (target === "iframe") {
+        target = ":iframedialog:externallinkiframe";
+      }
+      _this.props.openExternalUrl(url, target, {
+        title: title
+      });
+    });
     _this.state.catalog = props.catalog || [];
     return _this;
   }
@@ -232,6 +241,13 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
           return _this2.checkAddServiceLayer(entry, true);
         },
         title: LocaleUtils.tr("importlayer.asgroup")
+      }) : null, entry.link ? /*#__PURE__*/React.createElement(Icon, {
+        className: "layer-catalog-widget-entry-link",
+        icon: "info-sign",
+        onClick: function onClick(ev) {
+          return _this2.openUrl(ev, entry.link, entry.target);
+        },
+        title: LocaleUtils.tr("layercatalog.openlink")
       }) : null), entry.expanded ? sublayers : null);
     }
   }, {
@@ -287,6 +303,7 @@ _defineProperty(LayerCatalogWidget, "propTypes", {
   layers: PropTypes.array,
   levelBasedIndentSize: PropTypes.bool,
   mapCrs: PropTypes.string,
+  openExternalUrl: PropTypes.func,
   pendingRequests: PropTypes.number,
   removeLayer: PropTypes.func,
   replacePlaceholderLayer: PropTypes.func,
@@ -299,6 +316,7 @@ export default connect(function (state) {
 }, {
   addLayer: addLayer,
   closeWindow: closeWindow,
+  openExternalUrl: openExternalUrl,
   removeLayer: removeLayer,
   replacePlaceholderLayer: replacePlaceholderLayer,
   showNotification: showNotification

package/components/widgets/style/LayerCatalogWidget.css

@@ -57,3 +57,14 @@ span.layer-catalog-widget-entry-service {
     border-radius: 0.25em;
     width: 6ch;
 }
+
+.layer-catalog-widget-entry-link {
+    margin-right: 0.5em;
+    margin-left: 0.5em;
+    opacity: 0.6;
+    transition: opacity 0.2s;
+}
+ 
+.layer-catalog-widget-entry-link:hover {
+    opacity: 1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.04.02",
+    "version": "2026.04.13",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",
@@ -17,7 +17,7 @@
     ],
     "dependencies": {
         "@furkot/webfonts-generator": "^2.0.3",
-        "@giro3d/giro3d": "2.0.0-beta.1",
+        "@giro3d/giro3d": "^2.0.0",
         "@kayahr/text-encoding": "^2.1.0",
         "@loaders.gl/core": "^4.3.4",
         "@loaders.gl/shapefile": "^4.3.4",
@@ -32,7 +32,7 @@
         "@turf/intersect": "^7.3.3",
         "@vtaits/react-color-picker": "^2.0.0",
         "any-date-parser": "^1.5.4",
-        "axios": "^1.13.4",
+        "axios": "^1.15.0",
         "buffer": "^6.0.3",
         "chart.js": "^4.5.1",
         "chartjs-adapter-dayjs-4": "^1.0.4",

package/plugins/MapExport.js

@@ -294,7 +294,8 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
         width: 0,
         height: 0,
         scale: null,
-        pageSize: null
+        pageSize: null,
+        exporting: false
       });
     });
     _defineProperty(_this, "geometryChanged", function (center, extents, rotation, scale) {
@@ -448,18 +449,37 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "dxfExport", function (baseParams, fileName, formatConfiguration) {
-      var promises = _this.props.layers.filter(function (layer) {
-        var _layer$mapFormats;
-        return layer.type === 'wms' && layer.role > LayerRole.BACKGROUND && ((_layer$mapFormats = layer.mapFormats) === null || _layer$mapFormats === void 0 ? void 0 : _layer$mapFormats.includes("application/dxf"));
-      }).reverse().map(function (layer) {
-        var _layer$params$FILTER, _layer$params$FILTER_;
-        var params = _objectSpread(_objectSpread({}, baseParams), {}, {
-          LAYERS: layer.params.LAYERS,
-          OPACITIES: layer.params.OPACITIES,
-          STYLES: layer.params.STYLES,
-          FILTER: (_layer$params$FILTER = layer.params.FILTER) !== null && _layer$params$FILTER !== void 0 ? _layer$params$FILTER : '',
-          FILTER_GEOM: (_layer$params$FILTER_ = layer.params.FILTER_GEOM) !== null && _layer$params$FILTER_ !== void 0 ? _layer$params$FILTER_ : ''
+      // If formatConfiguration overrides LAYERS, only export theme layer with those layers
+      var layersOverridden = (formatConfiguration.extraQuery || "").split(/[?&]/).find(function (entry) {
+        return entry.split("=")[0].toLowerCase() === "layers";
+      }) !== undefined;
+      var jobs = [];
+      if (layersOverridden) {
+        jobs.push({
+          layer: _this.props.theme,
+          params: baseParams
         });
+      } else {
+        jobs = _this.props.layers.filter(function (layer) {
+          var _layer$mapFormats;
+          return layer.type === 'wms' && layer.role > LayerRole.BACKGROUND && ((_layer$mapFormats = layer.mapFormats) === null || _layer$mapFormats === void 0 ? void 0 : _layer$mapFormats.includes("application/dxf"));
+        }).reverse().map(function (layer) {
+          var _layer$params$FILTER, _layer$params$FILTER_;
+          return {
+            layer: layer,
+            params: _objectSpread(_objectSpread({}, baseParams), {}, {
+              LAYERS: layer.params.LAYERS,
+              OPACITIES: layer.params.OPACITIES,
+              STYLES: layer.params.STYLES,
+              FILTER: (_layer$params$FILTER = layer.params.FILTER) !== null && _layer$params$FILTER !== void 0 ? _layer$params$FILTER : '',
+              FILTER_GEOM: (_layer$params$FILTER_ = layer.params.FILTER_GEOM) !== null && _layer$params$FILTER_ !== void 0 ? _layer$params$FILTER_ : ''
+            })
+          };
+        });
+      }
+      var promises = jobs.map(function (_ref3) {
+        var layer = _ref3.layer,
+          params = _ref3.params;
         var data = Object.entries(params).map(function (pair) {
           return pair.map(function (entry) {
             return encodeURIComponent(entry).replace(/%20/g, '+');
@@ -485,21 +505,26 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
       Promise.all(promises).then(function (responses) {
         var decoder = new TextDecoder("iso-8859-1");
         var dxfDocuments = responses.filter(function (response) {
-          return response.headers['content-type'] === "application/dxf";
+          return response && response.headers['content-type'] === "application/dxf";
         }).map(function (response) {
           return explodeDxf(decoder.decode(response.data));
         });
-        var dxfDocument = mergeDxf(dxfDocuments);
-        var result = implodeDxf(dxfDocument);
-        var encoder = new TextEncoder("iso-8859-1");
-        FileSaver.saveAs(new Blob([encoder.encode(result)], {
-          type: "application/dxf"
-        }), fileName);
-        /*
-        responses.forEach((response, idx) => {
-            FileSaver.saveAs(new Blob([response.data], {type: "application/dxf"}), "orig_" + idx + "_" + fileName);
-        });
-        */
+        if (dxfDocuments.length !== 0) {
+          var dxfDocument = mergeDxf(dxfDocuments);
+          var result = implodeDxf(dxfDocument);
+          var encoder = new TextEncoder("iso-8859-1");
+          FileSaver.saveAs(new Blob([encoder.encode(result)], {
+            type: "application/dxf"
+          }), fileName);
+          /*
+          responses.forEach((response, idx) => {
+              FileSaver.saveAs(new Blob([response.data], {type: "application/dxf"}), "orig_" + idx + "_" + fileName);
+          });
+          */
+        } else {
+          /* eslint-disable-next-line */
+          alert('Export failed');
+        }
         _this.setState({
           exporting: false
         });
@@ -573,7 +598,7 @@ _defineProperty(MapExport, "propTypes", {
   fileNameTemplate: PropTypes.string,
   /** Formats to force as available even if the map capabilities report otherwise. Useful if a serviceUrl is defined in a format configuration. */
   forceAvailableFormats: PropTypes.array,
-  /** Custom export configuration per format.
+  /** Custom format export configuration. Specify a format mime-type (i.e. `application/dxf`) as key, and an array of one or more configurations as value.
    *  If more than one configuration per format is provided, a selection combo will be displayed.
    *  `labelMsgId` is a translation string message id for the combo label. If not defined, `name` will be displayed.
    *  `extraQuery` will be appended to the query string (replacing any existing parameters).
@@ -581,17 +606,15 @@ _defineProperty(MapExport, "propTypes", {
    *  `baseLayer` will be appended to the LAYERS instead of the background layer.
    *  `projections` is a list of export projections. If empty, the map projection is automatically used.
    *  `serviceUrl` is the address of a custom service to use instead of the layer OWS service url. */
-  formatConfiguration: PropTypes.shape({
-    format: PropTypes.arrayOf(PropTypes.shape({
-      name: PropTypes.string,
-      labelMsgId: PropTypes.string,
-      extraQuery: PropTypes.string,
-      formatOptions: PropTypes.string,
-      baseLayer: PropTypes.string,
-      projections: PropTypes.array,
-      serviceUrl: PropTypes.string
-    }))
-  }),
+  formatConfiguration: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.shape({
+    name: PropTypes.string,
+    labelMsgId: PropTypes.string,
+    extraQuery: PropTypes.string,
+    formatOptions: PropTypes.string,
+    baseLayer: PropTypes.string,
+    projections: PropTypes.array,
+    serviceUrl: PropTypes.string
+  }))),
   layers: PropTypes.array,
   map: PropTypes.object,
   /** List of image sizes to offer, in addition to the free-hand selection. The width and height are in millimeters. */

package/plugins/MapInfoTooltip.js

@@ -53,7 +53,7 @@ import './style/MapInfoTooltip.css';
  * [ElevationInterface.js](https://github.com/qgis/qwc2/blob/master/utils/ElevationInterface.js)), the
  * height at the picked position is also displayed.
  *
- * If `mapInfoService` in `config.json` points to a `qwc-mapinfo-service`, additional
+ * If `mapInfoServiceUrl` in `config.json` points to a `qwc-mapinfo-service`, additional
  * custom information according to the `qwc-mapinfo-service` configuration is returned.
  *
  * You can pass additional plugin components to the `MapInfoTooltip` in `appConfig.js`:
@@ -122,7 +122,7 @@ var MapInfoTooltip = /*#__PURE__*/function (_React$Component) {
               elevation: elevation
             });
           })["catch"](function () {});
-          var mapInfoService = ConfigUtils.getConfigProp("mapInfoService");
+          var mapInfoService = ConfigUtils.getConfigProp("mapInfoServiceUrl") || ConfigUtils.getConfigProp("mapInfoService");
           if (mapInfoService) {
             axios.get(mapInfoService, {
               params: {
@@ -284,6 +284,7 @@ _defineProperty(MapInfoTooltip, "propTypes", {
   /** The number of decimal places to display for elevation values. */
   elevationPrecision: PropTypes.number,
   enabled: PropTypes.bool,
+  /** Whether to display WGS84 coordinates in addition to map CRS coordinates. */
   includeWGS84: PropTypes.bool,
   map: PropTypes.object,
   /** Additional plugin components for the map info tooltip. */

package/plugins/NewsPopup.js

@@ -125,7 +125,6 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
     }
   }]);
 }(React.Component);
-_defineProperty(NewsPopup, "availableIn3D", true);
 _defineProperty(NewsPopup, "propTypes", {
   /** URL to the news HTML document to display in the popup. Can contain `{lang}` as a placeholder which will be replaced with the current viewer language.*/
   newsDocument: PropTypes.string,

package/plugins/SensorThingsTool.js

@@ -712,7 +712,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
               }, datastream.description);
             })), /*#__PURE__*/React.createElement("button", {
               className: "button",
-              onClick: _this.addDatastream,
+              onClick: _this.addSelectedDatastream,
               title: LocaleUtils.tr("sensorthingstool.addDatastream")
             }, /*#__PURE__*/React.createElement(Icon, {
               icon: "plus"
@@ -1079,8 +1079,13 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         };
       });
     });
-    _defineProperty(_this, "addDatastream", function () {
+    _defineProperty(_this, "addSelectedDatastream", function () {
       if (_this.state.currentDatastreamId !== undefined) {
+        _this.addDatastream(_this.state.currentDatastreamId);
+      }
+    });
+    _defineProperty(_this, "addDatastream", function (datastreamId) {
+      if (datastreamId !== undefined) {
         _this.setState(function (state) {
           // find next unused color
           var availableColors = new Set(state.graphColors.map(function (color, idx) {
@@ -1104,7 +1109,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
           return {
             graph: _objectSpread(_objectSpread({}, state.graph), {}, {
               datastreams: [].concat(_toConsumableArray(state.graph.datastreams), [{
-                id: state.currentDatastreamId,
+                id: datastreamId,
                 observations: null,
                 loading: false,
                 colorIdx: colorIdx,
@@ -1116,7 +1121,7 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
               }])
             }),
             datastreamOptions: [].concat(_toConsumableArray(state.datastreamOptions), [{
-              datastreamId: state.currentDatastreamId,
+              datastreamId: datastreamId,
               showOnSecondYAxis: false,
               showArithmeticMean: false,
               percentilesInput: "",
@@ -1606,10 +1611,32 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
       if (!_this.state.showDatastreamsFilterWindow || _this.state.currentSensorLocation === null) {
         return null;
       }
+
+      // group datastreams by thing
+      var groupedDatastreams = {};
+      var filteredThings = [];
+      _this.state.currentSensorLocation.filteredDatastreams.forEach(function (datastreamId) {
+        var datastreamInfo = _this.state.datastreams[datastreamId];
+        var thingId = datastreamInfo.thing.id;
+        if (groupedDatastreams[thingId] === undefined) {
+          groupedDatastreams[thingId] = {
+            thing: datastreamInfo.thing,
+            datastreamIds: []
+          };
+          filteredThings.push(datastreamInfo.thing);
+        }
+        groupedDatastreams[thingId].datastreamIds.push(datastreamId);
+      });
+      // order thing IDs by name and description
+      var thingIds = filteredThings.sort(function (a, b) {
+        return a.name.localeCompare(b.name) || a.description.localeCompare(b.description);
+      }).map(function (thing) {
+        return thing.id;
+      });
       return /*#__PURE__*/React.createElement(ResizeableWindow, {
-        fitHeight: "true",
         icon: "filter",
-        initialWidth: 500,
+        initialHeight: 600,
+        initialWidth: 800,
         initialX: _this.props.windowSize.width + 10,
         initialY: 0,
         key: "SensorThingsDatastreamsFilterWindow",
@@ -1624,7 +1651,9 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
         role: "body"
       }, /*#__PURE__*/React.createElement("table", {
         className: "sensor-things-datastreams-filter"
-      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("sensorthingstool.datastreamsFilter.thing"), ":\xA0"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {
+        className: "sensor-things-datastreams-filter-location"
+      }, LocaleUtils.tr("sensorthingstool.datastreamsFilter.location"), ":\xA0"), /*#__PURE__*/React.createElement("td", null, _this.state.currentSensorLocation.name, ": ", _this.state.currentSensorLocation.description)), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("sensorthingstool.datastreamsFilter.thing"), ":\xA0"), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: function onChange(ev) {
           return _this.updateDatastreamsFilter('thingId', ev.target.value);
         },
@@ -1660,7 +1689,41 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
           key: "sensor-things-select-filter-observed-property-" + observedProperty.id,
           value: observedProperty.id
         }, observedProperty.optionText);
-      }))))))));
+      })))))), /*#__PURE__*/React.createElement("div", {
+        className: "sensor-things-datastreams-filter-table-wrapper"
+      }, /*#__PURE__*/React.createElement("table", {
+        className: "sensor-things-datastreams-filter-table"
+      }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null, "ID"), /*#__PURE__*/React.createElement("th", null, LocaleUtils.tr("sensorthingstool.datastreamsFilter.datastream")), /*#__PURE__*/React.createElement("th", null, LocaleUtils.tr("sensorthingstool.datastreamTable.fullPeriod")), /*#__PURE__*/React.createElement("th", null, LocaleUtils.tr("sensorthingstool.datastreamInfo.observedProperty")), /*#__PURE__*/React.createElement("th", null, LocaleUtils.tr("sensorthingstool.datastreamInfo.unit")), /*#__PURE__*/React.createElement("th", null, LocaleUtils.tr("sensorthingstool.datastreamInfo.sensor")), /*#__PURE__*/React.createElement("th", null))), /*#__PURE__*/React.createElement("tbody", null, thingIds.map(function (thingId) {
+        var thing = groupedDatastreams[thingId].thing;
+        var datastreamIds = groupedDatastreams[thingId].datastreamIds;
+        var thingRows = [/*#__PURE__*/React.createElement("tr", {
+          className: "sensor-things-datastreams-filter-table-thing",
+          key: "sensor-things-datastream-filter-list-thing-" + thingId
+        }, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("sensorthingstool.datastreamInfo.thing"), ":"), /*#__PURE__*/React.createElement("td", {
+          colSpan: "6"
+        }, /*#__PURE__*/React.createElement("div", null, thing.name), /*#__PURE__*/React.createElement("div", null, thing.description)))];
+        var datastreamRows = datastreamIds.map(function (datastreamId, idx) {
+          var datastreamInfo = _this.state.datastreams[datastreamId];
+          var periodInfo = "-";
+          if (datastreamInfo.period.begin !== null && datastreamInfo.period.end !== null) {
+            var fullPeriodBegin = dayjs(datastreamInfo.period.begin).format(_this.props.timeFormats.tooltip);
+            var fullPeriodEnd = dayjs(datastreamInfo.period.end).format(_this.props.timeFormats.tooltip);
+            periodInfo = /*#__PURE__*/React.createElement("div", null, fullPeriodBegin, /*#__PURE__*/React.createElement("br", null), "- ", fullPeriodEnd);
+          }
+          return /*#__PURE__*/React.createElement("tr", {
+            key: "sensor-things-datastream-filter-list-" + idx
+          }, /*#__PURE__*/React.createElement("td", null, datastreamInfo.id), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", null, datastreamInfo.name), /*#__PURE__*/React.createElement("div", null, datastreamInfo.description)), /*#__PURE__*/React.createElement("td", null, periodInfo), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", null, datastreamInfo.observedProperty.name), /*#__PURE__*/React.createElement("div", null, datastreamInfo.observedProperty.description)), /*#__PURE__*/React.createElement("td", null, datastreamInfo.unitOfMeasurement.symbol), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("div", null, datastreamInfo.sensor.name), /*#__PURE__*/React.createElement("div", null, datastreamInfo.sensor.description)), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("button", {
+            className: "button",
+            onClick: function onClick() {
+              return _this.addDatastream(datastreamId);
+            },
+            title: LocaleUtils.tr("sensorthingstool.addDatastream")
+          }, /*#__PURE__*/React.createElement(Icon, {
+            icon: "plus"
+          }))));
+        });
+        return thingRows.concat(datastreamRows);
+      }))))));
     });
     _defineProperty(_this, "toggleDatastreamInfoWindow", function (datastreamIndex) {
       var datastreamInfoWindow = null;

package/plugins/map/MeasurementSupport.js

@@ -170,6 +170,19 @@ var MeasurementSupport = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
+    _defineProperty(_this, "createPoint", function (coord) {
+      _this.currentFeature = new ol.Feature({
+        geometry: new ol.geom.Point(coord)
+      });
+      _this.currentFeature.setId(uuidv4());
+      _this.currentFeature.set('measureMode', _this.props.measurement.mode);
+      _this.currentFeature.setStyle(_this.featureStyleFunction);
+      _this.currentFeature.on('change', function (evt) {
+        return _this.updateMeasurementResults(evt.target);
+      });
+      _this.measureLayer.getSource().addFeature(_this.currentFeature);
+      _this.enterEditMode(_this.currentFeature);
+    });
     _defineProperty(_this, "enterEditMode", function (feature) {
       _this.currentFeature = feature;
       _this.updateMeasurementResults(_this.currentFeature, false);
@@ -209,15 +222,14 @@ var MeasurementSupport = /*#__PURE__*/function (_React$Component) {
           }
         });
         if (features.length === 0) {
-          _this.leaveEditMode();
-          // Immediately start new drawing
           var clickCoord = MapUtils.getHook(MapUtils.GET_SNAPPED_COORDINATES_FROM_PIXEL_HOOK)(evt.pixel);
-          _this.drawInteraction.appendCoordinates([clickCoord]);
           if (_this.props.measurement.mode === 'Point') {
-            // Ughh... Apparently we need to wait 250ms for the 'singleclick' event processing to finish to avoid pick interactions picking up the current event
-            setTimeout(function () {
-              return _this.drawInteraction.finishDrawing();
-            }, 300);
+            // Special handling for Point: create point feature directly instead of starting a draw interaction
+            _this.createPoint(clickCoord);
+          } else {
+            _this.leaveEditMode();
+            // Immediately start new drawing
+            _this.drawInteraction.appendCoordinates([clickCoord]);
           }
         } else {
           _this.enterEditMode(features[0]);

package/plugins/style/LayerTree.css

@@ -234,6 +234,11 @@ img.layertree-item-legend-tooltip {
     color: red;
 }
 
+
+#LayerTree span.layertree-item-metadata {
+    width: 1.75em;
+}
+
 #LayerTree span.layertree-item-menubutton {
     text-align: center;
     width: 1.75em;

package/plugins/style/SensorThingsTool.css

@@ -177,8 +177,34 @@ table.sensor-things-datastreams-filter td select {
     width: 100%;
     text-overflow: ellipsis;
 }
+table.sensor-things-datastreams-filter td.sensor-things-datastreams-filter-location {
+    height: 2em;
+}
+table.sensor-things-datastreams-filter-table {
+    width: 100%;
+    margin-top: 1em;
+    font-size: 85%;
+}
+table.sensor-things-datastreams-filter-table td {
+    vertical-align: top;
+    padding-top: 0.25em;
+    padding-bottom: 0.25em;
+    border-bottom: 1px solid var(--border-color);
+}
+table.sensor-things-datastreams-filter-table td div:nth-child(2) {
+    color: var(--text-color-disabled);
+}
+table.sensor-things-datastreams-filter-table td:last-child {
+    vertical-align: middle;
+}
+table.sensor-things-datastreams-filter-table tr.sensor-things-datastreams-filter-table-thing {
+    background-color: var(--button-bg-color);
+}
+table.sensor-things-datastreams-filter-table tr.sensor-things-datastreams-filter-table-thing td:nth-child(1) {
+    font-weight: bold;
+}
 
-div.sensor-things-datastream-observations-table-wrapper {
+div.sensor-things-datastream-observations-table-wrapper, div.sensor-things-datastreams-filter-table-wrapper {
     overflow: auto;
     margin-bottom: 0.25em;
 }

package/scripts/gen-plugin-docs.js

@@ -81,6 +81,8 @@ function parsePropType(type) {
     return "{".concat(type.value.map(function (x) {
       return x.value;
     }).join(", "), "}");
+  } else if (type.name === 'objectOf') {
+    return '<key>: ' + parsePropType(type.value);
   } else {
     return type.name;
   }

package/static/translations/bg-BG.json

@@ -336,6 +336,7 @@
       "radius": "Радиус"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Каталог на слоевете"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/ca-ES.json

@@ -336,6 +336,7 @@
       "radius": "Radi"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Titol"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/cs-CZ.json

@@ -336,6 +336,7 @@
       "radius": "Velikost okruhu"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Katalog vrstev"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/de-CH.json

@@ -336,6 +336,7 @@
       "radius": "Radius"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Ebenenkatalog"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": "Wert"
       },
       "datastreamsFilter": {
+        "datastream": "Datastream",
+        "location": "Location",
         "observedProperty": "Observed Property",
         "sensor": "Sensor",
         "thing": "Thing",

package/static/translations/de-DE.json

@@ -336,6 +336,7 @@
       "radius": "Radius"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Ebenenkatalog"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": "Wert"
       },
       "datastreamsFilter": {
+        "datastream": "Datastream",
+        "location": "Location",
         "observedProperty": "Observed Property",
         "sensor": "Sensor",
         "thing": "Thing",

package/static/translations/en-US.json

@@ -336,6 +336,7 @@
       "radius": "Radius"
     },
     "layercatalog": {
+      "openlink": "Info link",
       "windowtitle": "Layer catalog"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": "Value"
       },
       "datastreamsFilter": {
+        "datastream": "Datastream",
+        "location": "Location",
         "observedProperty": "Observed Property",
         "sensor": "Sensor",
         "thing": "Thing",

package/static/translations/es-ES.json

@@ -336,6 +336,7 @@
       "radius": "Radio"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Catálogo de capas"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/fi-FI.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/fr-FR.json

@@ -336,6 +336,7 @@
       "radius": "Rayon"
     },
     "layercatalog": {
+      "openlink": "Lien d'information",
       "windowtitle": "Catalogue de couches"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/hu-HU.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/it-IT.json

@@ -336,6 +336,7 @@
       "radius": "Raggio"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Catalogo livelli"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/ja-JP.json

@@ -336,6 +336,7 @@
       "radius": "半径"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "レイヤ・カタログ"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/nl-NL.json

@@ -336,6 +336,7 @@
       "radius": "Straal"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Lagencatalogus"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/no-NO.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/pl-PL.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/pt-BR.json

@@ -336,6 +336,7 @@
       "radius": "Raio"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Titulo da janela"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/pt-PT.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Catálogo de Camadas"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/ro-RO.json

@@ -336,6 +336,7 @@
       "radius": "Raza"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Catalog straturi"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/ru-RU.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/sv-SE.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/tr-TR.json

@@ -336,6 +336,7 @@
       "radius": "Yarıçap"
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": "Katman kataloğu"
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/static/translations/tsconfig.json

@@ -321,6 +321,7 @@
     "infotool.clickhelpPolygon",
     "infotool.clickhelpRadius",
     "infotool.radius",
+    "layercatalog.openlink",
     "layercatalog.windowtitle",
     "layerinfo.abstract",
     "layerinfo.attribution",
@@ -580,6 +581,8 @@
     "sensorthingstool.datastreamTable.title",
     "sensorthingstool.datastreamTable.unit",
     "sensorthingstool.datastreamTable.value",
+    "sensorthingstool.datastreamsFilter.datastream",
+    "sensorthingstool.datastreamsFilter.location",
     "sensorthingstool.datastreamsFilter.observedProperty",
     "sensorthingstool.datastreamsFilter.sensor",
     "sensorthingstool.datastreamsFilter.thing",

package/static/translations/uk-UA.json

@@ -336,6 +336,7 @@
       "radius": ""
     },
     "layercatalog": {
+      "openlink": "",
       "windowtitle": ""
     },
     "layerinfo": {
@@ -672,6 +673,8 @@
         "value": ""
       },
       "datastreamsFilter": {
+        "datastream": "",
+        "location": "",
         "observedProperty": "",
         "sensor": "",
         "thing": "",

package/utils/ThemeUtils.js

@@ -80,7 +80,8 @@ var ThemeUtils = {
             (externalLayers[key] = externalLayers[key] || []).push(params);
             delete bgLayer.resource;
           } else if (bgLayer.type === "wms") {
-            bgLayer.version = bgLayer.params.VERSION || bgLayer.version || themes.defaultWMSVersion || "1.3.0";
+            var _bgLayer$params;
+            bgLayer.version = ((_bgLayer$params = bgLayer.params) === null || _bgLayer$params === void 0 ? void 0 : _bgLayer$params.VERSION) || bgLayer.version || themes.defaultWMSVersion || "1.3.0";
           } else if (bgLayer.type === "group") {
             bgLayer.items = bgLayer.items.map(function (item) {
               if (item.ref) {