qwc2 2025.12.15 → 2025.12.18

package/components/widgets/SearchWidget.js

@@ -34,11 +34,11 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
 import LocaleUtils from '../../utils/LocaleUtils';
-import MiscUtils from '../../utils/MiscUtils';
 import { SearchResultType } from '../../utils/SearchProviders';
 import VectorLayerUtils from '../../utils/VectorLayerUtils';
 import Icon from '../Icon';
 import InputContainer from './InputContainer';
+import PopupMenu from './PopupMenu';
 import Spinner from './Spinner';
 import './style/SearchWidget.css';
 var SearchWidget = /*#__PURE__*/function (_React$Component) {
@@ -51,42 +51,40 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
       reqId: null,
       results: [],
       pending: 0,
-      active: false
+      resultsVisible: false
     });
     _defineProperty(_this, "renderResults", function () {
-      return /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(PopupMenu, {
+        anchor: _this.input,
         className: "search-widget-results",
-        onMouseDown: _this.setPreventBlur
+        onClose: function onClose() {
+          return _this.setState({
+            resultsVisible: false
+          });
+        },
+        setMaxWidth: true,
+        spaceKeyActivation: false
       }, _this.state.results.filter(function (group) {
         var _group$type;
         return _this.props.resultTypeFilter.includes((_group$type = group.type) !== null && _group$type !== void 0 ? _group$type : SearchResultType.PLACE);
       }).map(function (group) {
         var _group$title;
-        return /*#__PURE__*/React.createElement("div", {
-          className: "search-widget-results-group",
-          key: group.id,
-          onMouseDown: MiscUtils.killEvent
-        }, /*#__PURE__*/React.createElement("div", {
-          className: "search-widget-results-group-title"
+        return [/*#__PURE__*/React.createElement("div", {
+          className: "search-widget-results-group-title",
+          disabled: true,
+          key: group.id
         }, /*#__PURE__*/React.createElement("span", null, (_group$title = group.title) !== null && _group$title !== void 0 ? _group$title : LocaleUtils.tr(group.titlemsgid))), group.items.map(function (item) {
           item.text = (item.label !== undefined ? item.label : item.text || '').replace(/<\/?\w+\s*\/?>/g, '');
           return /*#__PURE__*/React.createElement("div", {
-            className: "search-widget-results-group-item",
-            key: item.id,
+            className: "search-widget-results-item",
+            key: group.id + ":" + item.id,
             onClick: function onClick() {
               return _this.resultSelected(group, item);
             },
             title: item.text
           }, item.text);
-        }));
-      }));
-    });
-    _defineProperty(_this, "setPreventBlur", function () {
-      _this.preventBlur = true;
-      setTimeout(function () {
-        _this.preventBlur = false;
-        return false;
-      }, 100);
+        })];
+      }).flat());
     });
     _defineProperty(_this, "textChanged", function (ev) {
       _this.setState({
@@ -102,27 +100,19 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
         _this.searchTimeout = setTimeout(_this.startSearch, 250);
       }
     });
-    _defineProperty(_this, "onBlur", function () {
-      if (!_this.preventBlur) {
-        clearTimeout(_this.searchTimeout);
-        _this.props.onBlur();
-        _this.setState({
-          active: false
-        });
-      }
-    });
     _defineProperty(_this, "onFocus", function (ev) {
-      ev.target.select();
-      _this.props.onFocus();
-      _this.setState({
-        active: true
-      });
+      if (_this.input && !_this.state.resultsVisible) {
+        ev.target.select();
+      }
     });
     _defineProperty(_this, "onKeyDown", function (ev) {
       if (ev.key === 'Enter') {
         _this.startSearch();
-      } else if (ev.key === 'Escape') {
-        ev.target.blur();
+      } else if (ev.key === 'ArrowDown' || ev.key === 'ArrowUp') {
+        ev.preventDefault();
+        _this.setState({
+          resultsVisible: true
+        });
       }
     });
     _defineProperty(_this, "startSearch", function () {
@@ -149,7 +139,8 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
                   provider: provider
                 });
               }))),
-              pending: state.pending - 1
+              pending: state.pending - 1,
+              resultsVisible: true
             };
           });
         }, axios);
@@ -174,14 +165,12 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
           } : null
         }));
       }
