qwc2 2026.2.24 → 2026.2.27

package/components/AttributeTableWidget.js

@@ -1098,22 +1098,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           sitekey: ConfigUtils.getConfigProp("editServiceCaptchaSiteKey")
         }));
       }
-      return /*#__PURE__*/React.createElement("div", {
-        className: "AttributeTable"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "attribtable-toolbar"
-      }, this.props.showLayerSelection ? /*#__PURE__*/React.createElement("select", {
-        disabled: loading || editing,
-        onChange: function onChange(ev) {
-          return _this2.setState({
-            selectedLayer: ev.target.value
-          });
-        },
-        value: this.state.selectedLayer || ""
-      }, /*#__PURE__*/React.createElement("option", {
-        disabled: true,
-        value: ""
-      }, LocaleUtils.tr("common.selectlayer")), Object.entries(this.props.editConfigs).map(function (_ref3) {
+      var editLayers = Object.entries(this.props.editConfigs).map(function (_ref3) {
         var _ref4 = _slicedToArray(_ref3, 2),
           wmsName = _ref4[0],
           serviceConfigs = _ref4[1];
@@ -1134,12 +1119,34 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
             })) === null || _this2$props$layers$f === void 0 ? void 0 : _this2$props$layers$f.translations;
             layerTitle = (_ref9 = (_translations$layertr = translations === null || translations === void 0 || (_translations$layertr2 = translations.layertree) === null || _translations$layertr2 === void 0 ? void 0 : _translations$layertr2[layerName]) !== null && _translations$layertr !== void 0 ? _translations$layertr : editConfig.layerTitle) !== null && _ref9 !== void 0 ? _ref9 : layerName;
           }
-          var value = wmsName + "#" + layerName;
-          return /*#__PURE__*/React.createElement("option", {
-            key: value,
-            value: value
-          }, layerTitle);
+          return {
+            value: wmsName + "#" + layerName,
+            title: layerTitle
+          };
         });
