qwc2 2026.4.3 → 2026.4.20

package/actions/theme.js

@@ -52,7 +52,7 @@ export function setThemeLayersList(theme) {
     themelist: theme
   };
 }
-export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme) {
+export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask) {
   var _theme$config;
   // Create layer
   var themeLayer = ThemeUtils.createThemeLayer(theme, themes);
@@ -148,10 +148,10 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
     type: SWITCHING_THEME,
     switching: false
   });
-  var task = (_theme$config = theme.config) === null || _theme$config === void 0 ? void 0 : _theme$config.startupTask;
+  var task = initialTask || (theme === null || theme === void 0 || (_theme$config = theme.config) === null || _theme$config === void 0 ? void 0 : _theme$config.startupTask) || (initialTheme ? ConfigUtils.getConfigProp("startupTask") : null);
   if (task) {
     var mapClickAction = ConfigUtils.getPluginConfig(task.key).mapClickAction;
-    dispatch(setCurrentTask(task.key, task.mode, mapClickAction));
+    dispatch(setCurrentTask(task.key, task.mode, mapClickAction, task.data));
   }
 }
 export function setCurrentTheme(theme, themes) {
@@ -162,6 +162,7 @@ export function setCurrentTheme(theme, themes) {
   var permalinkLayers = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
   var themeLayerRestorer = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
   var externalLayerRestorer = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : null;
+  var initialTask = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : null;
   return function (dispatch, getState) {
     var _getState$layers, _ref, _theme$mapTips;
     var curLayers = ((_getState$layers = getState().layers) === null || _getState$layers === void 0 ? void 0 : _getState$layers.flat) || [];
@@ -318,13 +319,13 @@ export function setCurrentTheme(theme, themes) {
             dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", diff.join(", ")), NotificationType.WARN, true));
           }
         }
-        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme);
+        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask);
       });
     } else {
       if (!isEmpty(missingThemeLayers)) {
         dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", Object.keys(missingThemeLayers).join(", ")), NotificationType.WARN, true));
       }
-      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme);
+      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask);
     }
   };
 }

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/IdentifyViewer.js

@@ -1151,6 +1151,11 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         }));
       }
       text = "" + text; // Ensure text is a string
+      for (var _i = 0, _Object$values = Object.values(((_window$qwc3 = window.qwc2) === null || _window$qwc3 === void 0 ? void 0 : _window$qwc3.__attributeFormatters) || {}); _i < _Object$values.length; _i++) {
+        var _window$qwc3;
+        var formatter = _Object$values[_i];
+        text = formatter(attrName, text, layer, result);
+      }
       text = _this.props.attributeTransform(attrName, text, layer, result);
       text = MiscUtils.addLinkAnchors(text);
       return _this.parsedContent(text);

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/StandardApp.js

@@ -92,7 +92,7 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
           lang: _this.props.locale
         }
       }).then(function (response) {
-        var _this$props$appConfig, _this$props$appConfig2, _theme;
+        var _this$props$appConfig, _this$props$appConfig2;
         var themes = response.data.themes || {};
         (_this$props$appConfig = (_this$props$appConfig2 = _this.props.appConfig).themePreprocessor) === null || _this$props$appConfig === void 0 || _this$props$appConfig.call(_this$props$appConfig2, themes);
         _this.props.themesLoaded(themes);
@@ -162,15 +162,11 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
           if (layerParams && ConfigUtils.getConfigProp("urlReverseLayerOrder")) {
             layerParams.reverse();
           }
-          _this.props.setCurrentTheme(theme, themes, false, initialExtent, layerParams, (_params$bl = params.bl) !== null && _params$bl !== void 0 ? _params$bl : null, state.layers, _this.props.appConfig.themeLayerRestorer, _this.props.appConfig.externalLayerRestorer);
+          var initialTaskParam = params.task ? JSON.parse(decodeURIComponent(params.task)) : null;
+          _this.props.setCurrentTheme(theme, themes, false, initialExtent, layerParams, (_params$bl = params.bl) !== null && _params$bl !== void 0 ? _params$bl : null, state.layers, _this.props.appConfig.themeLayerRestorer, _this.props.appConfig.externalLayerRestorer, initialTaskParam);
         } else if (!ConfigUtils.havePlugin("Portal")) {
           _this.props.showNotification("missingdefaulttheme", LocaleUtils.tr("app.missingdefaulttheme", params.t), NotificationType.WARN, true);
         }
-        var task = ConfigUtils.getConfigProp("startupTask");
-        if (task && !((_theme = theme) !== null && _theme !== void 0 && (_theme = _theme.config) !== null && _theme !== void 0 && _theme.startupTask)) {
-          var mapClickAction = ConfigUtils.getPluginConfig(task.key).mapClickAction;
-          _this.props.setCurrentTask(task.key, task.mode, mapClickAction);
-        }
       });
     });
     _this.themesLoaded = false;

package/components/map3d/layers/MVTLayer3D.js

