qwc2 2026.5.6 → 2026.5.10

package/icons/label.svg

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="label.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="17.488266"
+     inkscape:cy="13.037281"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1172"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     units="px"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4231"
+       originx="0"
+       originy="0"
+       spacingy="1"
+       spacingx="1"
+       units="px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.65)">
+    <path
+       style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;stroke-linecap:round;stroke-linejoin:round;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 4.3007813,292.43097 c -1.8095107,0 -3.30078138,1.48932 -3.3007813,3.29883 v 11 c -8e-8,1.80951 1.4912706,3.30078 3.3007813,3.30078 h 3.4882812 c 0.2921367,6e-5 0.5708031,0.11566 0.7773437,0.32227 l 1.8789068,1.87695 a 1.10011,1.10011 0 0 0 0,0.002 c 0.849893,0.84964 2.259481,0.84964 3.109375,0 a 1.10011,1.10011 0 0 0 0,-0.002 l 1.878906,-1.87695 c 0.20654,-0.20661 0.485207,-0.32221 0.777344,-0.32227 h 3.488281 C 21.508729,310.03058 23,308.53931 23,306.7298 v -11 c 0,-1.80951 -1.491271,-3.29883 -3.300781,-3.29883 z m 0,2.19922 H 19.699219 c 0.620542,0 1.101562,0.47907 1.101562,1.09961 v 11 c 0,0.62054 -0.48102,1.10156 -1.101562,1.10156 h -3.488281 c -0.874721,1.9e-4 -1.715558,0.34818 -2.333985,0.9668 L 12,310.67511 10.123047,308.79816 c -0.6184275,-0.61862 -1.459264,-0.96661 -2.3339845,-0.9668 H 4.3007813 c -0.6205423,0 -1.1015626,-0.48102 -1.1015625,-1.10156 v -11 c -1e-7,-0.62054 0.4810202,-1.09961 1.1015625,-1.09961 z"
+       id="path1" />
+  </g>
+</svg>

package/package.json

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

package/plugins/MapExport.js

@@ -351,7 +351,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
       params.WIDTH = width;
       params.HEIGHT = height;
       params.filename = fileName;
