qwc2 2025.12.17 → 2025.12.18

package/plugins/Redlining.js

@@ -39,6 +39,7 @@ import { LayerRole, addLayer } from '../actions/layers';
 import { setSnappingConfig } from '../actions/map';
 import { changeRedliningState, resetRedliningState } from '../actions/redlining';
 import Icon from '../components/Icon';
+import MeasureSwitcher from '../components/MeasureSwitcher';
 import TaskBar from '../components/TaskBar';
 import ButtonBar from '../components/widgets/ButtonBar';
 import ColorButton from '../components/widgets/ColorButton';
@@ -114,7 +115,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       var activeButton = _this.props.redlining.action === "Draw" ? _this.props.redlining.geomType : _this.props.redlining.action;
       var drawButtons = [{
         key: "Point",
-        tooltip: LocaleUtils.tr("redlining.point"),
+        tooltip: LocaleUtils.tr("common.point"),
         icon: "point",
         data: {
           action: "Draw",
@@ -123,7 +124,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       }, {
         key: "LineString",
-        tooltip: LocaleUtils.tr("redlining.line"),
+        tooltip: LocaleUtils.tr("common.line"),
         icon: "line",
         data: {
           action: "Draw",
@@ -132,7 +133,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       }, [{
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
         data: {
           action: "Draw",
@@ -141,7 +142,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       }, toolEnabled("Circle") ? {
         key: "Circle",
-        tooltip: LocaleUtils.tr("redlining.circle"),
+        tooltip: LocaleUtils.tr("common.circle"),
         icon: "circle",
         data: {
           action: "Draw",
@@ -150,7 +151,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       } : null, toolEnabled("Ellipse") ? {
         key: "Ellipse",
-        tooltip: LocaleUtils.tr("redlining.ellipse"),
+        tooltip: LocaleUtils.tr("common.ellipse"),
         icon: "ellipse",
         data: {
           action: "Draw",
@@ -159,7 +160,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       } : null, toolEnabled("Square") ? {
         key: "Square",
-        tooltip: LocaleUtils.tr("redlining.square"),
+        tooltip: LocaleUtils.tr("common.square"),
         icon: "box",
         data: {
           action: "Draw",
@@ -168,7 +169,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       } : null, toolEnabled("Box") ? {
         key: "Box",
-        tooltip: LocaleUtils.tr("redlining.rectangle"),
+        tooltip: LocaleUtils.tr("common.rectangle"),
         icon: "rect",
         data: {
           action: "Draw",
@@ -177,7 +178,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       } : null].filter(Boolean), {
         key: "Text",
-        tooltip: LocaleUtils.tr("redlining.text"),
+        tooltip: LocaleUtils.tr("common.text"),
         icon: "text",
         data: {
           action: "Draw",
@@ -204,7 +205,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       }] : [];
       var editButtons = [{
         key: "Pick",
-        tooltip: LocaleUtils.tr("redlining.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "nodetool",
         data: {
           action: "Pick",
@@ -222,7 +223,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         }
       } : null, toolEnabled("Clone") ? {
         key: "Clone",
-        tooltip: LocaleUtils.tr("redlining.clone"),
+        tooltip: LocaleUtils.tr("common.clone"),
         icon: "clone",
         data: {
           action: "Clone",
@@ -231,7 +232,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         disabled: !_this.props.redlining.selectedFeature
       } : null, {
         key: "Delete",
-        tooltip: LocaleUtils.tr("redlining.delete"),
+        tooltip: LocaleUtils.tr("common.delete"),
         icon: "trash",
         data: {
           action: "Delete",
@@ -323,7 +324,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
         disabled: !haveLayer,
         menuIcon: "export",
         onActivate: _this["export"],
-        tooltip: LocaleUtils.tr("redlining.export")
+        tooltip: LocaleUtils.tr("common.export")
       }, /*#__PURE__*/React.createElement("div", {
         className: "redlining-export-menu-entry",
         key: "GeoJSON",
@@ -341,7 +342,7 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "renderStandardControls", function () {
-      var sizeLabel = LocaleUtils.tr("redlining.line");
+      var sizeLabel = LocaleUtils.tr("common.line");
       var showDash = true;
       if (["Text", "Point"].includes(_this.props.redlining.geomType)) {
         sizeLabel = LocaleUtils.tr("redlining.size");
@@ -491,21 +492,16 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       })))) : null, /*#__PURE__*/React.createElement("div", {
         className: "redlining-control redlining-control-fill"
       }, /*#__PURE__*/React.createElement("div", {
-        className: "controlgroup"
-      }, _this.props.redlining.geomType !== 'Text' && _this.props.allowGeometryLabels ? /*#__PURE__*/React.createElement("button", {
-        className: "button" + (_this.props.redlining.measurements ? " pressed" : ""),
-        onClick: function onClick() {
-          return _this.props.changeRedliningState({
-            measurements: !_this.props.redlining.measurements,
-            style: _objectSpread(_objectSpread({}, _this.props.redlining.style), {}, {
-              text: ''
-            })
-          });
+        className: "controlgroup" + (_this.props.redlining.showmeasurements ? " redlining-control-fill" : "")
+      }, _this.props.redlining.geomType !== 'Text' && _this.props.allowGeometryLabels ? /*#__PURE__*/React.createElement(MeasureSwitcher, {
+        changeMeasureState: function changeMeasureState(diff) {
+          return _this.props.changeRedliningState(_objectSpread(_objectSpread({}, diff), {}, {
+            text: ''
+          }));
         },
-        title: LocaleUtils.tr("redlining.measurements")
-      }, /*#__PURE__*/React.createElement(Icon, {
-        icon: "measure"
-      })) : null, (_this.props.redlining.geomType === 'Text' || _this.props.allowGeometryLabels) && !_this.props.redlining.measurements ? /*#__PURE__*/React.createElement("input", {
+        geomType: _this.props.redlining.geomType,
+        measureState: _this.props.redlining
+      }) : null, (_this.props.redlining.geomType === 'Text' || _this.props.allowGeometryLabels) && !_this.props.redlining.showmeasurements ? /*#__PURE__*/React.createElement("input", {
         className: "controlgroup-fillitem",
         onChange: function onChange(ev) {
           return _this.updateRedliningStyle({
@@ -513,57 +509,13 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
           });
         },
         placeholder: labelPlaceholder,
-        readOnly: _this.props.redlining.measurements,
+        readOnly: _this.props.redlining.showmeasurements,
         ref: function ref(el) {
           return _this.setLabelRef(el);
         },
         type: "text",
         value: _this.props.redlining.style.text
-      }) : null, _this.props.redlining.measurements && ['LineString', 'Circle'].includes(_this.props.redlining.geomType) ? /*#__PURE__*/React.createElement("select", {
-        className: "controlgroup-fillitem",
-        onChange: function onChange(ev) {
-          return _this.props.changeRedliningState({
-            lenUnit: ev.target.value
-          });
-        },
-        value: _this.props.redlining.lenUnit
-      }, /*#__PURE__*/React.createElement("option", {
-        value: "metric"
-      }, LocaleUtils.tr("measureComponent.metric")), /*#__PURE__*/React.createElement("option", {
-        value: "imperial"
-      }, LocaleUtils.tr("measureComponent.imperial")), /*#__PURE__*/React.createElement("option", {
-        value: "m"
-      }, "m"), /*#__PURE__*/React.createElement("option", {
-        value: "km"
-      }, "km"), /*#__PURE__*/React.createElement("option", {
-        value: "ft"
-      }, "ft"), /*#__PURE__*/React.createElement("option", {
-        value: "mi"
-      }, "mi")) : null, _this.props.redlining.measurements && ['Polygon', 'Ellipse', 'Square', 'Box'].includes(_this.props.redlining.geomType) ? /*#__PURE__*/React.createElement("select", {
-        className: "controlgroup-fillitem",
-        onChange: function onChange(ev) {
-          return _this.props.changeRedliningState({
-            areaUnit: ev.target.value
-          });
-        },
-        value: _this.props.redlining.areaUnit
-      }, /*#__PURE__*/React.createElement("option", {
-        value: "metric"
-      }, LocaleUtils.tr("measureComponent.metric")), /*#__PURE__*/React.createElement("option", {
-        value: "imperial"
-      }, LocaleUtils.tr("measureComponent.imperial")), /*#__PURE__*/React.createElement("option", {
-        value: "sqm"
-      }, "m\xB2"), /*#__PURE__*/React.createElement("option", {
-        value: "ha"
-      }, "ha"), /*#__PURE__*/React.createElement("option", {
-        value: "sqkm"
-      }, "km\xB2"), /*#__PURE__*/React.createElement("option", {
-        value: "sqft"
-      }, "ft\xB2"), /*#__PURE__*/React.createElement("option", {
-        value: "acre"
-      }, "acre"), /*#__PURE__*/React.createElement("option", {
-        value: "sqmi"
-      }, "mi\xB2")) : null)));
+      }) : null)));
     });
     _defineProperty(_this, "setLabelRef", function (el) {
       _this.labelInput = el;

package/plugins/Reports.js

@@ -71,7 +71,7 @@ var Reports = /*#__PURE__*/function (_React$Component) {
       var pickButtons = [{
         key: 'Pick',
         icon: 'pick',
-        label: LocaleUtils.tr("reports.pick")
+        label: LocaleUtils.tr("common.pick")
       }, {
         key: 'Region',
         icon: 'pick_region',
@@ -79,7 +79,7 @@ var Reports = /*#__PURE__*/function (_React$Component) {
       }, {
         key: 'All',
         icon: 'ok',
-        label: LocaleUtils.tr("reports.all"),
+        label: LocaleUtils.tr("common.all"),
         forceLabel: true
       }];
       return /*#__PURE__*/React.createElement("div", {
@@ -113,7 +113,7 @@ var Reports = /*#__PURE__*/function (_React$Component) {
         type: "button"
       }, _this.state.generatingReport ? /*#__PURE__*/React.createElement(Spinner, null) : /*#__PURE__*/React.createElement(Icon, {
         icon: "report"
-      }), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("reports.download")))));
+      }), /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.download")))));
     });
     _defineProperty(_this, "setLayerVisible", function (layerUrl, layerName) {
       var path = [];

package/plugins/Routing.js

@@ -234,7 +234,7 @@ var Routing = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "clear"
-      }), " ", LocaleUtils.tr("routing.clear"))), _this.state.mode === 'transit' ? /*#__PURE__*/React.createElement("div", {
+      }), " ", LocaleUtils.tr("common.clear"))), _this.state.mode === 'transit' ? /*#__PURE__*/React.createElement("div", {
         className: "routing-time-settings"
       }, /*#__PURE__*/React.createElement("select", {
         onChange: _this.updateTransitTimepoint,
@@ -330,7 +330,7 @@ var Routing = /*#__PURE__*/function (_React$Component) {
         }), " ", /*#__PURE__*/React.createElement("a", {
           href: "#",
           onClick: _this.exportRoute
-        }, LocaleUtils.tr("routing.export"))), /*#__PURE__*/React.createElement("span", {
+        }, LocaleUtils.tr("common.export"))), /*#__PURE__*/React.createElement("span", {
           className: "routing-result-spacer"
         }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icon, {
           icon: "layers"
@@ -467,7 +467,7 @@ var Routing = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "clear"
-      }), " ", LocaleUtils.tr("routing.clear")))), isoConfig.busy ? /*#__PURE__*/React.createElement("div", {
+      }), " ", LocaleUtils.tr("common.clear")))), isoConfig.busy ? /*#__PURE__*/React.createElement("div", {
         className: "routing-busy"
       }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("routing.computing")) : null, isoConfig.result ? _this.renderIsochroneResult(isoConfig) : null);
     });
