qwc2 2025.12.15 → 2025.12.17

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.17",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

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

@@ -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
           });
         }
@@ -507,6 +508,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,6 +525,7 @@ _defineProperty(Identify, "defaultProps", {
   customExporters: [],
   longAttributesDisplay: 'ellipsis',
   resultDisplayMode: 'flat',
+  resultGridSize: 200,
   replaceImageUrls: true,
   featureInfoReturnsLayerName: true,
   geometry: {

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

@@ -52,7 +52,8 @@ var Measure = /*#__PURE__*/function (_React$Component) {
         bearingHeadMarker: _this.props.bearingHeadMarker,
         bearingTailMarker: _this.props.bearingTailMarker,
         lineHeadMarker: _this.props.lineHeadMarker,
-        lineTailMarker: _this.props.lineTailMarker
+        lineTailMarker: _this.props.lineTailMarker,
+        markerScale: _this.props.markerScale
       });
       _this.props.setSnappingConfig(_this.props.snapping, _this.props.snappingActive);
     });
@@ -199,6 +200,8 @@ _defineProperty(Measure, "propTypes", {
   /** Tail marker of distance line measurement geometry. Can be one of `OUTARROW`, `INARROW`, `LINE`. */
   lineTailMarker: PropTypes.string,
   mapCrs: PropTypes.string,
+  /** Scale factor for all heade/tail markers. */
+  markerScale: PropTypes.number,
   measureState: PropTypes.object,
   setSnappingConfig: PropTypes.func,
   /** Whether to show the widget to switch between measure modes. */
@@ -210,6 +213,7 @@ _defineProperty(Measure, "propTypes", {
   snappingActive: PropTypes.oneOfType([PropTypes.bool, PropTypes.string])
 });
 _defineProperty(Measure, "defaultProps", {
+  markerScale: 1,
   showMeasureModeSwitcher: true,
   snapping: true,
   snappingActive: true

package/plugins/Print.js

@@ -1196,7 +1196,7 @@ _defineProperty(Print, "propTypes", {
   printExternalLayers: PropTypes.bool,
   /** Whether to print highlights on the map, e.g. selected features or redlining. */
   printMapHighlights: PropTypes.bool,
-  /** Restrict print scale to list of predefine print scales, if any. */
+  /** Restrict print scale to list of predefined print scales, if any. */
   restrictToPrintScales: PropTypes.bool,
   /** Scale factor to apply to line widths, font sizes, ... of redlining drawings passed to GetPrint.  */
   scaleFactor: PropTypes.number,

package/plugins/TopBar.js

@@ -243,6 +243,8 @@ _defineProperty(TopBar, "propTypes", {
   searchOptions: PropTypes.shape({
     /** Whether to show the search filter widget. */
     allowSearchFilters: PropTypes.bool,
+    /** Whether to focus the search field on startup. */
+    focusOnStartup: PropTypes.bool,
     /** Whether to hide the result labels on the map. */
     hideResultLabels: PropTypes.bool,
     /** The style used for highlighting search result geometries. */

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);
@@ -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,

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")

package/static/translations/bg-BG.json

@@ -268,11 +268,13 @@
       "featurecount": "",
       "layerall": "Всички слоеве",
       "link": "Връзка към",
+      "multiview": "",
       "noattributes": "Без атрибути",
       "noresults": "Няма налична информация за избраната точка",
       "querying": "Запитване...",
       "reportfail": "Неуспешно генериране на отчет",
       "results": "",
+      "selectforcompare": "",
       "selectreport": "",
       "title": "Информация за функциите"
     },
@@ -331,6 +333,7 @@
       "printlegend": "Легенда за печат",
       "separator": "Сепаратор",
       "separatortooltip": "Добавяне на разделител",
+      "togglegroup": "",
       "transparency": "Trasparency",
       "visiblefilter": "Филтриране на невидими слоеве",
       "zoomtolayer": "Увеличаване на слоя"
@@ -446,7 +449,9 @@
       "ctrlclickhint": "Отваряне с Ctrl+Click"
     },
     "navbar": {
-      "perpage": "на страница"
+      "next": "",
+      "perpage": "на страница",
+      "prev": ""
     },
     "newspopup": {
       "dialogclose": "Затвори",

package/static/translations/ca-ES.json

@@ -268,11 +268,13 @@
       "featurecount": "{0} element(s)",
       "layerall": "Totes les capes",
       "link": "Link",
+      "multiview": "",
       "noattributes": "Sense atributs",
       "noresults": "Sense informació disponible sobre el punt seleccionat",
       "querying": "Consultant...",
       "reportfail": "No s'ha pogut generar l'informe",
       "results": "Resultats",
+      "selectforcompare": "",
       "selectreport": "Seleccionar informe...",
       "title": "Informació del element"
     },
@@ -331,6 +333,7 @@
       "printlegend": "Imprimir llegenda",
       "separator": "Separador",
       "separatortooltip": "Afegir separador",
+      "togglegroup": "",
       "transparency": "Transparència",
       "visiblefilter": "Filtrar capes no visibles",
       "zoomtolayer": "Zoom a la capa"
@@ -446,7 +449,9 @@
       "ctrlclickhint": "Obrir amb Ctrl+Click"
     },
     "navbar": {
-      "perpage": "per pàgina"
+      "next": "",
+      "perpage": "per pàgina",
+      "prev": ""
     },
     "newspopup": {
       "dialogclose": "Tancar",

package/static/translations/cs-CZ.json

@@ -268,11 +268,13 @@
       "featurecount": "",
       "layerall": "",
       "link": "Odkaz",
+      "multiview": "",
       "noattributes": "Bez atributů",
       "noresults": "V tomto bodu nejsou k dispozici informace o žádném prvku",
       "querying": "Dotazování...",
       "reportfail": "",
       "results": "",
+      "selectforcompare": "",
       "selectreport": "",
       "title": "Informace o prvku"
     },
@@ -331,6 +333,7 @@
       "printlegend": "Tisk legendy",
       "separator": "",
       "separatortooltip": "",
+      "togglegroup": "",
       "transparency": "Průhlednost",
       "visiblefilter": "Skrýt nezobrazující se vrstvy",
       "zoomtolayer": "Vycentrovat na vrstvu"
@@ -446,7 +449,9 @@
       "ctrlclickhint": ""
     },
     "navbar": {
-      "perpage": "na stránku"
+      "next": "",
+      "perpage": "na stránku",
+      "prev": ""
     },
     "newspopup": {
       "dialogclose": "Zavřít",