-      params.FILTER_GEOM = VectorLayerUtils.geoJSONGeomToWkt(VectorLayerUtils.reprojectGeometry(_this.props.filter.filterGeom, _this.props.map.projection, crs));
+      params.FILTER_GEOM = _this.props.filter.filterGeom ? VectorLayerUtils.geoJSONGeomToWkt(VectorLayerUtils.reprojectGeometry(_this.props.filter.filterGeom, _this.props.map.projection, crs)) : "";
 
       // Dimension values
       _this.props.layers.forEach(function (layer) {

package/plugins/Redlining.js

@@ -257,7 +257,8 @@ var Redlining = /*#__PURE__*/function (_React$Component) {
       for (var _i = 0, _Object$values = Object.values(_this.props.plugins || {}); _i < _Object$values.length; _i++) {
         var plugin = _Object$values[_i];
         if (toolEnabled(plugin.cfg.key)) {
-          editButtons.push(_objectSpread(_objectSpread({}, plugin.cfg), {}, {
+          var buttonGroup = plugin.cfg.tooltype === 'draw' ? drawButtons : editButtons;
+          buttonGroup.push(_objectSpread(_objectSpread({}, plugin.cfg), {}, {
             tooltip: plugin.cfg.tooltip ? LocaleUtils.tr(plugin.cfg.tooltip) : undefined
           }));
         }
@@ -638,7 +639,7 @@ _defineProperty(Redlining, "propTypes", {
   defaultTextFillColor: PropTypes.array,
   /** Default text outline color. In format `[r, g, b, a]`. */
   defaultTextOutlineColor: PropTypes.array,
-  /** Tools to hide. Available tools: `Circle`, `Ellipse`, `Square`, `Box`, `HandDrawing`, `Transform`, `NumericInput`, `Buffer`, `Export`. */
+  /** Tools to hide. Available tools: `Circle`, `Ellipse`, `Square`, `Box`, `HandDrawing`, `Transform`, `NumericInput`, `Buffer`, `FeatureLabel`, `Export`. */
   hiddenTools: PropTypes.array,
   layers: PropTypes.array,
   mapCrs: PropTypes.string,

package/plugins/map/RedliningSupport.js

@@ -176,11 +176,12 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, isText ? "textOutlineColor" : "borderColor", styleOptions.strokeColor), "strokeDash", styleOptions.strokeDash), "size", (styleOptions.strokeWidth - 1) * 2), isText ? "textFillColor" : "fillColor", styleOptions.fillColor), "text", label), "headmarker", styleOptions.headmarker), "tailmarker", styleOptions.tailmarker);
     });
     _defineProperty(_this, "updateFeatureStyle", function (feature) {
+      var _feature$get;
       _this.blockOnChange = true;
       var styleProps = _this.props.redlining.style;
       var isText = feature.get("shape") === "Text";
-      var styleName = isText ? "text" : "default";
-      var opts = _this.styleOptions(styleProps, isText);
+      var styleName = (_feature$get = feature.get("styleName")) !== null && _feature$get !== void 0 ? _feature$get : isText ? "text" : "default";
+      var opts = _objectSpread(_objectSpread({}, feature.get('styleOptions')), _this.styleOptions(styleProps, isText));
       if (!feature.get('measurements') && _this.selectedFeatures.length <= 1 && !(isText && !styleProps.text)) {
         feature.set('label', styleProps.text);
       }
@@ -220,13 +221,16 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "styleFunction", function (feature) {
       var styleOptions = feature.get("styleOptions");
       var styleName = feature.get("styleName");
+      var shape = feature.get('shape');
       var styles = [];
-      if (styleName === "text") {
+      styles.push.apply(styles, _toConsumableArray(FeatureStyles[styleName](feature, styleOptions)));
+      if (shape === "Text") {
         styles.push(_this.selectedTextStyle(feature, styleOptions));
       }
-      styles.push.apply(styles, _toConsumableArray(FeatureStyles[styleName](feature, styleOptions)));
-      var shape = feature.get('shape');
       var geomTypeConfig = GeomTypeConfig[shape];
+      if (shape === "Text" && styleName === "textlabel") {
+        styles.push(_this.selectedTextStyle(feature, styleOptions));
+      }
       if ((geomTypeConfig || {}).drawNodes !== false) {
         styles.push(_this.selectedStyle);
       }
@@ -618,8 +622,7 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       }
     });
     _defineProperty(_this, "deselectFeature", function (feature, updateState) {
-      var styleName = feature.get("shape") === "Text" ? "text" : "default";
-      var style = FeatureStyles[styleName](feature, feature.get('styleOptions'));
+      var style = FeatureStyles[feature.get("styleName")](feature, feature.get('styleOptions'));
       feature.setStyle(style);
       feature.un('change', _this.updateMeasurements);
       _this.selectedFeatures = _this.selectedFeatures.filter(function (f) {

package/plugins/redlining/RedliningFeatureLabelSupport.js

@@ -0,0 +1,261 @@
+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 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; }
+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 _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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Copyright 2026 Sourcepole AG
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import { addLayer, addLayerFeatures, removeLayerFeatures, removeLayer, LayerRole } from '../../actions/layers';
+import Icon from '../../components/Icon';
+import PickFeature from '../../components/PickFeature';
+import ComboBox from '../../components/widgets/ComboBox';
+import TextInput from '../../components/widgets/TextInput';
+import { parseExpression } from '../../utils/EditingUtils';
+import LocaleUtils from '../../utils/LocaleUtils';
+import VectorLayerUtils from '../../utils/VectorLayerUtils';
+var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
+  function RedliningFeatureLabelSupport() {
+    var _this;
+    _classCallCheck(this, RedliningFeatureLabelSupport);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, RedliningFeatureLabelSupport, [].concat(args));
+    _defineProperty(_this, "state", {
+      cur: null,
+      currentProfile: null
+    });
+    _defineProperty(_this, "featurePicked", function (layer, feature, map) {
+      var _this$props$layers$fi, _this$props$layers$fi2;
+      var sellayer = {
+        id: "__redliningfeaturelabelhighlight",
+        role: LayerRole.SELECTION
+      };
+      _this.props.addLayerFeatures(sellayer, [feature], true);
+      var profiles = _toConsumableArray((_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (l) {
+        return l.wms_name === map;
+      })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.labelProfiles) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2[layer]) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : []);
+      profiles.push({
+        name: "__custom",
+        expression: "",
+        title: LocaleUtils.tr("common.custom")
+      });
+      _this.setState({
+        cur: {
+          layer: layer,
+          feature: feature,
+          map: map,
+          profiles: profiles
+        },
+        currentProfile: profiles[0].name
+      }, _this.updateLabelFeature);
+    });
+    _defineProperty(_this, "setCurrentProfile", function (value) {
+      _this.setState({
+        currentProfile: value
+      }, _this.updateLabelFeature);
+    });
+    _defineProperty(_this, "setProfileExpression", function (value) {
+      _this.setState(function (state) {
+        return {
+          cur: _objectSpread(_objectSpread({}, state.cur), {}, {
+            profiles: state.cur.profiles.map(function (profile) {
+              return _objectSpread(_objectSpread({}, profile), {}, {
+                expression: profile.name === state.currentProfile ? value : profile.expression
+              });
+            })
+          })
+        };
+      }, _this.updateLabelFeature);
+    });
+    _defineProperty(_this, "updateLabelFeature", function () {
+      var _this$props$layers$fi3;
+      var cur = _this.state.cur;
+      var layer = {
+        id: _this.props.redlining.layer,
+        title: _this.props.redlining.layerTitle,
+        role: LayerRole.USERLAYER
+      };
+      var featureId = "label::".concat(cur.map, "::").concat(cur.layer, "::").concat(cur.feature.id);
+      var expression = cur.profiles.find(function (profile) {
+        return profile.name === _this.state.currentProfile;
+      }).expression;
+      if (!expression) {
+        _this.props.removeLayerFeatures(layer, [featureId]);
+        return;
+      }
+      var fakeEditConfig = {
+        layerName: _this.state.cur.layer
+      };
+      var text = parseExpression(expression, _this.state.cur.feature, fakeEditConfig, null, _this.state.cur.map, _this.props.projection, _this.updateLabelFeature);
+      if (text === null) {
+        text = expression;
+      } else {
+        text = String(text);
+      }
+      var center = VectorLayerUtils.getFeatureCenter(_this.state.cur.feature);
+      var feature = (((_this$props$layers$fi3 = _this.props.layers.find(function (l) {
+        return l.id === _this.props.redlining.layer;
+      })) === null || _this$props$layers$fi3 === void 0 ? void 0 : _this$props$layers$fi3.features) || []).find(function (f) {
+        return f.id === featureId;
+      });
+      if (feature) {
+        feature = _objectSpread(_objectSpread({}, feature), {}, {
+          properties: {
+            label: text
+          }
+        });
+      } else {
+        feature = {
+          id: featureId,
+          type: "Feature",
+          geometry: {
+            type: "Point",
+            coordinates: center
+          },
+          properties: {
+            label: text
+          },
+          shape: "Text",
+          styleName: "textlabel",
+          styleOptions: {
+            strokeWidth: 2,
+            fillColor: [255, 255, 255, 1],
+            textFillColor: [0, 0, 0, 1],
+            strokeColor: [0, 0, 0, 1],
+            strokeDash: [],
+            anchor: center
+          }
+        };
+      }
+      _this.props.addLayerFeatures(layer, [feature]);
+    });
+    return _this;
+  }
+  _inherits(RedliningFeatureLabelSupport, _React$Component);
+  return _createClass(RedliningFeatureLabelSupport, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (this.props.redlining.action !== "FeatureLabel" && prevProps.redlining.action === "FeatureLabel") {
+        this.setState({
+          cur: null,
+          currentProfile: null
+        });
+        this.props.removeLayer("__redliningfeaturelabelhighlight");
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.props.removeLayer("__redliningfeaturelabelhighlight");
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this2 = this;
+      var control = null;
+      if (this.state.cur) {
+        var selectedProfile = this.state.cur.profiles.find(function (profile) {
+          return profile.name === _this2.state.currentProfile;
+        });
+        var isCustomProfile = this.state.currentProfile === "__custom";
+        control = /*#__PURE__*/React.createElement("div", {
+          className: "controlgroup",
+          key: "Control"
+        }, this.state.cur.profiles.length > 1 ? /*#__PURE__*/React.createElement(ComboBox, {
+          onChange: this.setCurrentProfile,
+          value: this.state.currentProfile
+        }, this.state.cur.profiles.map(function (profile) {
+          var _profile$title;
+          return /*#__PURE__*/React.createElement("div", {
+            key: profile.name,
+            value: profile.name
+          }, (_profile$title = profile.title) !== null && _profile$title !== void 0 ? _profile$title : profile.name);
+        })) : null, /*#__PURE__*/React.createElement(TextInput, {
+          className: "controlgroup-expanditem",
+          multiline: true,
+          onChange: this.setProfileExpression,
+          placeholder: "'Text: ' || \"fieldname\"",
+          readOnly: !isCustomProfile,
+          value: selectedProfile === null || selectedProfile === void 0 ? void 0 : selectedProfile.expression
+        }), isCustomProfile ? /*#__PURE__*/React.createElement("button", {
+          className: "button",
+          type: "button"
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "ok"
+        })) : null);
+      } else {
+        control = /*#__PURE__*/React.createElement("div", {
+          className: "redlining-message",
+          key: "Control"
+        }, LocaleUtils.tr("redlining.labelselectfeature"));
+      }
+      return [control, /*#__PURE__*/React.createElement(PickFeature, {
+        featurePicked: this.featurePicked,
+        key: "FeaturePicker",
+        layerFilterFunc: function layerFilterFunc(layer) {
+          return layer.type === "wms";
+        }
+      })];
+    }
+  }]);
+}(React.Component);
+_defineProperty(RedliningFeatureLabelSupport, "propTypes", {
+  addLayer: PropTypes.func,
+  addLayerFeatures: PropTypes.func,
+  layers: PropTypes.array,
+  projection: PropTypes.string,
+  redlining: PropTypes.object,
+  removeLayer: PropTypes.func,
+  removeLayerFeatures: PropTypes.func
+});
+export default {
+  cfg: {
+    key: "FeatureLabel",
+    tooltip: LocaleUtils.trmsg("redlining.featurelabel"),
+    tooltype: "draw",
+    icon: "label",
+    data: {
+      action: "FeatureLabel",
+      geomType: null
+    }
+  },
+  controls: connect(function (state) {
+    return {
+      projection: state.map.projection,
+      layers: state.layers.flat,
+      redlining: state.redlining
+    };
+  }, {
+    addLayerFeatures: addLayerFeatures,
+    removeLayer: removeLayer,
+    removeLayerFeatures: removeLayerFeatures,
+    addLayer: addLayer
+  })(RedliningFeatureLabelSupport)
+};