+      }).flat().filter(Boolean).sort(function (a, b) {
+        return a.title.localeCompare(b.title);
+      });
+      return /*#__PURE__*/React.createElement("div", {
+        className: "AttributeTable"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "attribtable-toolbar"
+      }, this.props.showLayerSelection ? /*#__PURE__*/React.createElement("select", {
+        disabled: loading || editing,
+        onChange: function onChange(ev) {
+          return _this2.setState({
+            selectedLayer: ev.target.value
+          });
+        },
+        value: this.state.selectedLayer || ""
+      }, /*#__PURE__*/React.createElement("option", {
+        disabled: true,
+        value: ""
+      }, LocaleUtils.tr("common.selectlayer")), editLayers.map(function (entry) {
+        return /*#__PURE__*/React.createElement("option", {
+          key: entry.value,
+          value: entry.value
+        }, entry.title);
       })) : null, /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: !this.state.selectedLayer || editing || loading,

package/components/SearchBox.js

@@ -866,7 +866,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "startSearch", function () {
-      var _this$state$filterGeo2;
+      var _ref5, _this$state$filterGeo2;
       var provider = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
       var uniquePlaceResult = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var availableProviders = _this.props.searchProviders;
@@ -893,15 +893,16 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       var searchParams = {
         mapcrs: _this.props.map.projection,
         displaycrs: _this.props.map.displayCrs,
+        extracrs: (_ref5 = _this.props.searchOptions.extraCoordinateSearchCrs === "mousecrs" ? _this.props.theme.additionalMouseCrs : _this.props.searchOptions.extraCoordinateSearchCrs) !== null && _ref5 !== void 0 ? _ref5 : [],
         lang: LocaleUtils.lang(),
         limit: _this.props.searchOptions.resultLimit,
         filterPoly: (_this$state$filterGeo2 = _this.state.filterGeometry) === null || _this$state$filterGeo2 === void 0 || (_this$state$filterGeo2 = _this$state$filterGeo2.coordinates) === null || _this$state$filterGeo2 === void 0 ? void 0 : _this$state$filterGeo2[0],
         filterBBox: _this.state.filterGeometry ? VectorLayerUtils.computeFeatureBBox(_this.state.filterGeometry) : null
       };
-      Object.entries(availableProviders).forEach(function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-          provKey = _ref6[0],
-          prov = _ref6[1];
+      Object.entries(availableProviders).forEach(function (_ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          provKey = _ref7[0],
+          prov = _ref7[1];
         prov.onSearch(searchText, _objectSpread(_objectSpread({
           cfgParams: prov.cfgParams
         }, prov.params), searchParams), function (response) {
@@ -930,10 +931,10 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
               return entry !== provKey;
             });
             if (isEmpty(newPendingSearches) && uniquePlaceResult) {
-              var providersWithResults = Object.entries(searchResults).filter(function (_ref7) {
-                var _ref8 = _slicedToArray(_ref7, 2),
-                  _ = _ref8[0],
-                  providerResults = _ref8[1];
+              var providersWithResults = Object.entries(searchResults).filter(function (_ref8) {
+                var _ref9 = _slicedToArray(_ref8, 2),
+                  _ = _ref9[0],
+                  providerResults = _ref9[1];
                 return providerResults.tot_result_count > 0;
               });
               if (providersWithResults.length === 1 && providersWithResults[0][1].tot_result_count === 1) {
@@ -1076,8 +1077,8 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         }
         // Label first feature
         if (!_this.props.searchOptions.hideResultLabels) {
-          var _ref9, _item$label;
-          var label = ((_ref9 = (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.text) !== null && _ref9 !== void 0 ? _ref9 : '').replace(/<\/?\w+\s*\/?>/g, '');
+          var _ref0, _item$label;
+          var label = ((_ref0 = (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.text) !== null && _ref0 !== void 0 ? _ref0 : '').replace(/<\/?\w+\s*\/?>/g, '');
           features[0].properties = _objectSpread(_objectSpread({}, features[0].properties), {}, {
             label: label
           });
@@ -1097,8 +1098,8 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
           styleName: 'marker'
         };
         if (!_this.props.searchOptions.hideResultLabels) {
-          var _ref0, _item$label2;
-          var _label = ((_ref0 = (_item$label2 = item.label) !== null && _item$label2 !== void 0 ? _item$label2 : item.text) !== null && _ref0 !== void 0 ? _ref0 : '').replace(/<\/?\w+\s*\/?>/g, '');
+          var _ref1, _item$label2;
+          var _label = ((_ref1 = (_item$label2 = item.label) !== null && _item$label2 !== void 0 ? _item$label2 : item.text) !== null && _ref1 !== void 0 ? _ref1 : '').replace(/<\/?\w+\s*\/?>/g, '');
           marker.properties = {
             label: _label
           };
@@ -1266,6 +1267,7 @@ _defineProperty(SearchBox, "propTypes", {
   searchOptions: PropTypes.shape({
     allowAddLayerAsGroup: PropTypes.bool,
     allowSearchFilters: PropTypes.bool,
+    extraCoordinateSearchCrs: PropTypes.oneOfType([PropTypes.array, PropTypes.string]),
     focusOnStartup: PropTypes.bool,
     hideResultLabels: PropTypes.bool,
     highlightStyle: PropTypes.object,

package/components/map3d/Map3D.js

@@ -170,7 +170,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var _this2$state$sceneCon;
       var currentBaseLayer = ((_this2$state$sceneCon = _this2.state.sceneContext.baseLayers.find(function (l) {
         return l.visibility === true;
-      })) === null || _this2$state$sceneCon === void 0 ? void 0 : _this2$state$sceneCon.name) || "";
+      })) === null || _this2$state$sceneCon === void 0 ? void 0 : _this2$state$sceneCon.name) || null;
       if (visibility && layer.name === currentBaseLayer) {
         // Nothing changed
         return;
@@ -594,7 +594,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
       // Ensure labels are removed
       object.traverse(function (c) {
-        if (c.isCSS2DObject) {
+        if (c.isCSS2DObject && c.element.parentNode) {
           c.element.parentNode.removeChild(c.element);
         }
       });
@@ -645,6 +645,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     });
     _defineProperty(_this2, "applySceneObjectState", function (objectId, options, prevOptions, objectTree) {
       var object = _this2.objectMap[objectId];
+      if (!object) {
+        return;
+      }
       var changed = false;
       if (options.visibility !== prevOptions.visibility || options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
         var _objectTree$options$p;
@@ -935,7 +938,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               visibility: (_entry$visibility3 = entry.visibility) !== null && _entry$visibility3 !== void 0 ? _entry$visibility3 : true,
               opacity: 255
             };
-            _this2.importObject3D(entry, entry.name, false, {}, false, function () {
+            _this2.importObject3D(MiscUtils.resolveAssetsPath(entry.url), entry.name, false, {}, false, function () {
               _this2.applySceneObjectState(entry.name, objectTree[entry.name], {}, objectTree);
             });
             nodeIds.push(entry.name);
@@ -1300,10 +1303,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         }
       });
       _this2.state.sceneContext.restoreView(data);
-      var bl3d = (_data$baseLayer = data.baseLayer) !== null && _data$baseLayer !== void 0 ? _data$baseLayer : "";
-      _this2.setBaseLayer({
-        name: bl3d
-      }, bl3d !== "null");
+      if (((_data$baseLayer = data.baseLayer) !== null && _data$baseLayer !== void 0 ? _data$baseLayer : null) !== null) {
+        var _data$baseLayer2;
+        var bl3d = (_data$baseLayer2 = data.baseLayer) !== null && _data$baseLayer2 !== void 0 ? _data$baseLayer2 : "";
+        _this2.setBaseLayer({
+          name: bl3d
+        }, bl3d !== "null");
+      }
       _this2.state.sceneContext.scene.notifyChange();
     });
     _this2.container = null;
@@ -1383,11 +1389,16 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         this.setState(function (state) {
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
-              collisionObjects: Object.entries(state.sceneContext.objectTree).reduce(function (res, entry) {
+              collisionObjects: Object.entries(state.sceneContext.objectTree).reduce(function (res, _ref12) {
+                var _ref13 = _slicedToArray(_ref12, 2),
+                  objectid = _ref13[0],
+                  entry = _ref13[1];
                 if (entry.visibility && entry.opacity > 0) {
-                  var _obj$tiles$group, _obj$tiles;
                   var obj = _this3.objectMap[entry.objectId];
-                  res.push((_obj$tiles$group = (_obj$tiles = obj.tiles) === null || _obj$tiles === void 0 ? void 0 : _obj$tiles.group) !== null && _obj$tiles$group !== void 0 ? _obj$tiles$group : obj);
+                  if (obj) {
+                    var _obj$tiles$group, _obj$tiles;
+                    res.push((_obj$tiles$group = (_obj$tiles = obj.tiles) === null || _obj$tiles === void 0 ? void 0 : _obj$tiles.group) !== null && _obj$tiles$group !== void 0 ? _obj$tiles$group : obj);
+                  }
                 }
                 return res;
               }, [])
@@ -1428,10 +1439,10 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         sceneContext: this.state.sceneContext
       }), /*#__PURE__*/React.createElement(ViewSwitcher, {
         position: 1
-      }), Object.entries(this.props.plugins3d).map(function (_ref12) {
-        var _ref13 = _slicedToArray(_ref12, 2),
-          name = _ref13[0],
-          Component = _ref13[1];
+      }), Object.entries(this.props.plugins3d).map(function (_ref14) {
+        var _ref15 = _slicedToArray(_ref14, 2),
+          name = _ref15[0],
+          Component = _ref15[1];
         return /*#__PURE__*/React.createElement(Suspense, {
           key: name
         }, /*#__PURE__*/React.createElement(Component, _extends({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2026.02.24",
+    "version": "2026.02.27",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/API.js

@@ -154,6 +154,16 @@ var actionFunctions = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_o
  *   "params": [[2684764, 1247841], 18, "EPSG:2056"]
  * }, "http://<qwc_hostname>:<port>")
  * ```
+ * You can also post multiple calls at once as follows:
+ * ```
+ * qwcframe.contentWindow.postMessage([{
+ *   "method": "zoomToPoint",
+ *   "params": [[2684764, 1247841], 18, "EPSG:2056"]
+ * }, {
+ *   "method": "addMarker",
+ *   "params": ["mymarker", [2684764, 1247841], "Hello world", "EPSG:2056"]
+ * }], "http://<qwc_hostname>:<port>")
+ * ```
  * If you call a method which returns a value, pass a `requestId` and listen to response messages:
  *
  * ```
@@ -259,21 +269,17 @@ var actionFunctions = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_o
  * In addition, the following methods are available on `window.qwc2`:
  */
 var API = /*#__PURE__*/function (_React$Component) {
-  function API() {
+  function API(props) {
     var _this;
     _classCallCheck(this, API);
-    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
-      _args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, API, [].concat(_args));
+    _this = _callSuper(this, API, [props]);
     _defineProperty(_this, "handleMessage", function (ev) {
-      var _ev$data;
       if (!_this.props.allowedMessageOrigins.includes(ev.origin)) {
         /* eslint-disable-next-line */
         console.warn("Discarding message from not-allowed origin " + ev.origin);
         return;
       }
-      var allowedMemberFunctions = ["addExternalLayer", "getState"];
+      var allowedMemberFunctions = ["addExternalLayer", "getState", "drawGeometry", "onMapClick"];
       if (ev.data === "help") {
         var signatures = Object.fromEntries(Object.entries(actionFunctions).map(function (_ref3) {
           var _val$toString$match$, _val$toString$match;
@@ -289,28 +295,57 @@ var API = /*#__PURE__*/function (_React$Component) {
         /* eslint-disable-next-line */
         console.log(signatures);
       }
-      if ((_ev$data = ev.data) !== null && _ev$data !== void 0 && _ev$data.method) {
-        var _ev$data$params;
-        var func = ev.data.method;
-        var args = (_ev$data$params = ev.data.params) !== null && _ev$data$params !== void 0 ? _ev$data$params : [];
-        var result = null;
-        if (func in actionFunctions) {
-          var _this$props;
-          result = (_this$props = _this.props)[func].apply(_this$props, _toConsumableArray(args));
-        } else if (allowedMemberFunctions.includes(func)) {
-          var _this2;
-          result = (_this2 = _this)[func].apply(_this2, _toConsumableArray(args));
-        } else {
-          /* eslint-disable-next-line */
-          console.warn("Unhandeled message: " + JSON.stringify(ev.data));
-        }
-        if (ev.data.requestId) {
-          ev.source.postMessage({
-            requestId: ev.data.requestId,
-            result: result
-          }, ev.origin);
+      var messages = Array.isArray(ev.data) ? ev.data : [ev.data];
+      messages.forEach(function (message) {
+        if (message !== null && message !== void 0 && message.method) {
+          var _message$params;
+          var func = message.method;
+          var args = (_message$params = message.params) !== null && _message$params !== void 0 ? _message$params : [];
+          var result = null;
+          var postResult = true;
+          if (func in actionFunctions) {
+            var _this$props;
+            result = (_this$props = _this.props)[func].apply(_this$props, _toConsumableArray(args));
+          } else if (allowedMemberFunctions.includes(func)) {
+            var _this2;
+            // Inject proper callback function
+            if (func === "drawGeometry") {
+              args.splice(2, 0, function (features, crs) {
+                if (message.requestId) {
+                  ev.source.postMessage({
+                    requestId: message.requestId,
+                    result: {
+                      features: features,
+                      crs: crs
+                    }
+                  }, ev.origin);
+                }
+              });
+              postResult = false;
+            } else if (func === "onMapClick") {
+              args = [function (click) {
+                if (message.requestId) {
+                  ev.source.postMessage({
+                    requestId: message.requestId,
+                    result: click
+                  }, ev.origin);
+                }
+              }];
+              postResult = false;
+            }
+            result = (_this2 = _this)[func].apply(_this2, _toConsumableArray(args));
+          } else {
+            /* eslint-disable-next-line */
+            console.warn("Unhandeled message: " + JSON.stringify(message));
+          }
+          if (postResult && message.requestId) {
+            ev.source.postMessage({
+              requestId: message.requestId,
+              result: result
+            }, ev.origin);
+          }
         }
-      }
+      });
     });
     /**
      * Add custom plugin
@@ -434,7 +469,9 @@ var API = /*#__PURE__*/function (_React$Component) {
       });
     });
     /**
-     *  Draw geometries, and return these as GeoJSON to the calling application.
+     * Draw geometries, and return these as GeoJSON to the calling application.
+     *
+     * *NOTE*: when calling `drawGeometry` through the `postMessage` interface, omit the `callback` parameter. The response will be sent via the response message.
      *
      * * `geomType`: `Point`, `LineString`, `Polygon`, `Circle` or `Box`.
      * * `message`: A descriptive string to display in the tool taskbar.
@@ -465,6 +502,11 @@ var API = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "getState", function () {
       return _this.props.state;
     });
+    /** Fires the callback on the next click on the map. */
+    _defineProperty(_this, "onMapClick", function (callback) {
+      _this.onclickCallbacks.push(callback);
+    });
+    _this.onclickCallbacks = [];
     return _this;
   }
   _inherits(API, _React$Component);
@@ -577,6 +619,17 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.addEventListener("message", this.handleMessage);
       window.dispatchEvent(new Event("QWC2ApiReady"));
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _this3 = this;
+      if (this.props.click !== prevProps.click && this.onclickCallbacks.length > 0) {
+        this.onclickCallbacks.forEach(function (cb) {
+          return cb(_objectSpread({}, _this3.props.click));
+        });
+        this.onclickCallbacks = [];
+      }
+    }
   }, {
     key: "render",
     value: function render() {
@@ -588,6 +641,7 @@ _defineProperty(API, "propTypes", {
   addLayer: PropTypes.func,
   /* List of origins which are allowed to post messages via `qwcIframe.postMessage`. */
   allowedMessageOrigins: PropTypes.arrayOf(PropTypes.string),
+  click: PropTypes.object,
   mapCrs: PropTypes.string,
   registerCustomPlugin: PropTypes.func,
   setCurrentTask: PropTypes.func,
@@ -599,6 +653,9 @@ _defineProperty(API, "defaultProps", {
 });
 export default connect(function (state) {
   return {
+    click: state.map.click || {
+      modifiers: {}
+    },
     mapCrs: state.map.projection,
     state: state
   };

package/plugins/Editing.js

@@ -245,21 +245,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
           translations: translations
         });
       }
-      return /*#__PURE__*/React.createElement("div", {
-        className: "editing-body"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "editing-layer-selection"
-      }, /*#__PURE__*/React.createElement("select", {
-        className: "combo editing-layer-select",
-        disabled: _this.props.editContext.changed === true || _this.props.editContext.id !== _this.props.currentEditContext,
-        onChange: function onChange(ev) {
-          return _this.changeSelectedLayer(ev.target.value);
-        },
-        value: _this.state.selectedLayer || ""
-      }, /*#__PURE__*/React.createElement("option", {
-        disabled: true,
-        value: ""
-      }, LocaleUtils.tr("common.selectlayer")), Object.entries(_this.props.editConfigs).map(function (_ref) {
+      var editLayers = Object.entries(_this.props.editConfigs).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           mapName = _ref2[0],
           serviceConfigs = _ref2[1];
@@ -278,12 +264,33 @@ var Editing = /*#__PURE__*/function (_React$Component) {
             return null;
           }
           var layerTitle = (_ref5 = (_ref6 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : edConfig.layerTitle) !== null && _ref6 !== void 0 ? _ref6 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref5 !== void 0 ? _ref5 : layerName;
-          var value = mapName + "#" + layerName;
-          return /*#__PURE__*/React.createElement("option", {
-            key: value,
-            value: value
-          }, layerTitle);
+          return {
+            value: mapName + "#" + layerName,
+            title: layerTitle
+          };
         });
+      }).flat().filter(Boolean).sort(function (a, b) {
+        return a.title.localeCompare(b.title);
+      });
+      return /*#__PURE__*/React.createElement("div", {
+        className: "editing-body"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "editing-layer-selection"
+      }, /*#__PURE__*/React.createElement("select", {
+        className: "combo editing-layer-select",
+        disabled: _this.props.editContext.changed === true || _this.props.editContext.id !== _this.props.currentEditContext,
+        onChange: function onChange(ev) {
+          return _this.changeSelectedLayer(ev.target.value);
+        },
+        value: _this.state.selectedLayer || ""
+      }, /*#__PURE__*/React.createElement("option", {
+        disabled: true,
+        value: ""
+      }, LocaleUtils.tr("common.selectlayer")), editLayers.map(function (entry) {
+        return /*#__PURE__*/React.createElement("option", {
+          key: entry.value,
+          value: entry.value
+        }, entry.title);
       }))), /*#__PURE__*/React.createElement(ButtonBar, {
         active: _this.state.drawPick ? "Draw" : _this.props.editContext.action,
         buttons: actionButtons,

package/plugins/FeatureForm.js

@@ -249,16 +249,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
               translations: translations
             });
           }
-          body = /*#__PURE__*/React.createElement("div", {
-            className: "feature-query-body"
-          }, Object.keys(this.state.pickedFeatures).length > 1 ? /*#__PURE__*/React.createElement("div", {
-            className: "feature-query-selection"
-          }, /*#__PURE__*/React.createElement("select", {
-            onChange: function onChange(ev) {
-              return _this2.setSelectedFeature(ev.target.value);
-            },
-            value: this.state.selectedFeature
-          }, Object.entries(this.state.pickedFeatures).map(function (_ref7) {
+          var results = Object.entries(this.state.pickedFeatures).map(function (_ref7) {
             var _ref9, _ref0, _match$layer$translat, _match$layer$translat2, _match$sublayer;
             var _ref8 = _slicedToArray(_ref7, 2),
               id = _ref8[0],
@@ -272,10 +263,27 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
             var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', mapName, 'name', layerName);
             var layerTitle = (_ref9 = (_ref0 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref0 !== void 0 ? _ref0 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref9 !== void 0 ? _ref9 : layerName;
             var featureName = editConfig.displayField ? feature.properties[editConfig.displayField] : featureText + " " + featureId;
+            return {
+              value: id,
+              title: layerTitle + ": " + featureName
+            };
+          }).sort(function (a, b) {
+            return a.title.localeCompare(b.title);
+          });
+          body = /*#__PURE__*/React.createElement("div", {
+            className: "feature-query-body"
+          }, Object.keys(this.state.pickedFeatures).length > 1 ? /*#__PURE__*/React.createElement("div", {
+            className: "feature-query-selection"
+          }, /*#__PURE__*/React.createElement("select", {
+            onChange: function onChange(ev) {
+              return _this2.setSelectedFeature(ev.target.value);
+            },
+            value: this.state.selectedFeature
+          }, results.map(function (entry) {
             return /*#__PURE__*/React.createElement("option", {
-              key: id,
-              value: id
-            }, layerTitle + ": " + featureName);
+              key: entry.value,
+              value: entry.value
+            }, entry.title);
           }))) : null, attributeForm);
         }
         resultWindow = /*#__PURE__*/React.createElement(ResizeableWindow, {

package/plugins/MapLegend.js

@@ -110,6 +110,7 @@ var MapLegend = /*#__PURE__*/function (_React$Component) {
     _this.state.onlyVisibleLegend = props.onlyVisibleLegend;
     _this.state.bboxDependentLegend = props.bboxDependentLegend;
     _this.state.scaleDependentLegend = props.scaleDependentLegend;
+    _this.state.visible = props.showOnStartup;
     return _this;
   }
   _inherits(MapLegend, _React$Component);
@@ -233,7 +234,9 @@ _defineProperty(MapLegend, "propTypes", {
   onlyVisibleLegend: PropTypes.bool,
   /** Whether to display a scale-dependent legend by default. */
   scaleDependentLegend: PropTypes.bool,
-  setCurrentTask: PropTypes.func
+  setCurrentTask: PropTypes.func,
+  /** Whether to show the MapLegend on startup. Useful if `startupTask` is already set to another task. */
+  showOnStartup: PropTypes.bool
 });
 _defineProperty(MapLegend, "defaultProps", {
   addGroupTitles: false,

package/plugins/TaskButton.js

@@ -55,6 +55,7 @@ var TaskButton = /*#__PURE__*/function (_React$Component) {
       }
       var title = LocaleUtils.tr("appmenu.items." + this.props.task + (this.props.mode || ""));
       return /*#__PURE__*/React.createElement(MapButton, {
+        active: this.props.currentTask === this.props.task,
         icon: this.props.icon,
         onClick: this.buttonClicked,
         position: this.props.position,

package/plugins/TopBar.js

@@ -245,6 +245,8 @@ _defineProperty(TopBar, "propTypes", {
     allowAddLayerAsGroup: PropTypes.bool,
     /** Whether to show the search filter widget. */
     allowSearchFilters: PropTypes.bool,
+    /** List of additional CRS for which the coordinate search should display results. Alternatively, the string `mousecrs` to indicate the CRS listed in `additionalMouseCrs` of the current theme. */
+    extraCoordinateSearchCrs: PropTypes.oneOfType([PropTypes.array, PropTypes.string]),
     /** Whether to focus the search field on startup. */
     focusOnStartup: PropTypes.bool,
     /** Whether to hide the result labels on the map. */

package/scripts/gen-plugin-docs.js

@@ -81,6 +81,18 @@ function parsePropType(type) {
     return type.name;
   }
 }
+function parsePropDesc(prop) {
+  if (prop.type.name === 'shape') {
+    return prop.description.replaceAll("\n", "<br />") + "<br />" + Object.entries(prop.type.value).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        name = _ref4[0],
+        subprop = _ref4[1];
+      return "- `" + name + "`: " + subprop.description;
+    }).join("<br />");
+  } else {
+    return prop.description.replaceAll("\n", "<br />");
+  }
+}
 function genPluginDoc(plugin) {
   var output = "";
   if (!plugin.description) {
@@ -94,10 +106,10 @@ function genPluginDoc(plugin) {
   if (props.length > 0) {
     output += "| Property | Type | Description | Default value |\n";
     output += "|----------|------|-------------|---------------|\n";
-    props.forEach(function (_ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
-        name = _ref4[0],
-        prop = _ref4[1];
+    props.forEach(function (_ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+        name = _ref6[0],
+        prop = _ref6[1];
       if (!prop.description) {
         return;
       }
@@ -105,7 +117,7 @@ function genPluginDoc(plugin) {
         return '`' + x.replace(' ', ' ') + '`';
       }).join("<br />") : "`undefined`";
       var type = "`" + parsePropType(prop.type).replaceAll(' ', ' ').replaceAll("\n", "`<br />`") + "`";
-      output += "| ".concat(name, " | ").concat(type, " | ").concat(prop.description.replaceAll("\n", "<br />"), " | ").concat(defaultValue, " |\n");
+      output += "| ".concat(name, " | ").concat(type, " | ").concat(parsePropDesc(prop), " | ").concat(defaultValue, " |\n");
     });
     output += "\n";
   }

package/utils/SearchProviders.js

@@ -1,13 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -18,6 +12,12 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /**
  * Copyright 2016-2021 Sourcepole AG
  * All rights reserved.
@@ -50,16 +50,19 @@ function coordinatesSearch(text, searchParams, callback) {
   if (matches && matches.length >= 3) {
     var x = parseFloat(matches[1]);
     var y = parseFloat(matches[2]);
-    if (displaycrs !== "EPSG:4326") {
+    var searchCrs = [displaycrs].concat(_toConsumableArray(searchParams.extracrs.filter(function (crs) {
+      return !['EPSG:4326', displaycrs].includes(crs);
+    })));
+    searchCrs.forEach(function (crs) {
       items.push({
-        id: "coord0",
-        text: x + ", " + y + " (" + displaycrs + ")",
+        id: "coord" + items.length,
+        text: x + ", " + y + " (" + crs + ")",
         x: x,
         y: y,
-        crs: displaycrs,
+        crs: crs,
         bbox: [x, y, x, y]
       });
-    }
+    });
     if (x >= -180 && x <= 180 && y >= -90 && y <= 90) {
       var title = Math.abs(x) + (x >= 0 ? "°E" : "°W") + ", " + Math.abs(y) + (y >= 0 ? "°N" : "°S");
       items.push({