qwc2 2025.12.17 → 2025.12.19

package/components/style/PluginsContainer.css

@@ -30,15 +30,20 @@ div.map-bottom-tool-container {
     position: absolute;
     pointer-events: none;
     display: flex;
-    flex-direction: column-reverse;
-    align-items: center;
-    align-content: flex-start;
-    justify-content: flex-start;
-    margin-bottom: -1px;
+    justify-content: center;
+    align-items: flex-end;
 }
 
-div.map-bottom-tool-container > * {
+div.map-bottom-tool-container > div {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin-bottom: -1px;
     pointer-events: initial;
+    padding: 0.25em 0.5em;
+    gap: 1em;
+    background-color: var(--container-bg-color);
+    box-shadow: 0px -2px 4px rgba(136, 136, 136, 0.5);
 }
 
 div.app-info {

package/components/timeline/FixedTimeline.js

@@ -158,11 +158,11 @@ var FixedTimeline = /*#__PURE__*/function (_React$Component) {
         icon: "home"
       }, {
         key: "zoomout",
-        tooltip: LocaleUtils.tr("timemanager.zoomout"),
+        tooltip: LocaleUtils.tr("common.zoomout"),
         icon: "zoomout"
       }, {
         key: "zoomin",
-        tooltip: LocaleUtils.tr("timemanager.zoomin"),
+        tooltip: LocaleUtils.tr("common.zoomin"),
         icon: "zoomin"
       }];
       return /*#__PURE__*/React.createElement("div", {

package/components/timeline/InfiniteTimeline.js

@@ -257,11 +257,11 @@ var InfiniteTimeline = /*#__PURE__*/function (_React$Component) {
         icon: "home"
       }, {
         key: "zoomout",
-        tooltip: LocaleUtils.tr("timemanager.zoomout"),
+        tooltip: LocaleUtils.tr("common.zoomout"),
         icon: "zoomout"
       }, {
         key: "zoomin",
-        tooltip: LocaleUtils.tr("timemanager.zoomin"),
+        tooltip: LocaleUtils.tr("common.zoomin"),
         icon: "zoomin"
       }];
       return /*#__PURE__*/React.createElement("div", {

package/components/timeline/TimelineFeaturesSlider.js

@@ -414,7 +414,7 @@ var TimelineFeaturesSlider = /*#__PURE__*/function (_React$Component) {
         onPointerDown: this.pickCurrentTimestamp
       }, this.props.displayMode === "features" ? this.renderTimeFeatures(sliderGeom) : null, this.props.displayMode === "layers" ? this.renderTimeLayers(sliderGeom) : null, this.renderGradient(sliderGeom)), this.renderCursor(timestamp), this.props.timeFeatures.pendingRequests > 0 ? /*#__PURE__*/React.createElement("div", {
         className: "timeline-slider-loading"
-      }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("timemanager.loading"))) : null);
+      }, /*#__PURE__*/React.createElement(Spinner, null), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.loading"))) : null);
     }
   }]);
 }(React.Component);

package/components/widgets/LayerCatalogWidget.js

@@ -247,7 +247,7 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       } else if (isEmpty(this.state.catalog)) {
         emptyEntry = /*#__PURE__*/React.createElement("div", {
           className: "layer-catalog-placeholder"
-        }, LocaleUtils.tr("importlayer.loading"));
+        }, LocaleUtils.tr("common.loading"));
       }
       var filterplaceholder = LocaleUtils.tr("importlayer.filter");
       var catalog = (_this$state$filteredC = this.state.filteredCatalog) !== null && _this$state$filteredC !== void 0 ? _this$state$filteredC : this.state.catalog;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.12.17",
+    "version": "2025.12.19",
     "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';
@@ -65,21 +67,26 @@ import './style/Redlining.css';
  *   "pluginData": {
  *     "geometryLinks": [
  *       {
- *         "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
- *         "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
- *           "w": <dialogWidth>,                    // Dialog width
- *           "h": <dialogHeight>                    // Dialog height
+ *         "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)
+ *         "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
+ *           "w": <dialogWidth>,                     // Dialog width
+ *           "h": <dialogHeight>                     // Dialog height
  *         }
  *       }
  *     ]
  *   }
  * }
  * ```
+ * 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/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);
@@ -481,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,
@@ -527,7 +525,6 @@ _defineProperty(Identify, "defaultProps", {
   resultDisplayMode: 'flat',
   resultGridSize: 200,
   replaceImageUrls: true,
-  featureInfoReturnsLayerName: true,
   geometry: {
     initialWidth: 240,
     initialHeight: 320,

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',

package/plugins/MapFilter.js

@@ -290,12 +290,12 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       var commitButtons = [{
         key: 'Save',
         icon: 'ok',
-        label: LocaleUtils.tr("mapfilter.save"),
+        label: LocaleUtils.tr("common.save"),
         extraClasses: "button-accept"
       }, {
         key: 'Cancel',
         icon: 'remove',
-        label: LocaleUtils.tr("mapfilter.cancel"),
+        label: LocaleUtils.tr("common.cancel"),
         extraClasses: "button-reject"
       }];
       var sampleFilters = '["field", "=", "val"]\n' + '[["field", ">", "val1"], "and", ["field", "<", "val2"]]';
@@ -389,7 +389,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
             value: _this.state.filters[config.id].values[field.id]
           }, !field.defaultValue ? /*#__PURE__*/React.createElement("option", {
             value: ""
-          }, LocaleUtils.tr("mapfilter.select")) : null, field.inputConfig.options.map(function (entry) {
+          }, LocaleUtils.tr("common.select")) : null, field.inputConfig.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,
@@ -483,7 +483,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           onChange: function onChange(value) {
             return _this.updateCustomFilter(key, 'layer', value);
           },
-          placeholder: LocaleUtils.tr("mapfilter.selectlayer"),
+          placeholder: LocaleUtils.tr("common.selectlayer"),
           value: entry.layer
         }, layerNames.map(function (layerName) {
           return /*#__PURE__*/React.createElement("div", {
@@ -518,19 +518,19 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       var geomFilter = _this.state.geomFilter;
       var filterButtons = [{
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
-        label: LocaleUtils.tr("redlining.polygon")
+        label: LocaleUtils.tr("common.polygon")
       }, {
         key: "Circle",
-        tooltip: LocaleUtils.tr("redlining.circle"),
+        tooltip: LocaleUtils.tr("common.circle"),
         icon: "circle",
-        label: LocaleUtils.tr("redlining.circle")
+        label: LocaleUtils.tr("common.circle")
       }, {
         key: "Pick",
-        tooltip: LocaleUtils.tr("redlining.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "pick",
-        label: LocaleUtils.tr("redlining.pick")
+        label: LocaleUtils.tr("common.pick")
       }];
       var active = geomFilter.picking ? "Pick" : geomFilter.geomType || "";
       return /*#__PURE__*/React.createElement("div", {

package/plugins/NewsPopup.js

@@ -57,7 +57,7 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
         className: "newspopup-dialog-popup-buttonbar"
       }, /*#__PURE__*/React.createElement("button", {
         onClick: _this.closeDialog
-      }, LocaleUtils.tr("newspopup.dialogclose")), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("input", {
+      }, LocaleUtils.tr("common.close")), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("input", {
         onChange: function onChange(ev) {
           return _this.setState({
             dontShowAgain: ev.target.checked