@@ -486,7 +486,7 @@ var Routing = /*#__PURE__*/function (_React$Component) {
         }), " ", /*#__PURE__*/React.createElement("a", {
           href: "#",
           onClick: _this.exportIsochrone
-        }, LocaleUtils.tr("routing.export"))), /*#__PURE__*/React.createElement("span", {
+        }, LocaleUtils.tr("common.export"))), /*#__PURE__*/React.createElement("span", {
           className: "routing-result-spacer"
         }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Icon, {
           icon: "layers"

package/plugins/ValueTool.js

@@ -178,7 +178,7 @@ var ValueTool = /*#__PURE__*/function (_React$Component) {
             onChange: function onChange(value) {
               return _this.setLayerBands(key, value);
             },
-            placeholder: LocaleUtils.tr("valuetool.all"),
+            placeholder: LocaleUtils.tr("common.all"),
             value: _this.state.selectedBands[key] || ""
           })) : null);
         });

package/plugins/View3D.js

@@ -68,11 +68,11 @@ var View3D = /*#__PURE__*/function (_React$Component) {
         var extraControls = [{
           icon: "sync",
           callback: _this.sync2DExtent,
-          title: LocaleUtils.tr("map3d.syncview")
+          title: LocaleUtils.tr("common.sync2dview")
         }, {
           icon: "lock",
           callback: _this.setLockViews,
-          title: LocaleUtils.tr("map3d.lockview"),
+          title: LocaleUtils.tr("common.lock2dview"),
           active: _this.state.viewsLocked
         }];
         if (!_this.state.windowDetached) {

package/plugins/ZoomButtons.js

@@ -96,7 +96,7 @@ var ZoomButton = /*#__PURE__*/function (_React$Component) {
       }
       var defaultPosition = this.props.direction > 0 ? 4 : 3;
       var position = this.props.position >= 0 ? this.props.position : defaultPosition;
-      var tooltip = this.props.direction > 0 ? LocaleUtils.tr("tooltip.zoomin") : LocaleUtils.tr("tooltip.zoomout");
+      var tooltip = this.props.direction > 0 ? LocaleUtils.tr("common.zoomin") : LocaleUtils.tr("common.zoomout");
       var active = this.props.enableZoomByBoxSelection && this.props.currentTask === this.task;
       return [/*#__PURE__*/React.createElement(MapButton, {
         active: active,

package/plugins/map/EditingSupport.js

@@ -35,6 +35,7 @@ import PropTypes from 'prop-types';
 import { setEditContext } from '../../actions/editing';
 import LocationRecorder from '../../components/LocationRecorder';
 import FeatureStyles from "../../utils/FeatureStyles";
+import MeasureUtils from '../../utils/MeasureUtils';
 
 /**
  * Editing support for the map component.
@@ -47,33 +48,33 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       showRecordLocation: false
     });
-    _defineProperty(_this, "editStyle", function () {
-      var geometryFunction = function geometryFunction(feature) {
-        if (feature.getGeometry().getType() === "Point") {
-          return new ol.geom.MultiPoint([feature.getGeometry().getCoordinates()]);
-        } else if (feature.getGeometry().getType() === "LineString") {
-          return new ol.geom.MultiPoint(feature.getGeometry().getCoordinates());
-        } else if (feature.getGeometry().getType() === "Polygon") {
-          return new ol.geom.MultiPoint(feature.getGeometry().getCoordinates()[0]);
-        } else if (feature.getGeometry().getType() === "MultiPoint") {
-          return feature.getGeometry();
-        } else if (feature.getGeometry().getType() === "MultiLineString") {
-          return new ol.geom.MultiPoint(feature.getGeometry().getCoordinates()[0]);
-        } else if (feature.getGeometry().getType() === "MultiPolygon") {
-          return new ol.geom.MultiPoint(feature.getGeometry().getCoordinates()[0][0]);
+    _defineProperty(_this, "editStyle", function (feature) {
+      var geometryFunction = function geometryFunction(f) {
+        if (f.getGeometry().getType() === "Point") {
+          return new ol.geom.MultiPoint([f.getGeometry().getCoordinates()]);
+        } else if (f.getGeometry().getType() === "LineString") {
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates());
+        } else if (f.getGeometry().getType() === "Polygon") {
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0]);
+        } else if (f.getGeometry().getType() === "MultiPoint") {
+          return f.getGeometry();
+        } else if (f.getGeometry().getType() === "MultiLineString") {
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0]);
+        } else if (f.getGeometry().getType() === "MultiPolygon") {
+          return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0][0]);
         }
-        return feature.getGeometry();
+        return f.getGeometry();
       };
-      return [FeatureStyles.interaction(_this.props.editContext.geometryStyle), FeatureStyles.interactionVertex(_objectSpread({
+      return [FeatureStyles.interaction(feature, _this.props.editContext.geometryStyle), FeatureStyles.interactionVertex(_objectSpread({
         geometryFunction: geometryFunction
-      }, _this.props.editContext.vertexStyle))];
+      }, _this.props.editContext.vertexStyle))].flat();
     });
     _defineProperty(_this, "createLayer", function () {
       var source = new ol.source.Vector();
       _this.layer = new ol.layer.Vector({
         source: source,
         zIndex: 1000000,
-        style: _this.editStyle()
+        style: _this.editStyle
       });
       _this.props.map.addLayer(_this.layer);
     });
@@ -88,10 +89,11 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         condition: function condition(event) {
           return event.originalEvent.buttons === 1;
         },
-        style: _this.editStyle()
+        style: _this.editStyle
       });
       drawInteraction.on('drawstart', function (evt) {
         _this.currentFeature = evt.feature;
+        _this.currentFeature.on('change', _this.updateMeasurements);
       }, _this);
       drawInteraction.on('drawend', function () {
         _this.setState({
@@ -112,6 +114,8 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
       _this.createLayer();
       var format = new ol.format.GeoJSON();
       _this.currentFeature = format.readFeature(_this.props.editContext.feature);
+      _this.currentFeature.on('change', _this.updateMeasurements);
+      _this.updateMeasurements();
       _this.layer.getSource().addFeature(_this.currentFeature);
       var modifyInteraction = new ol.interaction.Modify({
         features: new ol.Collection([_this.currentFeature]),
@@ -134,6 +138,23 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
       _this.props.map.addInteraction(modifyInteraction);
       _this.interaction = modifyInteraction;
     });
+    _defineProperty(_this, "updateMeasurements", function () {
+      var _this$props$editConte;
+      if (!_this.currentFeature) {
+        return;
+      } else if (!((_this$props$editConte = _this.props.editContext.measurements) !== null && _this$props$editConte !== void 0 && _this$props$editConte.showmeasurements)) {
+        _this.currentFeature.set('measurements', undefined);
+        _this.currentFeature.set('segment_labels', undefined);
+        _this.currentFeature.set('label', undefined);
+      } else {
+        var settings = {
+          displayCrs: _this.props.displayCrs,
+          lenUnit: _this.props.editContext.measurements.lenUnit,
+          areaUnit: _this.props.editContext.measurements.areaUnit
+        };
+        MeasureUtils.updateFeatureMeasurements(_this.currentFeature, _this.props.editContext.geomType, _this.props.mapCrs, settings);
+      }
+    });
     _defineProperty(_this, "commitCurrentFeature", function () {
       if (!_this.currentFeature) {
         return;
@@ -161,6 +182,9 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
         _this.props.map.removeInteraction(_this.interaction);
       }
       _this.interaction = null;
+      if (_this.currentFeature) {
+        _this.currentFeature.un('change', _this.updateMeasurements);
+      }
       _this.currentFeature = null;
       if (_this.layer) {
         _this.props.map.removeLayer(_this.layer);
@@ -178,6 +202,8 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
     value: function componentDidUpdate(prevProps) {
       if (this.props.editContext === prevProps.editContext) {
         // pass
+      } else if (this.props.editContext.measurements !== prevProps.editContext.measurements) {
+        this.updateMeasurements();
       } else if (this.props.editContext.action === 'Pick' && this.props.editContext.feature) {
         // If a feature without geometry was picked, enter draw mode, otherwise enter edit mode
         if (!this.props.editContext.feature.geometry && this.props.editContext.geomType) {
@@ -213,13 +239,17 @@ var EditingSupport = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(EditingSupport, "propTypes", {
+  displayCrs: PropTypes.string,
   editContext: PropTypes.object,
   map: PropTypes.object,
+  mapCrs: PropTypes.string,
   setEditContext: PropTypes.func
 });
 export default connect(function (state) {
   return {
-    editContext: state.editing.contexts[state.editing.currentContext] || {}
+    editContext: state.editing.contexts[state.editing.currentContext] || {},
+    displayCrs: state.map.displayCrs,
+    mapCrs: state.map.projection
   };
 }, {
   setEditContext: setEditContext

package/plugins/map/RedliningSupport.js

@@ -189,7 +189,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       _this.blockOnChange = false;
     });
     _defineProperty(_this, "toggleFeatureMeasurements", function (feature) {
-      if (_this.props.redlining.measurements) {
+      if (_this.props.redlining.showmeasurements) {
         var settings = {
           displayCrs: _this.props.displayCrs,
           lenUnit: _this.props.redlining.lenUnit,
@@ -854,7 +854,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
           this.selectedFeatures.forEach(this.updateFeatureStyle);
         }
         // Update current feature measurements
-        if (this.props.redlining.measurements !== prevProps.redlining.measurements) {
+        if (this.props.redlining.showmeasurements !== prevProps.redlining.showmeasurements) {
           this.selectedFeatures.forEach(this.toggleFeatureMeasurements);
         } else if (this.props.map.displayCrs !== prevProps.map.displayCrs || this.props.redlining.lenUnit !== prevProps.redlining.lenUnit || this.props.redlining.areaUnit !== prevProps.redlining.areaUnit) {
           this.selectedFeatures.forEach(function (feature) {

package/plugins/map/SnapSupport.js

@@ -74,13 +74,13 @@ var SnapSupport = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "getFeature", function () {
       _this.timeoutId = null;
-      var layers = _this.props.layers.find(function (layer) {
-        return layer.role === LayerRole.THEME;
+      var layer = _this.props.layers.find(function (l) {
+        return l.role === LayerRole.THEME;
       });
-      var queryLayers = _this.props.layers.reduce(function (accum, layer) {
-        return layer.role === LayerRole.THEME ? accum.concat(layer.queryLayers) : accum;
+      var queryLayers = _this.props.layers.reduce(function (accum, l) {
+        return l.role === LayerRole.THEME ? accum.concat(l.queryLayers) : accum;
       }, []).join(",");
-      if (!layers || !queryLayers) {
+      if (!layer || !queryLayers) {
         return;
       }
       var options = {
@@ -90,11 +90,11 @@ var SnapSupport = /*#__PURE__*/function (_React$Component) {
         FI_LINE_TOLERANCE: 8,
         FI_POLYGON_TOLERANCE: 4
       };
-      var request = IdentifyUtils.buildRequest(layers, queryLayers, _this.state.mousePos.coordinate, _this.props.mapObj, options);
+      var request = IdentifyUtils.buildRequest(layer, queryLayers, _this.state.mousePos.coordinate, _this.props.mapObj, options);
       axios.get(request.url, {
         params: request.params
       }).then(function (response) {
-        var results = IdentifyUtils.parseXmlResponse(response.data, _this.props.mapObj.projection, layers);
+        var results = IdentifyUtils.parseXmlResponse(response.data, _this.props.mapObj.projection, layer);
         var features = [];
         results.forEach(function (result) {
           var _iterator2 = _createForOfIteratorHelper(result),
@@ -159,9 +159,11 @@ var SnapSupport = /*#__PURE__*/function (_React$Component) {
     _this.snapLayer = new ol.layer.Vector({
       source: _this.snapSource,
       zIndex: 1000000,
-      style: [FeatureStyles.interaction({}, true), FeatureStyles.interactionVertex({
-        geometryFunction: geometryFunction
-      }, true)]
+      style: function style(feature) {
+        return [FeatureStyles.interaction(feature, {}, true), FeatureStyles.interactionVertex({
+          geometryFunction: geometryFunction
+        }, true)].flat();
+      }
     });
     _this.props.map.addLayer(_this.snapLayer);
     _this.curPos = null;

package/plugins/map/style/SnappingSupport.css

@@ -1,13 +1,6 @@
 div.snapping-toolbar {
-    display: inline-flex;
+    display: flex;
     align-items: center;
-    line-height: 1.5em;
-    position: relative;
-    padding: 0.25em 0.5em;
-    order: 0;
-    background-color: var(--container-bg-color);
-    box-shadow: 0px -2px 4px rgba(136, 136, 136, 0.5);
-    border-bottom: 1px solid rgba(136, 136, 136, 0.5);
 }
 
 div.snapping-toolbar-container div.spinner {

package/plugins/map3d/Draw3D.js

@@ -174,7 +174,7 @@ var Draw3D = /*#__PURE__*/function (_React$Component) {
       }]];
       var editButtons = [{
         key: "Pick",
-        tooltip: LocaleUtils.tr("draw3d.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "nodetool",
         data: {
           action: "Pick",
@@ -182,7 +182,7 @@ var Draw3D = /*#__PURE__*/function (_React$Component) {
         }
       }, {
         key: "Delete",
-        tooltip: LocaleUtils.tr("draw3d.delete"),
+        tooltip: LocaleUtils.tr("common.delete"),
         icon: "trash",
         data: {
           action: "Delete",

package/plugins/map3d/ExportObjects3D.js

@@ -107,7 +107,7 @@ var ExportObjects3D = /*#__PURE__*/function (_React$Component) {
         onSubmit: _this.exportArea
       }, /*#__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", {
         name: "FORMAT",
         onChange: _this.formatChanged,
         value: _this.state.selectedFormat
@@ -127,7 +127,7 @@ var ExportObjects3D = /*#__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, "restart", function () {
       if (_this.abortController) {

package/plugins/map3d/MapExport3D.js

@@ -191,7 +191,7 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
         onSubmit: _this["export"]
       }, /*#__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", {
         name: "FORMAT",
         onChange: _this.formatChanged,
         value: _this.state.selectedFormat
@@ -211,7 +211,7 @@ var MapExport3D = /*#__PURE__*/function (_React$Component) {
           key: item.name,
           value: item.name
         }, item.name.split('/').pop());
-      })))) : null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.resolution")), /*#__PURE__*/React.createElement("td", null, resolutionChooser)), _this.state.selectedFormat === 'application/pdf' ? (((_this$state$layout2 = _this.state.layout) === null || _this$state$layout2 === void 0 ? void 0 : _this$state$layout2.labels) || []).map(function (label) {
+      })))) : null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.resolution")), /*#__PURE__*/React.createElement("td", null, resolutionChooser)), _this.state.selectedFormat === 'application/pdf' ? (((_this$state$layout2 = _this.state.layout) === null || _this$state$layout2 === void 0 ? void 0 : _this$state$layout2.labels) || []).map(function (label) {
         var _this$props$theme$pri4;
         // Omit labels which start with __
         if (label.startsWith("__")) {
@@ -278,7 +278,7 @@ var MapExport3D = /*#__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, "onFrameChanged", function (frame) {
       var x = frame.x,
@@ -450,7 +450,7 @@ var MapExport3D = /*#__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 minMaxIcon = this.state.minimized ? 'chevron-down' : 'chevron-up';
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "mapexport-minimize-maximize",

package/reducers/editing.js

@@ -52,7 +52,12 @@ export default function editing() {
             feature: null,
             changed: false,
             mapPrefix: null,
-            editConfig: null
+            editConfig: null,
+            measurements: {
+              showmeasurements: false,
+              lenUnit: 'metric',
+              areaUnit: 'metric'
+            }
           }, state.contexts[action.contextId]), action.editContext), {}, {
             geomNonZeroZ: checkNonZeroZ(state.contexts[action.contextId], action.editContext),
             geomReadOnly: checkGeomReadOnly(editConfig),