-      if (_this.input) {
-        _this.input.blur();
-      }
     });
     _defineProperty(_this, "clear", function () {
       _this.setState({
         results: [],
-        text: ""
+        text: "",
+        resultsVisible: false
       });
       _this.props.resultSelected(null);
     });
@@ -209,13 +198,17 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$placehold,
-        _this2 = this;
+      var _this2 = this,
+        _this$props$placehold;
       return /*#__PURE__*/React.createElement("div", {
         className: "search-widget-container"
       }, /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement("input", {
-        onBlur: this.onBlur,
         onChange: this.textChanged,
+        onClick: function onClick() {
+          return _this2.setState({
+            resultsVisible: true
+          });
+        },
         onFocus: this.onFocus,
         onKeyDown: this.onKeyDown,
         placeholder: (_this$props$placehold = this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("search.search"),
@@ -231,14 +224,12 @@ var SearchWidget = /*#__PURE__*/function (_React$Component) {
         icon: "clear",
         onClick: this.clear,
         role: "suffix"
-      })), (!isEmpty(this.state.results) || this.state.pending > 0) && this.state.active ? this.renderResults() : null);
+      })), (!isEmpty(this.state.results) || this.state.pending > 0) && this.state.resultsVisible ? this.renderResults() : null);
     }
   }]);
 }(React.Component);
 _defineProperty(SearchWidget, "propTypes", {
   className: PropTypes.string,
-  onBlur: PropTypes.func,
-  onFocus: PropTypes.func,
   placeholder: PropTypes.string,
   queryGeometries: PropTypes.bool,
   resultSelected: PropTypes.func.isRequired,
@@ -251,8 +242,6 @@ _defineProperty(SearchWidget, "propTypes", {
   value: PropTypes.string
 });
 _defineProperty(SearchWidget, "defaultProps", {
-  onBlur: function onBlur() {},
-  onFocus: function onFocus() {},
   resultTypeFilter: [SearchResultType.PLACE],
   searchParams: {},
   searchProviders: []

package/components/widgets/style/SearchWidget.css

@@ -11,31 +11,15 @@ div.search-widget-container > div.input-container > div.spinner {
     height: 2em;
 }
 
-div.search-widget-results {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 100%;
-    border: 1px solid var(--border-color);
-    background-color: var(--list-bg-color);
-    max-height: 10em;
-    overflow-y: auto;
-    z-index: 1;
-    box-shadow: 0px 2px 4px rgba(136, 136, 136, 0.5);
-}
 
 div.search-widget-results-group-title {
     background-color: var(--list-section-bg-color);
     color: var(--list-section-text-color);
-    font-weight: bold;;
-}
-
-div.search-widget-results-group-item:hover {
-    background-color: var(--list-item-bg-color-hover);
-    color: var(--list-item-text-color-hover);
+    font-weight: bold;
+    padding: 0.25em;
 }
 
-div.search-widget-results-group div {
+div.search-widget-results-item {
     padding: 0.25em;
     white-space: nowrap;
     overflow: hidden;

package/package.json

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

package/plugins/Editing.js

@@ -33,6 +33,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
+import ReactDOM from 'react-dom';
 import { connect } from 'react-redux';
 import { parseNumber } from '@norbulcz/num-parse';
 import dateParser from 'any-date-parser';
@@ -46,7 +47,9 @@ import { setSnappingConfig } from '../actions/map';
 import { setCurrentTask, setCurrentTaskBlocked } from '../actions/task';
 import AttributeForm from '../components/AttributeForm';
 import Icon from '../components/Icon';
+import MeasureSwitcher from '../components/MeasureSwitcher';
 import PickFeature from '../components/PickFeature';
+import { BottomToolPortalContext } from '../components/PluginsContainer';
 import SideBar from '../components/SideBar';
 import ButtonBar from '../components/widgets/ButtonBar';
 import ConfigUtils from '../utils/ConfigUtils';
@@ -173,7 +176,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
       actionButtons.push({
         key: 'Pick',
         icon: 'pick',
-        label: LocaleUtils.tr("editing.pick"),
+        label: LocaleUtils.tr("common.pick"),
         data: {
           action: 'Pick',
           feature: null
@@ -258,7 +261,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("editing.selectlayer")), Object.entries(_this.props.editConfigs).map(function (_ref) {
+      }, LocaleUtils.tr("common.selectlayer")), Object.entries(_this.props.editConfigs).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           mapName = _ref2[0],
           serviceConfigs = _ref2[1];
@@ -285,6 +288,11 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         onClick: _this.actionClicked
       }), featureSelection, pickBar, attributeForm);
     });
+    _defineProperty(_this, "changeMeasurementState", function (diff) {
+      _this.props.setEditContext('Editing', {
+        measurements: _objectSpread(_objectSpread({}, _this.props.editContext.measurements), diff)
+      });
+    });
     _defineProperty(_this, "actionClicked", function (action, data) {
       _this.setState({
         drawPick: false,
@@ -635,8 +643,9 @@ var Editing = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
-      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("editing.maximize") : LocaleUtils.tr("editing.minimize");
+      var _this3 = this,
+        _this$props$editConte3;
+      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "editing-minimize-maximize",
         icon: this.state.minimized ? 'chevron-down' : 'chevron-up',
@@ -669,10 +678,16 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         featureFilter: this.pickFilter,
         featurePicked: this.geomPicked,
         key: "FeaturePicker"
-      }) : null];
+      }) : null, this.props.editContext.action === "Draw" || (_this$props$editConte3 = this.props.editContext.feature) !== null && _this$props$editConte3 !== void 0 && _this$props$editConte3.geometry ? /*#__PURE__*/ReactDOM.createPortal(/*#__PURE__*/React.createElement(MeasureSwitcher, {
+        changeMeasureState: this.changeMeasurementState,
+        geomType: this.props.editContext.geomType,
+        iconSize: "large",
+        measureState: this.props.editContext.measurements
+      }), this.context) : null];
     }
   }]);
 }(React.Component);
