qwc2 2026.5.7 → 2026.5.10

package/package.json

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

package/plugins/map/RedliningSupport.js

@@ -223,11 +223,14 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
       var styleName = feature.get("styleName");
       var shape = feature.get('shape');
       var styles = [];
+      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 geomTypeConfig = GeomTypeConfig[shape];
+      if (shape === "Text" && styleName === "textlabel") {
+        styles.push(_this.selectedTextStyle(feature, styleOptions));
+      }
       if ((geomTypeConfig || {}).drawNodes !== false) {
         styles.push(_this.selectedStyle);
       }

package/plugins/redlining/RedliningFeatureLabelSupport.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { addLayer, addLayerFeatures, LayerRole } from '../../actions/layers';
+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';
@@ -53,6 +53,11 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
     });
     _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 : []);
@@ -92,23 +97,29 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
     _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);
+      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 layer = {
-        id: _this.props.redlining.layer,
-        title: _this.props.redlining.layerTitle,
-        role: LayerRole.USERLAYER
-      };
       var center = VectorLayerUtils.getFeatureCenter(_this.state.cur.feature);
-      var featureId = "label::".concat(cur.map, "::").concat(cur.layer, "::").concat(cur.feature.id);
       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) {
@@ -136,6 +147,7 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
           styleOptions: {
             strokeWidth: 2,
             fillColor: [255, 255, 255, 1],
+            textFillColor: [0, 0, 0, 1],
             strokeColor: [0, 0, 0, 1],
             strokeDash: [],
             anchor: center
@@ -155,8 +167,14 @@ var RedliningFeatureLabelSupport = /*#__PURE__*/function (_React$Component) {
           cur: null,
           currentProfile: null
         });
+        this.props.removeLayer("__redliningfeaturelabelhighlight");
       }
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.props.removeLayer("__redliningfeaturelabelhighlight");
+    }
   }, {
     key: "render",
     value: function render() {
@@ -213,7 +231,9 @@ _defineProperty(RedliningFeatureLabelSupport, "propTypes", {
   addLayerFeatures: PropTypes.func,
   layers: PropTypes.array,
   projection: PropTypes.string,
-  redlining: PropTypes.object
+  redlining: PropTypes.object,
+  removeLayer: PropTypes.func,
+  removeLayerFeatures: PropTypes.func
 });
 export default {
   cfg: {
@@ -234,6 +254,8 @@ export default {
     };
   }, {
     addLayerFeatures: addLayerFeatures,
+    removeLayer: removeLayer,
+    removeLayerFeatures: removeLayerFeatures,
     addLayer: addLayer
   })(RedliningFeatureLabelSupport)
 };

package/utils/EditingInterface.js

@@ -419,7 +419,7 @@ var EditingInterface = {
   },
   /**
    * Query key-value-pairs of a key-value-relation
-   * @param keyvalues The keyval string `<keyvaldataset>:<keyfield>:<valuefield>`
+   * @param keyvalues Comma separated list of keyvalue tables of the form `<keyvaldataset>:<keyfield>:<valuefield>`
    * @param callback Callback invoked with the key-value pairs, taking `{keyvalues: {<keyvaldataset>: [{key: <key>, value: <value>}]}}` on success and `{}` on failure
    * @param filter An optional filter expression, as `[[["<name>", "<op>", <value>],"and|or",["<name>","<op>",<value>],...]]` (one filter expr per keyvalue entry)
    */

package/utils/EditingUtils.js

@@ -32,8 +32,10 @@ import { v5 as uuidv5 } from 'uuid';
 import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
 import grammar from './expr_grammar/grammar';
+import IdentifyUtils from './IdentifyUtils';
 import LocaleUtils from './LocaleUtils';
 import MiscUtils from './MiscUtils';
+import VectorLayerUtils from './VectorLayerUtils';
 var UUID_NS = '5ae5531d-8e21-4456-b45d-77e9840a5bb7';
 export var FeatureCache = /*#__PURE__*/_createClass(function FeatureCache() {
   _classCallCheck(this, FeatureCache);
@@ -169,6 +171,48 @@ function _representValue(attr, editConfig, editIface, promises) {
     return (_keyvals$value = keyvals[value]) !== null && _keyvals$value !== void 0 ? _keyvals$value : value;
   }
 }
+function _overlayIntersects(feature, mapPrefix, mapCrs, args, promises) {
+  var _overlayIntersects$__;
+  _overlayIntersects.__cache__ = (_overlayIntersects$__ = _overlayIntersects.__cache__) !== null && _overlayIntersects$__ !== void 0 ? _overlayIntersects$__ : {};
+  var state = StandardApp.store.getState();
+  var layer = state.layers.flat.find(function (l) {
+    return l.wms_name === mapPrefix;
+  });
+  var layerName = args[0];
+  var filter = args[1] ? "".concat(layerName, ":").concat(args[1]) : undefined;
+  var geometry = feature.geometry;
+  if (feature.geometry.type.endsWith("Point")) {
+    var p = feature.geometry.coordinates;
+    if (feature.geometry.type === "MultiPoint") {
+      p = p[0];
+    }
+    geometry = {
+      type: "Polygon",
+      coordinates: [[[p[0] - 0.1, p[1] - 0.1], [p[0] + 0.1, p[1] - 0.1], [p[0] + 0.1, p[1] + 0.1], [p[0] - 0.1, p[1] + 0.1], [p[0] - 0.1, p[1] - 0.1]]]
+    };
+  }
+  var extraParams = {
+    with_geometry: false,
+    feature_count: 1,
+    FILTER: filter
+  };
+  var request = IdentifyUtils.buildFilterRequest(layer, layerName, VectorLayerUtils.geoJSONGeomToWkt(geometry), {
+    projection: mapCrs
+  }, extraParams);
+  var key = uuidv5(JSON.stringify(request.params), UUID_NS);
+  if (key in _overlayIntersects.__cache__) {
+    return _overlayIntersects.__cache__[key];
+  }
+  promises.push(new Promise(function (resolve) {
+    IdentifyUtils.sendRequest(request, function (response) {
+      var _features$layerName;
+      var features = IdentifyUtils.parseResponse(response, layerName, request.params.info_format, null, mapCrs);
+      _overlayIntersects.__cache__[key] = ((_features$layerName = features[layerName]) !== null && _features$layerName !== void 0 ? _features$layerName : []).length > 0;
+      resolve();
+    });
+  }));
+  return null;
+}
 export function parseExpression(expr, feature, editConfig, editIface, mapPrefix, mapCrs, reevaluateCallback) {
   var asFilter = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
   var reevaluate = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
@@ -184,6 +228,9 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
     representValue: function representValue(attr) {
       return _representValue(attr, editConfig, editIface, promises);
     },
+    overlayIntersects: function overlayIntersects(layer) {
+      return _overlayIntersects(feature, mapPrefix, mapCrs, layer, promises);
+    },
     formatDate: MiscUtils.formatDate,
     asFilter: asFilter,
     username: ConfigUtils.getConfigProp("username"),
@@ -233,6 +280,9 @@ export function parseExpressionsAsync(fieldExpressions, feature, editConfig, edi
       representValue: function representValue(attr) {
         return _representValue(attr, editConfig, editIface, promises);
       },
+      overlayIntersects: function overlayIntersects(layer) {
+        return _overlayIntersects(feature, mapPrefix, mapCrs, layer, promises);
+      },
       asFilter: asFilter,
       username: ConfigUtils.getConfigProp("username"),
       layer: editConfig.layerName,

package/utils/expr_grammar/grammar.js

@@ -3476,6 +3476,58 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N$string$85",
+      "symbols": [{
+        "literal": "o"
+      }, {
+        "literal": "v"
+      }, {
+        "literal": "e"
+      }, {
+        "literal": "r"
+      }, {
+        "literal": "l"
+      }, {
+        "literal": "a"
+      }, {
+        "literal": "y"
+      }, {
+        "literal": "_"
+      }, {
+        "literal": "i"
+      }, {
+        "literal": "n"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "e"
+      }, {
+        "literal": "r"
+      }, {
+        "literal": "s"
+      }, {
+        "literal": "e"
+      }, {
+        "literal": "c"
+      }, {
+        "literal": "t"
+      }, {
+        "literal": "s"
+      }],
+      "postprocess": function joiner(d) {
+        return d.join('');
+      }
+    }, {
+      "name": "N",
+      "symbols": ["N$string$85", "_", {
+        "literal": "("
+      }, "_", "var_args", "_", {
+        "literal": ")"
+      }],
+      "postprocess": function postprocess(d) {
+        return window.qwc2ExpressionParserContext.overlayIntersects(d[4]);
+      }
+    }, {
+      "name": "N$string$86",
       "symbols": [{
         "literal": "m"
       }, {
@@ -3488,7 +3540,7 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$85", "_", {
+      "symbols": ["N$string$86", "_", {
         "literal": "("
       }, "_", "var_args", "_", {
         "literal": ")"
@@ -3561,7 +3613,7 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
         return true;
       }
     }, {
-      "name": "N$string$86",
+      "name": "N$string$87",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3584,12 +3636,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$86"],
+      "symbols": ["N$string$87"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.feature;
       }
     }, {
-      "name": "N$string$87",
+      "name": "N$string$88",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3614,13 +3666,13 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$87"],
+      "symbols": ["N$string$88"],
       "postprocess": function postprocess(d) {
         var _window$qwc2Expressio5;
         return (_window$qwc2Expressio5 = window.qwc2ExpressionParserContext.feature) === null || _window$qwc2Expressio5 === void 0 ? void 0 : _window$qwc2Expressio5.geometry;
       }
     }, {
-      "name": "N$string$88",
+      "name": "N$string$89",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3633,13 +3685,13 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$88"],
+      "symbols": ["N$string$89"],
       "postprocess": function postprocess(d) {
         var _window$qwc2Expressio6;
         return (_window$qwc2Expressio6 = window.qwc2ExpressionParserContext.feature) === null || _window$qwc2Expressio6 === void 0 ? void 0 : _window$qwc2Expressio6.id;
       }
     }, {
-      "name": "N$string$89",
+      "name": "N$string$90",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3658,12 +3710,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$89"],
+      "symbols": ["N$string$90"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.layer;
       }
     }, {
-      "name": "N$string$90",
+      "name": "N$string$91",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3692,12 +3744,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$90"],
+      "symbols": ["N$string$91"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.layer;
       }
     }, {
-      "name": "N$string$91",
+      "name": "N$string$92",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3724,12 +3776,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$91"],
+      "symbols": ["N$string$92"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.projection;
       }
     }, {
-      "name": "N$string$92",
+      "name": "N$string$93",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3770,12 +3822,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$92"],
+      "symbols": ["N$string$93"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.mapPrefix;
       }
     }, {
-      "name": "N$string$93",
+      "name": "N$string$94",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3806,12 +3858,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$93"],
+      "symbols": ["N$string$94"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.projection;
       }
     }, {
-      "name": "N$string$94",
+      "name": "N$string$95",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3842,12 +3894,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$94"],
+      "symbols": ["N$string$95"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.lang;
       }
     }, {
-      "name": "N$string$95",
+      "name": "N$string$96",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3890,12 +3942,12 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$95"],
+      "symbols": ["N$string$96"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.username;
       }
     }, {
-      "name": "N$string$96",
+      "name": "N$string$97",
       "symbols": [{
         "literal": "@"
       }, {
@@ -3932,7 +3984,7 @@ function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? O
       }
     }, {
       "name": "N",
-      "symbols": ["N$string$96"],
+      "symbols": ["N$string$97"],
       "postprocess": function postprocess(d) {
         return window.qwc2ExpressionParserContext.username;
       }

package/utils/expr_grammar/grammar.ne

@@ -183,6 +183,7 @@ N -> float                         {% id %}
     | "string_to_array" _ "(" _ P0 _ ")"                   {% function(d) { return d[4].split(","); } %}
     | "string_to_array" _ "(" _ P0 _ "," _ P1 _ ")"        {% function(d) { return d[4].split(d[8]); } %}
     | "string_to_array" _ "(" _ P0 _ "," _ P1 _ "," _ P2 _ ")" {% function(d) { return d[4].split(d[8]).map(x => String(x).length === 0 ? d[12] : x); } %}
+    | "overlay_intersects" _ "(" _ var_args _ ")"          {% function(d) { return window.qwc2ExpressionParserContext.overlayIntersects(d[4]); } %}
     | "map" _ "(" _ var_args _ ")"                         {% function(d) { return Object.fromValues(Array.from({length: d[4].length / 2 }, (_, i) => [d[4][2 * i], d[4][2 * i + 1]])); } %}
     | "PI"i                        {% function(d) { return Math.PI; } %}
     | "E"i                         {% function(d) { return Math.E; } %}