qwc2 2026.8.28 → 2026.8.31

package/components/AttributeTableWidget.js

@@ -216,7 +216,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var forceReload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var stateChange = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       _this.setState(function (state) {
-        var _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
+        var _this$props$layers$fi, _this$props$layers$fi2, _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
         selectedLayer = selectedLayer || state.selectedLayer;
         var _selectedLayer$split = selectedLayer.split("#"),
           _selectedLayer$split2 = _slicedToArray(_selectedLayer$split, 2),
@@ -224,27 +224,27 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           layerName = _selectedLayer$split2[1];
         var newState = _objectSpread(_objectSpread({}, state), stateChange);
         var editConfig = _this.props.editConfigs[wmsName][layerName];
+        var fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
+          return layer.wms_name === wmsName;
+        })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         var fields = (_this.props.showDisplayFieldOnly ? editConfig.fields.filter(function (field) {
           return field.name === editConfig.displayField;
         }) : editConfig.fields.filter(function (field) {
           var _field$constraints;
           return _this.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true;
         })).map(function (field) {
+          var _fieldTranslations$fi;
           return _objectSpread(_objectSpread({}, field), {}, {
-            name: _this.translateFieldName(field.name)
+            name: (_fieldTranslations$fi = fieldTranslations === null || fieldTranslations === void 0 ? void 0 : fieldTranslations[field.name]) !== null && _fieldTranslations$fi !== void 0 ? _fieldTranslations$fi : field.name
           });
         });
         if (selectedLayer !== state.loadedLayer) {
-          var _this$props$layers$fi, _this$props$layers$fi2;
           KeyValCache.clear();
           FeatureCache.clear();
           Object.assign(newState, AttributeTableWidget.defaultState);
           newState.limitToExtent = state.limitToExtent;
           newState.curEditConfig = editConfig;
           newState.curFields = fields;
-          newState.fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
-            return layer.wms_name === wmsName;
-          })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         }
         newState.selectedLayer = selectedLayer;
         newState.selectedFeatures = {};
@@ -707,10 +707,6 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         }, options);
       }
     });
-    _defineProperty(_this, "translateFieldName", function (fieldName) {
-      var _this$state$fieldTran, _this$state$fieldTran2;
-      return (_this$state$fieldTran = (_this$state$fieldTran2 = _this.state.fieldTranslations) === null || _this$state$fieldTran2 === void 0 ? void 0 : _this$state$fieldTran2[fieldName]) !== null && _this$state$fieldTran !== void 0 ? _this$state$fieldTran : fieldName;
-    });
     _this.changedFiles = {};
     _this.state = AttributeTableWidget.defaultState;
     _this.table = null;