+_defineProperty(Editing, "contextType", BottomToolPortalContext);
 _defineProperty(Editing, "propTypes", {
   addLayerFeatures: PropTypes.func,
   /** Whether to enable the "Clone existing geometry" functionality. */

package/plugins/FeatureForm.js

@@ -233,7 +233,7 @@ var FeatureForm = /*#__PURE__*/function (_React$Component) {
             className: "feature-query-body"
           }, /*#__PURE__*/React.createElement("span", {
             className: "identify-body-message"
-          }, LocaleUtils.tr("featureform.noresults")));
+          }, LocaleUtils.tr("common.noresults")));
         } else {
           var featureText = LocaleUtils.tr("featureform.feature");
           var attributeForm = null;

package/plugins/FeatureSearch.js

@@ -86,7 +86,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("featuresearch.select")), Object.entries(_this.state.providerGroups).map(function (_ref) {
+      }, LocaleUtils.tr("common.select")), Object.entries(_this.state.providerGroups).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           group = _ref2[0],
           entries = _ref2[1];
@@ -165,7 +165,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("option", {
           disabled: true,
           value: ""
-        }, LocaleUtils.tr("featuresearch.select")), options.map(function (entry) {
+        }, LocaleUtils.tr("common.select")), options.map(function (entry) {
           var _entry$value, _entry$value2, _entry$label;
           return /*#__PURE__*/React.createElement("option", {
             key: (_entry$value = entry.value) !== null && _entry$value !== void 0 ? _entry$value : entry,
@@ -195,7 +195,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         className: "feature-search-results"
       }, isEmpty(_this.state.searchResults) ? /*#__PURE__*/React.createElement("div", {
         className: "feature-search-noresults"
-      }, LocaleUtils.tr("featuresearch.noresults")) : /*#__PURE__*/React.createElement(IdentifyViewer, {
+      }, LocaleUtils.tr("common.noresults")) : /*#__PURE__*/React.createElement(IdentifyViewer, {
         collapsible: true,
         displayResultTree: false,
         enableExport: _this.props.enableExport,

package/plugins/GeometryDigitizer.js

@@ -32,6 +32,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import polySelfIntersections from 'geojson-polygon-self-intersections';
 import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
 import { LayerRole, removeLayer, addLayerFeatures, removeLayerFeatures, clearLayer } from '../actions/layers';
 import { changeRedliningState, resetRedliningState } from '../actions/redlining';
@@ -42,6 +43,7 @@ import ButtonBar from '../components/widgets/ButtonBar';
 import NumberInput from '../components/widgets/NumberInput';
 import Spinner from '../components/widgets/Spinner';
 import ConfigUtils from '../utils/ConfigUtils';
+import { EXCLUDE_ATTRS, EXCLUDE_PROPS } from '../utils/IdentifyUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import VectorLayerUtils from '../utils/VectorLayerUtils';
@@ -68,7 +70,8 @@ import './style/Redlining.css';
  *         "name": "<geomLinkName>",                // Link name referenced in theme item
  *         "title": "<geomLinkTitle>",              // Link title, displayed in the selection combo
  *         "geomType": ["<geomType>", "<geomType>"] // Supported geometry types (Point, LineString, Polygon)
- *         "url": "<targetApplicationUrl>",         // Application target URL, receiving the POST submit
+ *         "format": "wkt|geojson",                 // Format of data to send to application
+ *         "url": "<targetApplicationUrl>",         // Application target URL, receiving the POST submit. Can contain the $username$ placeholder parameter.
  *         "params": {"<key>": "<value>", ...}      // Optional: additional form parameters to post to URL
  *         "target": "<target>" | {                 // Optional: form POST target which to display the result
  *           "iframedialog": true,                  // Use an iframe dialog
@@ -80,6 +83,10 @@ import './style/Redlining.css';
  *   }
  * }
  * ```
+ * If you are using `qwc-services`, you will need to explicitly permit the geometry links in the `qwc-admin-gui` as follows:
+ *
+ * * Create and permit a `Plugin` resource with name `geometryLinks`
+ * * Create and permit `Plugin data` resources with name equal to `<geomLinkName>`
  */
 var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
   function GeometryDigitizer(props) {
@@ -109,7 +116,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       _this.props.resetRedliningState();
     });
     _defineProperty(_this, "renderBody", function () {
-      var _this$props$layers$fi, _geomLinkData$target, _geomLinkData$target2, _this$props$theme$plu;
+      var _this$props$layers$fi, _geomLinkData$target, _geomLinkData$target2, _this$props$theme$plu, _geomLinkData$url;
       var geomLinkData = _this.geometryLinkData(_this.state.geomLink);
       var activeButton = null;
       if (_this.state.pickGeomType) {
@@ -129,7 +136,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       } : {
         key: "Point",
-        tooltip: LocaleUtils.tr("redlining.point"),
+        tooltip: LocaleUtils.tr("common.point"),
         icon: "point",
         data: {
           action: "Draw",
@@ -148,7 +155,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       } : {
         key: "LineString",
-        tooltip: LocaleUtils.tr("redlining.line"),
+        tooltip: LocaleUtils.tr("common.line"),
         icon: "line",
         data: {
           action: "Draw",
@@ -158,7 +165,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         disabled: !supportedGeomType.includes("LineString")
       }, {
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
         data: {
           action: "Draw",
@@ -169,7 +176,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }];
       var editButtons = [{
         key: "Pick",
-        tooltip: LocaleUtils.tr("redlining.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "pick",
         data: {
           action: "Pick",
@@ -178,7 +185,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       }, {
         key: "Delete",
-        tooltip: LocaleUtils.tr("redlining.delete"),
+        tooltip: LocaleUtils.tr("common.delete"),
         icon: "trash",
         data: {
           action: "Delete",
@@ -237,7 +244,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       })), /*#__PURE__*/React.createElement("div", {
         className: "redlining-groupcontrol"
-      }, /*#__PURE__*/React.createElement("div", null, LocaleUtils.tr("redlining.pick")), /*#__PURE__*/React.createElement(ButtonBar, {
+      }, /*#__PURE__*/React.createElement("div", null, LocaleUtils.tr("common.pick")), /*#__PURE__*/React.createElement(ButtonBar, {
         active: activeButton,
         buttons: pickButtons,
         onClick: function onClick(key, data) {
@@ -271,7 +278,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
           value: entry
         }, _this.geometryLinkData(entry).title);
       })), /*#__PURE__*/React.createElement("form", {
-        action: geomLinkData.url,
+        action: (_geomLinkData$url = geomLinkData.url) === null || _geomLinkData$url === void 0 ? void 0 : _geomLinkData$url.replace('$username$', ConfigUtils.getConfigProp("username") || ""),
         method: "post",
         onSubmit: _this.submitGeometryLink,
         target: target
@@ -335,7 +342,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         className: "geomdigitizer-output-window-body"
       }, !_this.state.outputLoaded ? /*#__PURE__*/React.createElement("span", {
         className: "geomdigitizer-output-window-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("geomdigitizer.wait"))) : null, /*#__PURE__*/React.createElement("iframe", {
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.loading"))) : null, /*#__PURE__*/React.createElement("iframe", {
         name: "geomdigitizer-output-window",
         onLoad: function onLoad() {
           return _this.setState({
@@ -492,19 +499,26 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }
       var data = _this.geometryLinkData(_this.state.geomLink);
       var supportedGeomType = data.geomType || [];
-      var geometries = features.filter(function (feature) {
+      var supportedFeatures = features.filter(function (feature) {
         return supportedGeomType.includes(_this.state.bufferDistance > 0 ? "Polygon" : feature.geometry.type.replace(/^Multi/, ''));
-      }).map(function (feature) {
-        return VectorLayerUtils.geoJSONGeomToWkt(feature.geometry);
       });
-      if (isEmpty(geometries)) {
+      if (isEmpty(supportedFeatures)) {
         ev.preventDefault();
         return;
-      } else {
-        ev.target.GEOMETRIES.value = geometries.join(";");
-        ev.target.GEOMCOUNT.value = geometries.length;
-        ev.target.BUFFERDIST.value = _this.state.bufferDistance;
       }
+      var geometries = (data.format || "wkt").toLowerCase() === "wkt" ? supportedFeatures.map(function (feature) {
+        return VectorLayerUtils.geoJSONGeomToWkt(feature.geometry);
+      }).join(";") : JSON.stringify({
+        type: "FeatureCollection",
+        features: supportedFeatures.map(function (feature) {
+          var newFeature = omit(feature, EXCLUDE_PROPS);
+          newFeature.properties = omit(newFeature.properties, EXCLUDE_ATTRS);
+          return newFeature;
+        })
+      });
+      ev.target.GEOMETRIES.value = geometries;
+      ev.target.GEOMCOUNT.value = supportedFeatures.length;
+      ev.target.BUFFERDIST.value = _this.state.bufferDistance;
       if (ev.target.target === "geomdigitizer-output-window") {
         _this.setState({
           outputWindowVisible: true,

package/plugins/HeightProfile.js

@@ -124,7 +124,8 @@ var HeightProfilePrintDialog_ = /*#__PURE__*/function (_React$PureComponent) {
             strokeWidth: 4,
             strokeDash: [],
             headmarker: _this.props.measurement.lineHeadMarker,
-            tailmarker: _this.props.measurement.lineTailMarker
+            tailmarker: _this.props.measurement.lineTailMarker,
+            markerscale: _this.props.measurement.markerScale
           },
           properties: {
             segment_labels: measurement.segment_lengths.map(function (length) {
@@ -147,6 +148,8 @@ var HeightProfilePrintDialog_ = /*#__PURE__*/function (_React$PureComponent) {
         REQUEST: 'GetMap',
         TRANSPARENT: 'true',
         TILED: 'false',
+        filename: 'heightprofile.png',
+        // To make the ogc-service treat this as a raster export
         CRS: _this.props.map.projection,
         BBOX: bounds,
         WIDTH: _this.props.map.size.width,

package/plugins/Identify.js

@@ -230,7 +230,7 @@ var Identify = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "parseResult", function (response, layer, format, clickPoint) {
       var ctrlPick = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-      var newResults = IdentifyUtils.parseResponse(response, layer, format, clickPoint, _this.props.map.projection, _this.props.featureInfoReturnsLayerName);
+      var newResults = IdentifyUtils.parseResponse(response, layer, format, clickPoint, _this.props.map.projection);
       // Merge with previous
       _this.setState(function (state) {
         var identifyResults = _objectSpread({}, state.identifyResults);
@@ -415,6 +415,7 @@ var Identify = /*#__PURE__*/function (_React$Component) {
             longAttributesDisplay: this.props.longAttributesDisplay,
             replaceImageUrls: this.props.replaceImageUrls,
             resultDisplayMode: this.props.resultDisplayMode,
+            resultGridSize: this.props.resultGridSize,
             showLayerSelector: this.props.showLayerSelector
           });
         }
@@ -480,8 +481,6 @@ _defineProperty(Identify, "propTypes", {
   exitTaskOnResultsClose: PropTypes.bool,
   /** Whether to include the geometry in exported features. Default: `true`. */
   exportGeometry: PropTypes.bool,
-  /** Whether to assume that XML GetFeatureInfo responses specify the technical layer name in the `name` attribute, rather than the layer title. */
-  featureInfoReturnsLayerName: PropTypes.bool,
   /** Default window geometry with size, position and docking status. Positive position values (including '0') are related to top (InitialY) and left (InitialX), negative values (including '-0') to bottom (InitialY) and right (InitialX). */
   geometry: PropTypes.shape({
     initialWidth: PropTypes.number,
@@ -507,6 +506,8 @@ _defineProperty(Identify, "propTypes", {
   replaceImageUrls: PropTypes.bool,
   /** Result display mode, one of `tree`, `flat`, `paginated`. */
   resultDisplayMode: PropTypes.string,
+  /** Target cell size of the result grid in comparison mode. */
+  resultGridSize: PropTypes.number,
   selection: PropTypes.object,
   setCurrentTask: PropTypes.func,
   /** Whether to show a layer selector to filter the identify results by layer. */
@@ -522,8 +523,8 @@ _defineProperty(Identify, "defaultProps", {
   customExporters: [],
   longAttributesDisplay: 'ellipsis',
   resultDisplayMode: 'flat',
+  resultGridSize: 200,
   replaceImageUrls: true,
-  featureInfoReturnsLayerName: true,
   geometry: {
     initialWidth: 240,
     initialHeight: 320,

package/plugins/LayerTree.js

@@ -441,7 +441,8 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
           icon: "tree",
           onClick: function onClick() {
             return _this.props.changeLayerProperty(layer.id, "visibility", subtreevisibility !== 1, path, "children");
-          }
+          },
+          title: LocaleUtils.tr("layertree.togglegroup")
         });
       }
       var infoButton = null;
@@ -689,18 +690,21 @@ var LayerTree = /*#__PURE__*/function (_React$Component) {
       }), _this.state.visibilityMenu ? /*#__PURE__*/React.createElement(PopupMenu, {
         anchor: _this.visibilityButton,
         className: "layertree-visibility-menu",
+        keepMenuOpen: true,
         onClose: function onClose() {
           return _this.setState({
             visibilityMenu: false
           });
         }
       }, _this.props.showToggleAllLayersCheckbox ? /*#__PURE__*/React.createElement("div", {
+        key: "hidealllayers",
         onClick: function onClick() {
           return _this.toggleLayerTreeVisibility(vis === 0);
         }
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: vis === 0 ? "checked" : "unchecked"
       }), " ", LocaleUtils.tr("layertree.hidealllayers")) : null, _this.props.enableVisibleFilter ? /*#__PURE__*/React.createElement("div", {
+        key: "filtervisible",
         onClick: function onClick() {
           return _this.setState(function (state) {
             return {

package/plugins/MapExport.js

@@ -169,7 +169,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement("table", {
         className: "options-table"
-      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: _this.changeFormat,
         value: _this.state.selectedFormat
       }, _this.state.availableFormats.map(function (format) {
@@ -199,7 +199,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
           key: "size_" + idx,
           value: idx
         }, entry.name);
-      })))) : null, scaleChooser && _this.state.pageSize !== null ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, _this.props.dpis && _this.state.selectedFormat !== "application/dxf" ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.resolution")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      })))) : null, scaleChooser && _this.state.pageSize !== null ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, _this.props.dpis && _this.state.selectedFormat !== "application/dxf" ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.resolution")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: _this.changeResolution,
         value: _this.state.dpi
       }, _this.props.dpis.map(function (dpi) {
@@ -227,7 +227,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
         type: "submit"
       }, _this.state.exporting ? /*#__PURE__*/React.createElement("span", {
         className: "mapexport-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("mapexport.wait")) : LocaleUtils.tr("mapexport.submit")))));
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("common.wait")) : LocaleUtils.tr("common.export")))));
     });
     _defineProperty(_this, "renderPrintSelection", function () {
       if (_this.state.pageSize !== null) {
@@ -517,7 +517,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("print.maximize") : LocaleUtils.tr("print.minimize");
+      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "mapexport-minimize-maximize",
         icon: this.state.minimized ? 'chevron-down' : 'chevron-up',