package/plugins/style/Redlining.css

@@ -5,7 +5,10 @@ div.redlining-controlsbar {
 
 div.redlining-groupcontrol {
     flex: 0 0 auto;
-    margin: 0 0.125em;
+}
+
+div.redlining-groupcontrol:not(:last-child) {
+    margin-right: 0.25em;
 }
 
 div.redlining-groupcontrol > div:first-child {

package/static/translations/bg-BG.json

@@ -123,6 +123,7 @@
       "clone": "",
       "close": "Затвори",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "Изтриване на",
       "download": "Изтегляне",
@@ -567,8 +568,10 @@
       "ctrlhint": "",
       "draw": "Начертайте",
       "edit": "Редактиране на",
+      "featurelabel": "",
       "freehand": "Рисуване със свободна ръка",
       "label": "Етикет",
+      "labelselectfeature": "",
       "layer": "Слой",
       "layertitle": "Redlining",
       "markers": "Маркери",

package/static/translations/ca-ES.json

@@ -123,6 +123,7 @@
       "clone": "Clonar",
       "close": "Tancar",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "Eliminar",
       "download": "Descarregar",
@@ -567,8 +568,10 @@
       "ctrlhint": "Utilitza Ctrl per a la multiselecció...",
       "draw": "Dibuixa",
       "edit": "Edita",
+      "featurelabel": "",
       "freehand": "Dibuix a mà alçada",
       "label": "Etiqueta",
+      "labelselectfeature": "",
       "layer": "Capa",
       "layertitle": "Redlining",
       "markers": "Marcadors",

package/static/translations/cs-CZ.json

@@ -123,6 +123,7 @@
       "clone": "",
       "close": "Zavřít",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "",
       "download": "",
@@ -567,8 +568,10 @@
       "ctrlhint": "",
       "draw": "",
       "edit": "",
+      "featurelabel": "",
       "freehand": "",
       "label": "Popisek",
+      "labelselectfeature": "",
       "layer": "Vrstva",
       "layertitle": "",
       "markers": "",

package/static/translations/de-CH.json

@@ -123,6 +123,7 @@
       "clone": "Kopieren",
       "close": "Schliessen",
       "compute": "Berenchnen",
+      "custom": "Benutzerdefiniert",
       "date": "Datum",
       "delete": "Löschen",
       "download": "Herunterladen",
@@ -567,8 +568,10 @@
       "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "draw": "Zeichnen",
       "edit": "Bearbeiten",
+      "featurelabel": "Objekt beschriften",
       "freehand": "Freihand",
       "label": "Beschriftung",
+      "labelselectfeature": "Zu beschrieftendes Objekt auswählen...",
       "layer": "Ebene",
       "layertitle": "Zeichnung",
       "markers": "Spitzen",

package/static/translations/de-DE.json

@@ -123,6 +123,7 @@
       "clone": "Kopieren",
       "close": "Schließen",
       "compute": "Berechnen",
+      "custom": "Benutzerdefiniert",
       "date": "Datum",
       "delete": "Löschen",
       "download": "Herunterladen",
@@ -567,8 +568,10 @@
       "ctrlhint": "Mehrfachselektion mit Ctrl...",
       "draw": "Zeichnen",
       "edit": "Bearbeiten",
+      "featurelabel": "Objekt beschriften",
       "freehand": "Freihand",
       "label": "Beschriftung",
+      "labelselectfeature": "Zu beschrieftendes Objekt auswählen...",
       "layer": "Ebene",
       "layertitle": "Zeichnung",
       "markers": "Spitzen",

package/static/translations/en-US.json

@@ -123,6 +123,7 @@
       "clone": "Clone",
       "close": "Close",
       "compute": "Compute",
+      "custom": "Custom",
       "date": "Date",
       "delete": "Delete",
       "download": "Download",
@@ -567,8 +568,10 @@
       "ctrlhint": "Use Ctrl for multiselection...",
       "draw": "Draw",
       "edit": "Edit",
+      "featurelabel": "Label feature",
       "freehand": "Freehand drawing",
       "label": "Label",
+      "labelselectfeature": "Select a feature to label...",
       "layer": "Layer",
       "layertitle": "Redlining",
       "markers": "Markers",

package/static/translations/es-ES.json

@@ -123,6 +123,7 @@
       "clone": "Clonar",
       "close": "Cerrar",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "Eliminar",
       "download": "Descargar",
@@ -567,8 +568,10 @@
       "ctrlhint": "Abrir con Ctrl+Click",
       "draw": "Dibujar",
       "edit": "Editar",
+      "featurelabel": "",
       "freehand": "Dibujo a mano alzada",
       "label": "Etiqueta",
+      "labelselectfeature": "",
       "layer": "Capa",
       "layertitle": "Línea de demarcación",
       "markers": "Marcadores",

package/static/translations/fi-FI.json

@@ -123,6 +123,7 @@
       "clone": "",
       "close": "",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "",
       "download": "",
@@ -567,8 +568,10 @@
       "ctrlhint": "",
       "draw": "Piirrä",
       "edit": "Editoi",
+      "featurelabel": "",
       "freehand": "Vapaa piirto",
       "label": "Selite",
+      "labelselectfeature": "",
       "layer": "Taso",
       "layertitle": "",
       "markers": "",

package/static/translations/fr-FR.json

@@ -123,6 +123,7 @@
       "clone": "Copier",
       "close": "Fermer",
       "compute": "Calculer",
+      "custom": "Personnalisé",
       "date": "Date",
       "delete": "Effacer",
       "download": "Télécharger",
@@ -567,8 +568,10 @@
       "ctrlhint": "Ctrl pour sélection multiple...",
       "draw": "Dessiner",
       "edit": "Editer",
+      "featurelabel": "Étiqueter objet",
       "freehand": "Dessin à main libre",
       "label": "Texte",
+      "labelselectfeature": "Sélectionner l'objet à étiqueter...",
       "layer": "Couche",
       "layertitle": "Dessin",
       "markers": "Pointes",

package/static/translations/hu-HU.json

@@ -123,6 +123,7 @@
       "clone": "",
       "close": "",
       "compute": "",
+      "custom": "",
       "date": "",
       "delete": "",
       "download": "",
@@ -567,8 +568,10 @@
       "ctrlhint": "",
       "draw": "",
       "edit": "",
+      "featurelabel": "",
       "freehand": "",
       "label": "Címke",
+      "labelselectfeature": "",
       "layer": "",
       "layertitle": "",
       "markers": "",

package/static/translations/it-IT.json

@@ -123,6 +123,7 @@
       "clone": "Copia",
       "close": "Chiudi",
       "compute": "Calcola",
+      "custom": "Personalizzato",
       "date": "Data",
       "delete": "Elimina",
       "download": "Scarica",
@@ -567,8 +568,10 @@
       "ctrlhint": "Ctrl per selezione multipla...",
       "draw": "Disegna",
       "edit": "Modifica",
+      "featurelabel": "Ettichetta oggetto",
       "freehand": "Mano libera",
       "label": "Ettichetta",
+      "labelselectfeature": "Selezionare oggetto da ettichettare...",
       "layer": "Layer",
       "layertitle": "Disegno",
       "markers": "Punte",