@@ -886,12 +882,14 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           value: ""
         }, LocaleUtils.tr("common.select")), showIdColumn ? /*#__PURE__*/React.createElement("div", {
           value: "<id>"
-        }, this.translateFieldName(primaryKey)) : null, this.state.curFields.map(function (field) {
+        }, this.state.curFields.find(function (field) {
+          return field.id === primaryKey;
+        }).name) : null, this.state.curFields.map(function (field) {
           if (field.id !== primaryKey) {
             return /*#__PURE__*/React.createElement("option", {
               key: field.id,
               value: field.id
-            }, _this2.translateFieldName(field.name));
+            }, field.name);
           }
           return null;
         })), /*#__PURE__*/React.createElement(ComboBox, {
@@ -1129,7 +1127,6 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   loadedLayer: "",
   curEditConfig: null,
   curFields: null,
-  fieldTranslations: null,
   features: [],
   allFeatures: null,
   totFeatureCount: 0,

package/components/IdentifyViewer.js

@@ -45,6 +45,7 @@ import { LayerRole, addLayerFeatures, removeLayer, changeLayerProperty } from '.
 import { zoomToPoint, zoomToExtent } from '../actions/map';
 import { openExternalUrl } from '../actions/windows';
 import ConfigUtils from '../utils/ConfigUtils';
+import { defaultHighlightStyle } from '../utils/FeatureStyles';
 import { IdentifyExporters } from '../utils/IdentifyExporters';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
@@ -136,15 +137,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "setHighlightedFeatures", function (features) {
-      if (isEmpty(features)) {
-        if (!isEmpty(_this.state.tableSelection)) {
-          features = Object.values(_this.state.tableSelection).map(function (sel) {
-            return Object.values(sel);
-          }).flat();
-        } else if (_this.props.highlightAllResults) {
-          var resultTree = _this.state.selectedLayer !== '' ? _defineProperty({}, _this.state.selectedLayer, _this.state.resultTree[_this.state.selectedLayer]) : _this.state.resultTree;
-          features = Object.values(resultTree).flat();
-        }
+      if (isEmpty(features) && !isEmpty(_this.state.tableSelection)) {
+        features = Object.values(_this.state.tableSelection).map(function (sel) {
+          return Object.values(sel);
+        }).flat();
       }
       if (!isEmpty(features)) {
         features = features.filter(function (f) {
@@ -156,12 +152,13 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           };
         });
         var layer = {
-          id: "__identifyviewerhighlight",
-          role: LayerRole.SELECTION
+          id: "__identifyhighlight",
+          role: LayerRole.SELECTION,
+          styleOptions: defaultHighlightStyle()
         };
         _this.props.addLayerFeatures(layer, features, true);
       } else {
-        _this.props.removeLayer("__identifyviewerhighlight");
+        _this.props.removeLayer("__identifyhighlight");
       }
     });
     _defineProperty(_this, "removeResultLayer", function (layerid) {
@@ -205,10 +202,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var clipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var filteredResults = {};
       if (!isEmpty(_this.state.tableSelection)) {
-        filteredResults = Object.fromEntries(Object.entries(_this.state.tableSelection).map(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            layerid = _ref5[0],
-            entries = _ref5[1];
+        filteredResults = Object.fromEntries(Object.entries(_this.state.tableSelection).map(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 2),
+            layerid = _ref4[0],
+            entries = _ref4[1];
           return [layerid, Object.values(entries)];
         }));
       } else if (_this.state.selectedResults.size() > 0) {
@@ -246,10 +243,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
       if (exporter) {
         if (!_this.props.exportGeometry) {
-          json = Object.entries(json).reduce(function (res, _ref7) {
-            var _ref8 = _slicedToArray(_ref7, 2),
-              layerId = _ref8[0],
-              features = _ref8[1];
+          json = Object.entries(json).reduce(function (res, _ref6) {
+            var _ref7 = _slicedToArray(_ref6, 2),
+              layerId = _ref7[0],
+              features = _ref7[1];
             return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layerId, features.map(function (feature) {
               return MiscUtils.objectOmit(feature, ['geometry']);
             })));
@@ -277,10 +274,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         style: {
           maxHeight: _this.state.currentResult ? '10em' : 'initial'
         }
-      }, Object.entries(_this.state.resultTree).map(function (_ref9) {
-        var _ref0 = _slicedToArray(_ref9, 2),
-          layerid = _ref0[0],
-          features = _ref0[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref8) {
+        var _ref9 = _slicedToArray(_ref8, 2),
+          layerid = _ref9[0],
+          features = _ref9[1];
         if (features.length === 0) {
           return null;
         }
@@ -561,19 +558,19 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderResultsTable", function () {
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-results-tables"
-      }, Object.entries(_this.state.resultTree).map(function (_ref1) {
-        var _ref10 = _slicedToArray(_ref1, 2),
-          layerid = _ref10[0],
-          features = _ref10[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref0) {
+        var _ref1 = _slicedToArray(_ref0, 2),
+          layerid = _ref1[0],
+          features = _ref1[1];
         if (features.length === 0 || _this.state.selectedLayer && layerid !== _this.state.selectedLayer) {
           return null;
         }
         var fields = {};
         features.map(function (feature) {
-          Object.entries(feature.properties).map(function (_ref11) {
-            var _ref12 = _slicedToArray(_ref11, 2),
-              attr = _ref12[0],
-              value = _ref12[1];
+          Object.entries(feature.properties).map(function (_ref10) {
+            var _ref11 = _slicedToArray(_ref10, 2),
+              attr = _ref11[0],
+              value = _ref11[1];
             if (!(attr in fields) && !['htmlContent', 'htmlContentInline'].includes(attr)) {
               fields[attr] = {
                 id: attr,
@@ -843,10 +840,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref14) {
-        var _ref15 = _slicedToArray(_ref14, 2),
-          layername = _ref15[0],
-          reports = _ref15[1];
+      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref13) {
+        var _ref14 = _slicedToArray(_ref13, 2),
+          layername = _ref14[0],
+          reports = _ref14[1];
         return reports.map(function (report, idx) {
           return /*#__PURE__*/React.createElement("option", {
             key: layername + "::" + idx,
@@ -1127,14 +1124,23 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         this.scrollIntoView = false;
         this.currentResultElRef = null;
       }
-      // Ensure currentPage is in range
       if (this.state.resultTree !== prevState.resultTree || this.state.selectedLayer !== prevState.selectedLayer) {
+        // Ensure currentPage is in range
         var count = Object.values(this.state.selectedLayer !== '' ? _defineProperty({}, this.state.selectedLayer, this.state.resultTree[this.state.selectedLayer]) : this.state.resultTree).flat().length;
         this.setState(function (state) {
           return {
             currentPage: Math.max(0, Math.min(state.currentPage, count - 1))
           };
         });
+        // Highlight features
+        if (this.props.highlightAllResults) {
+          var resultTree = this.state.selectedLayer !== '' ? _defineProperty({}, this.state.selectedLayer, this.state.resultTree[this.state.selectedLayer]) : this.state.resultTree;
+          var layer = {
+            id: "__identifyselection",
+            role: LayerRole.SELECTION
+          };
+          this.props.addLayerFeatures(layer, Object.values(resultTree).flat(), true);
+        }
       }
       if (this.state.multiViewEnabled !== prevState.multiViewEnabled) {
         this.computePageSize(this.bodyEl.getBoundingClientRect());
@@ -1144,7 +1150,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.props.innerRef(null);
-      this.props.removeLayer("__identifyviewerhighlight");
+      this.props.removeLayer("__identifyselection");
+      this.props.removeLayer("__identifyhighlight");
       unregisterPermalinkDataStoreHook("identifyresultstate");
     }
   }, {
@@ -1267,6 +1274,7 @@ _defineProperty(IdentifyViewer, "defaultProps", {
     return value;
   },
   enableAggregatedReports: true,
+  innerRef: function innerRef() {},
   resultDisplayMode: 'flat',
   resultGridSize: 200,
   resultMultiDisplay: false,

package/components/SearchBox.js

@@ -52,6 +52,7 @@ import { openExternalUrl, showNotification } from '../actions/windows';
 import searchProvidersSelector from '../selectors/searchproviders';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
+import { defaultHighlightStyle } from '../utils/FeatureStyles';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
@@ -1083,7 +1084,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
               label: label
             }),
             styleName: 'default',
-            styleOptions: _this.props.searchOptions.highlightStyle || {}
+            styleOptions: _objectSpread(_objectSpread({}, defaultHighlightStyle()), _this.props.searchOptions.highlightStyle)
           }));
         }
         if (showMarkers) {

package/package.json

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

package/plugins/MapFilter.js

@@ -54,6 +54,7 @@ import TextInput from '../components/widgets/TextInput';
 import ToggleSwitch from '../components/widgets/ToggleSwitch';
 import ConfigUtils from '../utils/ConfigUtils';
 import DataServiceExprUtils from '../utils/DataServiceExprUtils';
+import { defaultHighlightStyle } from '../utils/FeatureStyles';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
@@ -800,7 +801,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           });
         },
         featurePicked: this.filterGeomPicked,
-        highlightStyle: this.props.highlightStyle,
+        highlightStyle: _objectSpread(_objectSpread({}, defaultHighlightStyle()), this.props.highlightStyle),
         key: "FeaturePicker"
       }) : null, /*#__PURE__*/React.createElement(MapSelection, {
         active: taskActive && !!selGeomType,
@@ -847,11 +848,7 @@ _defineProperty(MapFilter, "propTypes", {
 _defineProperty(MapFilter, "defaultProps", {
   allowFilterByTime: true,
   position: 5,
-  predefinedFilters: [],
-  highlightStyle: {
-    strokeColor: [0, 0, 0],
-    fillColor: [255, 255, 0, 0.25]
-  }
+  predefinedFilters: []
 });
 export default connect(function (state) {
   return {

package/utils/FeatureStyles.js

@@ -36,6 +36,12 @@ var DEFAULT_FEATURE_STYLE = {
   textStroke: "white",
   textFont: "11pt sans-serif"
 };
+var DEFAULT_HIGHLIGHT_STYLE = _objectSpread(_objectSpread({}, DEFAULT_FEATURE_STYLE), {}, {
+  strokeColor: [255, 255, 0, 1],
+  strokeWidth: 2,
+  strokeDash: [],
+  fillColor: [255, 255, 0, 0.25]
+});
 var DEFAULT_MARKER_STYLE = {
   iconAnchor: [0.5, 1],
   opacity: 1,
@@ -92,11 +98,20 @@ export var END_MARKERS = {
     baserotation: 0
   }
 };
+export function defaultFeatureStyle() {
+  return _objectSpread(_objectSpread({}, DEFAULT_FEATURE_STYLE), ConfigUtils.getConfigProp("defaultFeatureStyle"));
+}
+export function defaultHighlightStyle() {
+  return _objectSpread(_objectSpread({}, DEFAULT_HIGHLIGHT_STYLE), ConfigUtils.getConfigProp("defaultHighlightStyle"));
+}
+export function defaultInteractionStyle() {
+  return _objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle"));
+}
 export function computeFeatureStyle(layer, feature) {
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, DEFAULT_FEATURE_STYLE), ConfigUtils.getConfigProp("defaultFeatureStyle")), layer.styleOptions), feature.styleOptions);
+  return _objectSpread(_objectSpread(_objectSpread({}, defaultFeatureStyle()), layer.styleOptions), feature.styleOptions);
 }
 export function computeMeasureFeatureStyle(markerOpts) {
-  var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), markerOpts);
+  var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), markerOpts);
   return {
     circleRadius: opts.measurePointRadius,
     strokeColor: opts.measureStrokeColor,
@@ -111,7 +126,7 @@ export function computeMeasureFeatureStyle(markerOpts) {
   };
 }
 var defaultStyle = function defaultStyle(feature, options) {
-  var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_FEATURE_STYLE), ConfigUtils.getConfigProp("defaultFeatureStyle")), options);
+  var opts = _objectSpread(_objectSpread({}, defaultFeatureStyle()), options);
   var styles = [];
   styles.push(new ol.style.Style({
     fill: new ol.style.Fill({
@@ -285,7 +300,7 @@ export default {
     })];
   },
   interaction: function interaction(feature, options, isSnap) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     var styleOptions = isSnap ? {
       strokeColor: opts.snapStrokeColor,
       strokeWidth: opts.snapStrokeWidth,
@@ -300,7 +315,7 @@ export default {
     return defaultStyle(feature, styleOptions);
   },
   interactionVertex: function interactionVertex(options, isSnap) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     var strokeWidth = opts.strokeWidth;
     var vertexFill = opts.vertexFillColor;
     var vertexStroke = opts.vertexStrokeColor;
@@ -332,7 +347,7 @@ export default {
     });
   },
   measureInteractionVertex: function measureInteractionVertex(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       image: new ol.style.Circle({
         radius: opts.measurePointRadius,
@@ -348,7 +363,7 @@ export default {
     });
   },
   sketchInteraction: function sketchInteraction(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       image: new ol.style.Circle({
         fill: new ol.style.Fill({
@@ -363,7 +378,7 @@ export default {
     });
   },
   printInteraction: function printInteraction(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       geometry: opts.geometryFunction,
       fill: new ol.style.Fill({
@@ -376,7 +391,7 @@ export default {
     });
   },
   printInteractionVertex: function printInteractionVertex(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       geometry: opts.geometryFunction,
       image: new ol.style.Circle({
@@ -392,7 +407,7 @@ export default {
     });
   },
   printInteractionBackground: function printInteractionBackground(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       geometry: opts.geometryFunction,
       fill: new ol.style.Fill({
@@ -401,7 +416,7 @@ export default {
     });
   },
   printInteractionSeries: function printInteractionSeries(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return new ol.style.Style({
       geometry: opts.geometryFunction,
       stroke: new ol.style.Stroke({
@@ -411,7 +426,7 @@ export default {
     });
   },
   printInteractionSeriesIcon: function printInteractionSeriesIcon(options) {
-    var opts = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_INTERACTION_STYLE), ConfigUtils.getConfigProp("defaultInteractionStyle")), options);
+    var opts = _objectSpread(_objectSpread({}, defaultInteractionStyle()), options);
     return [new ol.style.Style({
       geometry: opts.geometryFunction,
       image: new ol.style.Circle({