qwc2 2025.12.15 → 2025.12.18

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

@@ -179,6 +179,7 @@ var MeasurementSupport = /*#__PURE__*/function (_React$Component) {
         opts.headmarker = _this.props.measurement.bearingHeadMarker;
         opts.tailmarker = _this.props.measurement.bearingTailMarker;
       }
+      opts.markerscale = _this.props.measurement.markerScale;
       return [].concat(_toConsumableArray(FeatureStyles.measureInteraction(feature, opts)), [FeatureStyles.measureInteractionVertex({
         geometryFunction: geometryFunction
       })]);

package/plugins/map/RedliningSupport.js

@@ -181,7 +181,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       var isText = feature.get("shape") === "Text";
       var styleName = isText ? "text" : "default";
       var opts = _this.styleOptions(styleProps, isText);
-      if (!feature.get('measurements')) {
+      if (!feature.get('measurements') && _this.selectedFeatures.length <= 1 && !(isText && !styleProps.text)) {
         feature.set('label', styleProps.text);
       }
       feature.set('styleName', styleName);
@@ -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,
@@ -559,7 +559,6 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         cloneIds.push(featureObj.id);
         return featureObj;
       });
-      _this.updateRedliningState(true);
       var layer = {
         id: _this.props.redlining.layer,
         title: _this.props.redlining.layerTitle,
@@ -570,7 +569,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         var features = cloneIds.map(function (id) {
           return l.getSource().getFeatureById(id);
         });
-        _this.selectFeatures(features);
+        _this.selectFeatures(features, false);
         while (_this.interactions.length > 0) {
           _this.props.map.removeInteraction(_this.interactions.shift());
         }
@@ -606,13 +605,16 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "selectFeatures", function (features) {
+      var updateState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var firstSelection = isEmpty(_this.selectedFeatures);
       features.forEach(function (feature) {
         feature.setStyle(_this.styleFunction);
         feature.on('change', _this.updateMeasurements);
         _this.selectedFeatures.push(feature);
       });
-      _this.updateRedliningState(firstSelection);
+      if (updateState) {
+        _this.updateRedliningState(firstSelection);
+      }
     });
     _defineProperty(_this, "deselectFeature", function (feature, updateState) {
       var styleName = feature.get("shape") === "Text" ? "text" : "default";
@@ -655,7 +657,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         return featureObj;
       }).filter(Boolean);
       if (isEmpty(featureObjects)) {
-        return null;
+        return [];
       }
       var layer = {
         id: redliningProps.layer,
@@ -852,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),

package/reducers/layers.js

@@ -1,10 +1,9 @@
 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 _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 _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 _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 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -175,20 +174,12 @@ export default function layers() {
           // Compress layers if possible
           _newLayers2 = LayerUtils.implodeLayers(LayerUtils.explodeLayers(_newLayers2));
         }
-        var _iterator = _createForOfIteratorHelper(_newLayers2),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var lyr = _step.value;
-            if (lyr.type === "wms") {
-              Object.assign(lyr, LayerUtils.buildWMSLayerParams(lyr, state.filter));
-            }
+        _newLayers2 = _newLayers2.map(function (layer) {
+          if (layer.type === "wms") {
+            return _objectSpread(_objectSpread({}, layer), LayerUtils.buildWMSLayerParams(layer, state.filter));
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
+          return layer;
+        });
         UrlParams.updateParams({
           l: LayerUtils.buildWMSLayerUrlParam(_newLayers2)
         });
@@ -208,21 +199,12 @@ export default function layers() {
       }
     case ADD_LAYER_SEPARATOR:
       {
-        var _newLayers3 = LayerUtils.insertSeparator(state.flat, action.title, action.afterLayerId, action.afterSublayerPath);
-        var _iterator2 = _createForOfIteratorHelper(_newLayers3),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var layer = _step2.value;
-            if (layer.type === "wms") {
-              Object.assign(layer, LayerUtils.buildWMSLayerParams(layer, state.filter));
-            }
+        var _newLayers3 = LayerUtils.insertSeparator(state.flat, action.title, action.afterLayerId, action.afterSublayerPath).map(function (layer) {
+          if (layer.type === "wms") {
+            return _objectSpread(_objectSpread({}, layer), LayerUtils.buildWMSLayerParams(layer, state.filter));
           }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
+          return layer;
+        });
         UrlParams.updateParams({
           l: LayerUtils.buildWMSLayerUrlParam(_newLayers3)
         });
@@ -232,30 +214,30 @@ export default function layers() {
       }
     case REMOVE_LAYER:
       {
-        var _layer = state.flat.find(function (l) {
+        var layer = state.flat.find(function (l) {
           return l.id === action.layerId;
         });
-        if (!_layer) {
+        if (!layer) {
           return state;
         }
         var _newLayers4 = state.flat;
         var _newEditConfigs = state.editConfigs;
-        if (_layer.role === LayerRole.BACKGROUND || isEmpty(action.sublayerpath)) {
+        if (layer.role === LayerRole.BACKGROUND || isEmpty(action.sublayerpath)) {
           var position = state.flat.findIndex(function (l) {
             return l.id === action.layerId;
           });
           _newLayers4 = _toConsumableArray(_newLayers4);
           _newLayers4.splice(position, 1);
-          if (position > 0 && position < _newLayers4.length && _newLayers4[position - 1].id === _newLayers4[position].id) {
+          if (position > 0 && position < _newLayers4.length && _newLayers4[position - 1].url && _newLayers4[position - 1].url === _newLayers4[position].url) {
             // Compress layers
             _newLayers4 = LayerUtils.implodeLayers(LayerUtils.explodeLayers(_newLayers4));
           }
-          if (_newEditConfigs[_layer.wms_name]) {
+          if (_newEditConfigs[layer.wms_name]) {
             _newEditConfigs = _objectSpread({}, _newEditConfigs);
-            delete _newEditConfigs[_layer.wms_name];
+            delete _newEditConfigs[layer.wms_name];
           }
         } else {
-          _newLayers4 = LayerUtils.removeLayer(state.flat, _layer, action.sublayerpath).map(function (l) {
+          _newLayers4 = LayerUtils.removeLayer(state.flat, layer, action.sublayerpath).map(function (l) {
             if (l.type === "wms") {
               return _objectSpread(_objectSpread({}, l), LayerUtils.buildWMSLayerParams(l, state.filter));
             } else {

package/reducers/measurement.js

@@ -39,7 +39,8 @@ export default function measurement() {
           bearingHeadMarker: state.bearingHeadMarker,
           bearingTailMarker: state.bearingTailMarker,
           lineHeadMarker: state.lineHeadMarker,
-          lineTailMarker: state.lineTailMarker
+          lineTailMarker: state.lineTailMarker,
+          markerScale: state.markerScale
         }, action.data);
       }
     default:

package/scripts/wmts_config_generator.py

@@ -126,7 +126,7 @@ if not styleIdentifier:
             break
 
 # Resource URL
-tileUrl = None
+tileUrl = capabilitiesUrl.split("?")[0]
 for resourceURL in targetLayer.getElementsByTagName("ResourceURL"):
     if resourceURL.getAttribute("resourceType") == "tile":
         tileUrl = resourceURL.getAttribute("template")