@@ -16,8 +16,7 @@ export default {
       var style = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var source = new VectorTileSource({
         url: url,
-        style: style,
-        backgroundColor: "white"
+        style: style
       });
       return new ColorLayer({
         name: options.name,

package/components/style/PluginsContainer.css

@@ -21,7 +21,7 @@ div.app-infos-container {
     flex-wrap: wrap-reverse;
     z-index: 2;
     overflow: hidden;
-    padding: 1em 1em 2.5em 1em;
+    padding: .5em .5em 2.5em .5em;
     row-gap: 0.25em;
 }
 
@@ -58,13 +58,9 @@ div.app-info {
     color: var(--panel-text-color);
     background-color: var(--panel-bg-color);
     box-shadow: 0 0 4px rgba(136, 136, 136, 0.5);
-    padding: 0.25em 0em 0.125em 0em;
+    padding: 0.25em;
     display: flex;
-}
-
-div.app-info > span {
-    flex: 0 0 auto;
-    padding: 0 0.25em;
+    align-items: center;
 }
 
 

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.03",
+    "version": "2026.04.20",
     "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.1",
         "@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/API.js

@@ -394,6 +394,26 @@ var API = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "removeIdentifyAttributeCalculator", function (name) {
       delete window.qwc2.__attributeCalculators[name];
     });
+    /**
+     * Add custom attribute formatter
+     * (i.e. computed attributes which are added to GetFeatureInfo responses).
+     *
+     * * `name`: An identifier
+     * * `fmtFunc`: The formatter function with signature `function(name, value, layer, feature)`
+     *
+     * The `fmtFunc` should return a string (which may also be a HTML fragment).
+     */
+    _defineProperty(_this, "addIdentifyAttributeFormatter", function (name, fmtFunc) {
+      window.qwc2.__attributeFormatters[name] = fmtFunc;
+    });
+    /**
+     * Remove custom identify attribute formatter
+     *
+     * * `name`: The identifier
+     */
+    _defineProperty(_this, "removeIdentifyAttributeFormatter", function (name) {
+      delete window.qwc2.__attributeFormatters[name];
+    });
     /**
      * Add custom identify exporter
      *
@@ -521,6 +541,7 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.qwc2 = {
         __customPlugins: {},
         __attributeCalculators: {},
+        __attributeFormatters: {},
         __identifyExportes: {}
       };
       // Auto-binded functions
@@ -538,6 +559,8 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.qwc2.removeIdentifyAttributeCalculator = this.removeIdentifyAttributeCalculator;
       window.qwc2.addIdentifyExporter = this.addIdentifyExporter;
       window.qwc2.removeIdentifyExporter = this.removeIdentifyExporter;
+      window.qwc2.addIdentifyAttributeFormatter = this.addIdentifyAttributeFormatter;
+      window.qwc2.removeIdentifyAttributeFormatter = this.removeIdentifyAttributeFormatter;
       window.qwc2.addExternalLayer = this.addExternalLayer;
       window.qwc2.drawScratch = this.drawScratch;
       window.qwc2.drawGeometry = this.drawGeometry;

package/plugins/Editing.js

@@ -641,6 +641,17 @@ var Editing = /*#__PURE__*/function (_React$Component) {
             selectedLayer: null
           });
         }
+      } else if (this.props.taskData && this.props.taskData !== prevProps.taskData) {
+        if (this.props.taskData.feature) {
+          var _this$props$taskData$ = this.props.taskData.layer.split("#"),
+            _this$props$taskData$2 = _slicedToArray(_this$props$taskData$, 2),
+            _wmsName = _this$props$taskData$2[0],
+            _layerName = _this$props$taskData$2[1];
+          var editConfig = this.props.editConfigs[_wmsName][_layerName];
+          this.props.iface.getFeatureById(editConfig, this.props.taskData.feature, this.props.map.projection, function (feature) {
+            _this2.changeSelectedLayer(_this2.props.taskData.layer, feature || _this2.props.taskData.feature);
+          });
+        } else this.changeSelectedLayer(this.props.taskData.layer);
       }
       // If click point changed and in pick mode with a selected layer, trigger a pick
       var isCurrentContext = this.props.editContext.id === this.props.currentEditContext;
@@ -652,10 +663,10 @@ var Editing = /*#__PURE__*/function (_React$Component) {
           var scale = Math.round(MapUtils.computeForZoom(this.props.map.scales, this.props.map.zoom));
           var _this$state$selectedL3 = this.state.selectedLayer.split("#"),
             _this$state$selectedL4 = _slicedToArray(_this$state$selectedL3, 2),
-            _wmsName = _this$state$selectedL4[0],
-            _layerName = _this$state$selectedL4[1];
-          var editConfig = this.props.editConfigs[_wmsName][_layerName];
-          this.props.iface.getFeature(editConfig, newPoint.coordinate, this.props.map.projection, scale, 96, function (featureCollection) {
+            _wmsName2 = _this$state$selectedL4[0],
+            _layerName2 = _this$state$selectedL4[1];
+          var _editConfig = this.props.editConfigs[_wmsName2][_layerName2];
+          this.props.iface.getFeature(_editConfig, newPoint.coordinate, this.props.map.projection, scale, 96, function (featureCollection) {
             var features = featureCollection ? featureCollection.features : null;
             _this2.setState({
               pickedFeatures: features

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/Print.js

@@ -696,6 +696,22 @@ var Print = /*#__PURE__*/function (_React$Component) {
       formData[mapName + ":STYLES"] = printParams.STYLES;
       formData[mapName + ":FILTER"] = printParams.FILTER;
       formData[mapName + ":FILTER_GEOM"] = printParams.FILTER_GEOM;
+      if (_this.state.layout.map.followPresetName in _this.props.theme.visibilityPresets) {
+        var preset = _this.props.theme.visibilityPresets[_this.state.layout.map.followPresetName];
+        var layers = [];
+        var styles = [];
+        Object.entries(preset).forEach(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 2),
+            layerPath = _ref6[0],
+            style = _ref6[1];
+          if (style) {
+            layers.push(layerPath.split("/").slice(-1)[0]);
+            styles.push(style);
+          }
+        });
+        formData[mapName + ":LAYERS"] = layers.join(",");
+        formData[mapName + ":STYLES"] = styles.join(",");
+      }
 
       // Add highlight params
       var printDpi = parseInt(_this.state.dpi, 10) || 0;
@@ -732,10 +748,10 @@ var Print = /*#__PURE__*/function (_React$Component) {
       // Add dimension values
       _this.props.layers.forEach(function (layer) {
         if (layer.role === LayerRole.THEME) {
-          Object.entries(layer.dimensionValues || {}).forEach(function (_ref5) {
-            var _ref6 = _slicedToArray(_ref5, 2),
-              key = _ref6[0],
-              value = _ref6[1];
+          Object.entries(layer.dimensionValues || {}).forEach(function (_ref7) {
+            var _ref8 = _slicedToArray(_ref7, 2),
+              key = _ref8[0],
+              value = _ref8[1];
             if (value !== undefined) {
               formData[key] = value;
             }
@@ -747,10 +763,10 @@ var Print = /*#__PURE__*/function (_React$Component) {
       var extraOptions = Object.fromEntries((_this.props.theme.extraPrintParameters || "").split("&").filter(Boolean).map(function (entry) {
         return entry.split("=");
       }));
-      Object.entries(extraOptions).forEach(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          key = _ref8[0],
-          value = _ref8[1];
+      Object.entries(extraOptions).forEach(function (_ref9) {
+        var _ref0 = _slicedToArray(_ref9, 2),
+          key = _ref0[0],
+          value = _ref0[1];
         formData[key] = value;
       });
       var pages = [formData];
@@ -784,8 +800,8 @@ var Print = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "translateLayoutName", function (item) {
-      var _ref9, _ref0, _this$props$theme$tra, _this$props$theme$tra2, _this$props$theme$tra3;
-      return (_ref9 = (_ref0 = (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layouts) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[item.title]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : (_this$props$theme$tra3 = _this.props.theme.translations) === null || _this$props$theme$tra3 === void 0 || (_this$props$theme$tra3 = _this$props$theme$tra3.layouts) === null || _this$props$theme$tra3 === void 0 ? void 0 : _this$props$theme$tra3[item.name]) !== null && _ref0 !== void 0 ? _ref0 : item.title) !== null && _ref9 !== void 0 ? _ref9 : item.name;
+      var _ref1, _ref10, _this$props$theme$tra, _this$props$theme$tra2, _this$props$theme$tra3;
+      return (_ref1 = (_ref10 = (_this$props$theme$tra = (_this$props$theme$tra2 = _this.props.theme.translations) === null || _this$props$theme$tra2 === void 0 || (_this$props$theme$tra2 = _this$props$theme$tra2.layouts) === null || _this$props$theme$tra2 === void 0 ? void 0 : _this$props$theme$tra2[item.title]) !== null && _this$props$theme$tra !== void 0 ? _this$props$theme$tra : (_this$props$theme$tra3 = _this.props.theme.translations) === null || _this$props$theme$tra3 === void 0 || (_this$props$theme$tra3 = _this$props$theme$tra3.layouts) === null || _this$props$theme$tra3 === void 0 ? void 0 : _this$props$theme$tra3[item.name]) !== null && _ref10 !== void 0 ? _ref10 : item.title) !== null && _ref1 !== void 0 ? _ref1 : item.name;
     });
     _this.printForm = null;
     _this.state.grid = props.gridInitiallyEnabled;

package/plugins/SensorThingsTool.js

@@ -897,13 +897,13 @@ var SensorThingsTool = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/React.createElement("button", {
         className: "button",
         onClick: _this.zoomIn,
-        title: LocaleUtils.tr("sensorthingstool.zoomIn")
+        title: LocaleUtils.tr("common.zoomin")
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "zoomin"
       })), /*#__PURE__*/React.createElement("button", {
         className: "button",
         onClick: _this.zoomOut,
-        title: LocaleUtils.tr("sensorthingstool.zoomOut")
+        title: LocaleUtils.tr("common.zoomout")
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "zoomout"
       })), /*#__PURE__*/React.createElement("button", {