qwc2 2026.4.21 → 2026.4.29

package/components/AttributeForm.js

@@ -44,7 +44,7 @@ import { refreshLayer } from '../actions/layers';
 import { setCurrentTaskBlocked } from '../actions/task';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
-import { getFeatureTemplate, parseExpressionsAsync } from '../utils/EditingUtils';
+import { FeatureCache, getFeatureTemplate, KeyValCache, parseExpressionsAsync } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import AutoEditForm from './AutoEditForm';
 import LinkFeatureForm from './LinkFeatureForm';
@@ -206,6 +206,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "updateField", function (key, value) {
+      var _this$props$editConte;
+      if (value === ((_this$props$editConte = _this.props.editContext.feature) === null || _this$props$editConte === void 0 || (_this$props$editConte = _this$props$editConte.properties) === null || _this$props$editConte === void 0 ? void 0 : _this$props$editConte[key])) {
+        return;
+      }
       var newProperties = _objectSpread(_objectSpread({}, _this.props.editContext.feature.properties), {}, _defineProperty({}, key, value));
       var newFeature = _objectSpread(_objectSpread({}, _this.props.editContext.feature), {}, {
         properties: newProperties
@@ -344,14 +348,15 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         changed: true
       });
     });
-    _defineProperty(_this, "editRelationRecord", function (action, layer, table, idx, displayField) {
-      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][table.split('.').slice(-1)];
-      var feature = _this.props.editContext.feature.relationValues[table].features[idx];
+    _defineProperty(_this, "editRelationRecord", function (action, layer, idx, displayField) {
+      var dataset = _this.props.editContext.mapPrefix + "." + layer;
+      var editConfig = _this.props.editConfigs[_this.props.editContext.mapPrefix][layer];
+      var feature = _this.props.editContext.feature.relationValues[dataset].features[idx];
       var childEdit = {
         action: action,
         editConfig: editConfig,
         editContextId: ':' + layer,
-        dataset: table,
+        dataset: dataset,
         idx: idx,
         feature: feature,
         finishCallback: _this.finishEditRelationRecord,
@@ -491,11 +496,11 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           var element = _this.form.elements.namedItem(key);
           if (element) {
             if (value === false) {
-              var _this$props$editConte, _this$props$editConte2;
+              var _this$props$editConte2, _this$props$editConte3;
               valid = false;
-              var reason = (_this$props$editConte = (_this$props$editConte2 = _this.props.editContext.editConfig.fields.find(function (field) {
+              var reason = (_this$props$editConte2 = (_this$props$editConte3 = _this.props.editContext.editConfig.fields.find(function (field) {
                 return field.id === key;
-              })) === null || _this$props$editConte2 === void 0 || (_this$props$editConte2 = _this$props$editConte2.constraints) === null || _this$props$editConte2 === void 0 ? void 0 : _this$props$editConte2.placeholder) !== null && _this$props$editConte !== void 0 ? _this$props$editConte : LocaleUtils.tr("editing.contraintviolation");
+              })) === null || _this$props$editConte3 === void 0 || (_this$props$editConte3 = _this$props$editConte3.constraints) === null || _this$props$editConte3 === void 0 ? void 0 : _this$props$editConte3.placeholder) !== null && _this$props$editConte2 !== void 0 ? _this$props$editConte2 : LocaleUtils.tr("editing.contraintviolation");
               reasons.push(reason);
               element.setCustomValidity(reason);
             } else {
@@ -876,7 +881,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           displayField: displayField,
           featureId: featureId,
           updateField: updateField,
-          finishCallback: _this.finishChildEdit
+          finishCallback: _this.finishChildEdit,
+          hideDelete: true
         };
         _this.setState({
           childEdit: childEdit
@@ -885,8 +891,8 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "finishChildEdit", function (feature) {
       _this.props.clearEditContext(_this.state.childEdit.editContextId, _this.props.editContext.id);
-      if (feature && feature.id !== _this.state.childEdit.featureId) {
-        _this.state.childEdit.updateField(feature.id);
+      if (feature) {
+        _this.state.childEdit.updateField(feature);
       }
       _this.setState({
         childEdit: null
@@ -921,6 +927,14 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         this.validateFieldConstraints(this.props.editContext.feature);
       }
     }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (!this.props.nested) {
+        KeyValCache.clear();
+        FeatureCache.clear();
+      }
+    }
   }]);
 }(React.Component);
 _defineProperty(AttributeForm, "propTypes", {
@@ -932,6 +946,7 @@ _defineProperty(AttributeForm, "propTypes", {
   hideDelete: PropTypes.bool,
   iface: PropTypes.object,
   map: PropTypes.object,
+  nested: PropTypes.bool,
   onCommit: PropTypes.func,
   onDelete: PropTypes.func,
   onDiscard: PropTypes.func,

package/components/EditComboField.js

@@ -30,6 +30,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { KeyValCache } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
+import Icon from './Icon';
+import ComboBox from './widgets/ComboBox';
 import './style/EditComboField.css';
 var EditComboField = /*#__PURE__*/function (_React$Component) {
   function EditComboField() {
@@ -91,27 +93,39 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "renderComboSelect", function () {
       var _this$props$placehold;
-      return /*#__PURE__*/React.createElement("select", {
-        disabled: _this.props.readOnly,
+      return /*#__PURE__*/React.createElement("div", {
+        className: "edit-single-select controlgroup"
+      }, /*#__PURE__*/React.createElement(ComboBox, {
+        className: "controlgroup-expanditem",
         name: _this.props.name,
-        onChange: function onChange(ev) {
-          return _this.props.updateField(_this.props.fieldId, ev.target.selectedIndex === 0 && _this.state.showPlaceholder ? null : ev.target.value);
+        onChange: function onChange(value) {
+          return _this.props.updateField(_this.props.fieldId, value);
         },
+        placeholder: _this.state.showPlaceholder ? (_this$props$placehold = _this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("common.select") : undefined,
         required: _this.props.required,
         style: _this.props.style,
         value: String(_this.props.value)
-      }, _this.state.showPlaceholder ? /*#__PURE__*/React.createElement("option", {
-        disabled: _this.props.required,
-        value: ""
-      }, (_this$props$placehold = _this.props.placeholder) !== null && _this$props$placehold !== void 0 ? _this$props$placehold : LocaleUtils.tr("common.select")) : null, _this.state.values.map(function (item, index) {
+      }, _this.state.values.map(function (item, index) {
         var _this$itemValueLabel2 = _this.itemValueLabel(item),
           value = _this$itemValueLabel2.value,
           label = _this$itemValueLabel2.label;
-        return /*#__PURE__*/React.createElement("option", {
+        return /*#__PURE__*/React.createElement("div", {
           key: _this.props.fieldId + index,
           value: String(value)
         }, label);
-      }));
+      })), _this.props.showEdit ? /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        onClick: _this.onEdit,
+        type: "button"
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "draw"
+      })) : null, _this.props.showAdd ? /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        onClick: _this.onAdd,
+        type: "button"
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "plus"
+      })) : null);
     });
     _defineProperty(_this, "itemValueLabel", function (item) {
       var value = "";
@@ -127,6 +141,25 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
         label: label
       };
     });
+    _defineProperty(_this, "onAdd", function () {
+      var parts = _this.props.keyvalrel.split(":");
+      _this.props.switchEditContext("Create", parts[0], null, _this.childContextDone, parts[2]);
+    });
+    _defineProperty(_this, "onEdit", function () {
+      var parts = _this.props.keyvalrel.split(":");
+      _this.props.switchEditContext("Edit", parts[0], _this.props.value, _this.childContextDone, parts[2]);
+    });
+    _defineProperty(_this, "childContextDone", function (feature) {
+      var _this$props$filterExp;
+      var parts = _this.props.keyvalrel.split(":");
+      KeyValCache.get(_this.props.editIface, _this.props.mapPrefix + "." + _this.props.keyvalrel, (_this$props$filterExp = _this.props.filterExpr) !== null && _this$props$filterExp !== void 0 ? _this$props$filterExp : null, true).then(function (values) {
+        _this.setState({
+          values: values,
+          showPlaceholder: !_this.hasEmptyValue(values)
+        });
+        _this.props.updateField(_this.props.fieldId, feature.properties[parts[1]]);
+      });
+    });
     return _this;
   }
   _inherits(EditComboField, _React$Component);
@@ -140,8 +173,8 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
           showPlaceholder: !this.hasEmptyValue(this.props.values)
         });
       } else if (this.props.keyvalrel) {
-        var _this$props$filterExp;
-        KeyValCache.get(this.props.editIface, this.props.keyvalrel, (_this$props$filterExp = this.props.filterExpr) !== null && _this$props$filterExp !== void 0 ? _this$props$filterExp : null).then(function (values) {
+        var _this$props$filterExp2;
+        KeyValCache.get(this.props.editIface, this.props.mapPrefix + "." + this.props.keyvalrel, (_this$props$filterExp2 = this.props.filterExpr) !== null && _this$props$filterExp2 !== void 0 ? _this$props$filterExp2 : null).then(function (values) {
           _this2.setState({
             values: values,
             showPlaceholder: !_this2.hasEmptyValue(values)
@@ -153,9 +186,15 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this3 = this;
-      if (this.props.keyvalrel && this.props.filterExpr !== prevProps.filterExpr) {
-        var _this$props$filterExp2;
-        KeyValCache.get(this.props.editIface, this.props.keyvalrel, (_this$props$filterExp2 = this.props.filterExpr) !== null && _this$props$filterExp2 !== void 0 ? _this$props$filterExp2 : null).then(function (values) {
+      if (this.props.values && this.props.values !== prevProps.values) {
+        // This does not handle the case a selected value has disappeared from values, caller should handle that
+        this.setState({
+          values: this.props.values,
+          showPlaceholder: !this.hasEmptyValue(this.props.values)
+        });
+      } else if (this.props.keyvalrel && this.props.filterExpr !== prevProps.filterExpr) {
+        var _this$props$filterExp3;
+        KeyValCache.get(this.props.editIface, this.props.mapPrefix + "." + this.props.keyvalrel, (_this$props$filterExp3 = this.props.filterExpr) !== null && _this$props$filterExp3 !== void 0 ? _this$props$filterExp3 : null).then(function (values) {
           _this3.setState({
             values: values,
             showPlaceholder: !_this3.hasEmptyValue(values)
@@ -179,12 +218,16 @@ _defineProperty(EditComboField, "propTypes", {
   fieldId: PropTypes.string,
   filterExpr: PropTypes.array,
   keyvalrel: PropTypes.string,
+  mapPrefix: PropTypes.string,
   multiSelect: PropTypes.bool,
   name: PropTypes.string,
   placeholder: PropTypes.string,
   readOnly: PropTypes.bool,
   required: PropTypes.bool,
+  showAdd: PropTypes.bool,
+  showEdit: PropTypes.bool,
   style: PropTypes.object,
+  switchEditContext: PropTypes.func,
   updateField: PropTypes.func,
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   values: PropTypes.array

package/components/LinkFeatureForm.js

@@ -65,9 +65,9 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
         }
       });
     });
-    _defineProperty(_this, "finish", function () {
+    _defineProperty(_this, "close", function () {
       var editContext = _this.props.editing.contexts[_this.props.editContextId];
-      _this.props.finished(editContext.feature);
+      _this.props.finished(editContext.action === 'Draw' ? null : editContext.feature);
     });
     _defineProperty(_this, "hoverFeature", function (feature) {
       var layer = {
@@ -194,13 +194,12 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
               return _this3.hoverFeature(feature);
             }
           }, (_feature$properties$_ = feature.properties[_this3.props.displayField]) !== null && _feature$properties$_ !== void 0 ? _feature$properties$_ : feature.id);
-        })), /*#__PURE__*/React.createElement("div", {
+        })), !editContext.changed && /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-close"
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
-          disabled: editContext.changed,
-          onClick: this.finish
-        }, LocaleUtils.tr("common.cancel"))));
+          onClick: this.close
+        }, LocaleUtils.tr("common.close"))));
       } else if (editContext.feature) {
         var drawing = editContext.action === 'Draw' && !editContext.feature.geometry && this.props.editConfig.geomType;
         return /*#__PURE__*/React.createElement("div", {
@@ -211,16 +210,16 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
           editContext: editContext,
           hideDelete: this.props.hideDelete,
           iface: this.props.iface,
+          nested: true,
           onDiscard: this.onDiscard,
           readOnly: this.props.readOnly,
           translations: this.props.translations
-        }), /*#__PURE__*/React.createElement("div", {
+        }), !editContext.changed && /*#__PURE__*/React.createElement("div", {
           className: "link-feature-form-close"
         }, /*#__PURE__*/React.createElement("button", {
           className: "button",
-          disabled: editContext.changed,
-          onClick: this.finish
-        }, drawing ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
+          onClick: this.close
+        }, editContext.action === 'Draw' ? LocaleUtils.tr("common.cancel") : LocaleUtils.tr("common.close"))));
       } else {
         return null;
       }

package/components/QtDesignerForm.js

@@ -37,7 +37,7 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { v4 as uuidv4 } from 'uuid';
 import ConfigUtils from '../utils/ConfigUtils';
-import { parseExpression, FeatureCache, KeyValCache } from '../utils/EditingUtils';
+import { parseExpression } from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import EditComboField from './EditComboField';
@@ -482,7 +482,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           var count = parts.length;
           var _fieldId = parts.slice(1, count - 3).join("__");
           value = (_fieldId2 = (feature.properties || [])[_fieldId]) !== null && _fieldId2 !== void 0 ? _fieldId2 : "";
-          var keyvalrel = _this.props.mapPrefix + "." + parts[count - 3] + ":" + parts[count - 2] + ":" + parts[count - 1];
+          var keyvalrel = parts[count - 3] + ":" + parts[count - 2] + ":" + parts[count - 1];
           var filterExpr = null;
           if (field !== null && field !== void 0 && field.filterExpression) {
             filterExpr = parseExpression(field.filterExpression, feature, editConfig, _this.props.iface, _this.props.mapPrefix, _this.props.mapCrs, function () {
@@ -497,12 +497,16 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             filterExpr: filterExpr,
             key: _fieldId,
             keyvalrel: keyvalrel,
+            mapPrefix: _this.props.mapPrefix,
             multiSelect: widget.property.allowMulti === true || widget.allowMulti === "true",
             name: nametransform(_fieldId),
             placeholder: inputConstraints.placeholder,
             readOnly: inputConstraints.readOnly || fieldConstraints.readOnly,
             required: inputConstraints.required || fieldConstraints.required,
+            showAdd: fieldConstraints.showAdd,
+            showEdit: fieldConstraints.showEdit,
             style: fontStyle,
+            switchEditContext: _this.props.switchEditContext,
             updateField: updateField,
             value: value
           });
@@ -650,7 +654,6 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
             value = (_feature$properties7 = feature.properties) === null || _feature$properties7 === void 0 ? void 0 : _feature$properties7[attrname];
             if (layer === reltable) {
               var index = parseInt(nametransform("").split("__")[1], 10); // Ugh..
-              var reldataset = _this.props.mapPrefix + "." + reltable;
               var displayField = attrname.split("__")[1];
               if (feature.__status__ !== "empty") {
                 var featurebuttons = [{
@@ -664,7 +667,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                   buttons: featurebuttons,
                   forceLabel: true,
                   onClick: function onClick() {
-                    return _this.props.editRelationRecord('Edit', reltable, reldataset, index, displayField);
+                    return _this.props.editRelationRecord('Edit', reltable, index, displayField);
                   }
                 }));
               } else {
@@ -685,7 +688,7 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                   buttons: _featurebuttons,
                   forceLabel: true,
                   onClick: function onClick(action) {
-                    return _this.props.editRelationRecord(action, reltable, reldataset, index, displayField);
+                    return _this.props.editRelationRecord(action, reltable, index, displayField);
                   }
                 });
               }
@@ -701,8 +704,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                 }, /*#__PURE__*/React.createElement(ButtonBar, {
                   buttons: _featurebuttons2,
                   onClick: function onClick() {
-                    return _this.props.switchEditContext('Edit', layer, value, function (v) {
-                      return updateField(attrname, v);
+                    return _this.props.switchEditContext('Edit', layer, value, function (f) {
+                      return updateField(attrname, f.id);
                     }, attrname);
                   }
                 }), /*#__PURE__*/React.createElement("button", {
@@ -727,8 +730,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
                 return /*#__PURE__*/React.createElement(ButtonBar, {
                   buttons: _featurebuttons3,
                   onClick: function onClick(action) {
-                    return _this.props.switchEditContext(action, layer, null, function (v) {
-                      return updateField(attrname, v);
+                    return _this.props.switchEditContext(action, layer, null, function (f) {
+                      return updateField(attrname, f.id);
                     }, attrname);
                   }
                 });
@@ -1112,12 +1115,6 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
         });
       }
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      KeyValCache.clear();
-      FeatureCache.clear();
-    }
   }, {
     key: "render",
     value: function render() {

package/components/SearchBox.js

@@ -585,7 +585,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         });
       } else if (_this.props.searchProviders[provider].getResultGeometry) {
         _this.props.searchProviders[provider].getResultGeometry(result, function (response) {
-          _this.showResultGeometry(result, response);
+          return _this.showResultGeometry(result, response);
         }, axios);
       } else {
         // Display marker
@@ -1049,73 +1049,98 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       _this.props.setCurrentTask('LayerTree');
     });
     _defineProperty(_this, "showResultGeometry", function (item, response) {
-      var _response$crs3, _item$bbox, _item$crs4;
+      var _ref0, _item$label, _response$crs3, _item$bbox, _item$crs3;
       var scale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+      // Collect highlight features
+      var features = [];
+      if (response !== null && response !== void 0 && response.geometry) {
+        var feature = response.geometry.coordinates ? {
+          type: "Feature",
+          geometry: response.geometry
+        } : VectorLayerUtils.wktToGeoJSON(response.geometry, response.crs, response.crs);
+        if (feature) {
+          features.push(feature);
+        }
+      } else if (response !== null && response !== void 0 && response.feature) {
+        var _response$feature$fea;
+        features = (_response$feature$fea = response.feature.features) !== null && _response$feature$fea !== void 0 ? _response$feature$fea : [response.feature];
+      }
+      // Add highlight features and markers
       var mapCrs = _this.props.map.projection;
-      var feature = response !== null && response !== void 0 && response.geometry ? {
-        type: "Feature",
-        geometry: response.geometry
-      } : response === null || response === void 0 ? void 0 : response.feature;
+      var showMarkers = !response.hidemarker && _this.props.searchOptions.showHighlightMarker;
+      var label = ((_ref0 = (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.text) !== null && _ref0 !== void 0 ? _ref0 : '').replace(/<\/?\w+\s*\/?>/g, '');
       var layer = {
         id: "searchselection",
         role: LayerRole.SELECTION
       };
-      if (feature) {
-        var _feature$features;
-        var features = (_feature$features = feature.features) !== null && _feature$features !== void 0 ? _feature$features : [feature];
-        features.forEach(function (feat) {
-          var _response$crs, _feat$geometry, _feat$crs;
-          feat.geometry = VectorLayerUtils.reprojectGeometry(feat.geometry, (_response$crs = response.crs) !== null && _response$crs !== void 0 ? _response$crs : mapCrs, mapCrs);
-          feat.styleName = ((_feat$geometry = feat.geometry) === null || _feat$geometry === void 0 ? void 0 : _feat$geometry.type) === 'Point' && _this.props.searchOptions.showHighlightMarker ? 'marker' : 'default';
-          feat.styleOptions = _this.props.searchOptions.highlightStyle || {};
-          if ((_feat$crs = feat.crs) !== null && _feat$crs !== void 0 && (_feat$crs = _feat$crs.properties) !== null && _feat$crs !== void 0 && _feat$crs.name) {
-            feat.crs = CoordinatesUtils.fromOgcUrnCrs(feat.crs.properties.name);
-          }
-        });
-        // If first feature is not a point(=marker), add a marker
-        if (features[0].styleName !== "marker" && !response.hidemarker && _this.props.searchOptions.showHighlightMarker) {
-          var _response$crs2, _item$crs2;
-          var center = response.center ? CoordinatesUtils.reproject(response.center, (_response$crs2 = response.crs) !== null && _response$crs2 !== void 0 ? _response$crs2 : mapCrs, mapCrs) : CoordinatesUtils.reproject([item.x, item.y], (_item$crs2 = item.crs) !== null && _item$crs2 !== void 0 ? _item$crs2 : mapCrs, mapCrs);
-          features.unshift({
-            geometry: {
-              type: 'Point',
-              coordinates: center
-            },
-            styleName: 'marker'
-          });
+      var highlightFeatures = [];
+      features.forEach(function (feature) {
+        var _response$crs;
+        feature.geometry = VectorLayerUtils.reprojectGeometry(feature.geometry, (_response$crs = response.crs) !== null && _response$crs !== void 0 ? _response$crs : mapCrs, mapCrs);
+        if (!showMarkers || !feature.geometry.type.endsWith("Point")) {
+          highlightFeatures.push(_objectSpread(_objectSpread({}, feature), {}, {
+            properties: _objectSpread({}, !showMarkers && !_this.props.searchOptions.hideResultLabels && {
+              label: label
+            }),
+            styleName: 'default',
+            styleOptions: _this.props.searchOptions.highlightStyle || {}
+          }));
         }
-        // Label first feature
-        if (!_this.props.searchOptions.hideResultLabels) {
-          var _ref0, _item$label;
-          var label = ((_ref0 = (_item$label = item.label) !== null && _item$label !== void 0 ? _item$label : item.text) !== null && _ref0 !== void 0 ? _ref0 : '').replace(/<\/?\w+\s*\/?>/g, '');
-          features[0].properties = _objectSpread(_objectSpread({}, features[0].properties), {}, {
-            label: label
-          });
+        if (showMarkers) {
+          if (feature.geometry.type.endsWith("Point")) {
+            var parts = feature.geometry.type.startsWith("Multi") ? feature.geometry.coordinates : [feature.geometry.coordinates];
+            parts.forEach(function (part) {
+              highlightFeatures.push({
+                type: "Feature",
+                geometry: {
+                  type: 'Point',
+                  coordinates: part
+                },
+                properties: _objectSpread({}, !_this.props.searchOptions.hideResultLabels && {
+                  label: label
+                }),
+                styleName: 'marker'
+              });
+            });
+          } else {
+            var _response$crs2;
+            var center = response.center ? CoordinatesUtils.reproject(response.center, (_response$crs2 = response.crs) !== null && _response$crs2 !== void 0 ? _response$crs2 : mapCrs, mapCrs) : VectorLayerUtils.getFeatureCenter(feature);
+            highlightFeatures.push({
+              type: "Feature",
+              geometry: {
+                type: 'Point',
+                coordinates: center
+              },
+              properties: _objectSpread({}, !_this.props.searchOptions.hideResultLabels && {
+                label: label
+              }),
+              styleName: 'marker'
+            });
+          }
         }
-        // Mark first feature as searchmarker
-        features[0].id = 'searchmarker';
-        _this.props.addLayerFeatures(layer, features, true);
-      } else {
-        var _item$crs3;
-        var _center = CoordinatesUtils.reproject([item.x, item.y], (_item$crs3 = item.crs) !== null && _item$crs3 !== void 0 ? _item$crs3 : mapCrs, mapCrs);
+      });
+      if (isEmpty(highlightFeatures)) {
+        var _item$crs2;
+        var center = CoordinatesUtils.reproject([item.x, item.y], (_item$crs2 = item.crs) !== null && _item$crs2 !== void 0 ? _item$crs2 : mapCrs, mapCrs);
         var marker = {
           type: "Feature",
           geometry: {
             type: "Point",
-            coordinates: _center
+            coordinates: center
           },
+          properties: _objectSpread({}, !_this.props.searchOptions.hideResultLabels && {
+            label: label
+          }),
           styleName: 'marker'
         };
-        if (!_this.props.searchOptions.hideResultLabels) {
-          var _ref1, _item$label2;
-          var _label = ((_ref1 = (_item$label2 = item.label) !== null && _item$label2 !== void 0 ? _item$label2 : item.text) !== null && _ref1 !== void 0 ? _ref1 : '').replace(/<\/?\w+\s*\/?>/g, '');
-          marker.properties = {
-            label: _label
-          };
-        }
-        _this.props.addLayerFeatures(layer, [marker], true);
+        highlightFeatures.push(marker);
       }
-      var bbox = response !== null && response !== void 0 && response.bbox ? CoordinatesUtils.reprojectBbox(response.bbox, (_response$crs3 = response.crs) !== null && _response$crs3 !== void 0 ? _response$crs3 : mapCrs, mapCrs) : CoordinatesUtils.reprojectBbox((_item$bbox = item.bbox) !== null && _item$bbox !== void 0 ? _item$bbox : [item.x, item.y, item.x, item.y], (_item$crs4 = item.crs) !== null && _item$crs4 !== void 0 ? _item$crs4 : mapCrs, mapCrs);
+      // Mark first feature as searchmarker
+      highlightFeatures[0].id = 'searchmarker';
+      _this.props.addLayerFeatures(layer, highlightFeatures, true);
+
+      // Zoom to result bbox
+      var bbox = response !== null && response !== void 0 && response.bbox ? CoordinatesUtils.reprojectBbox(response.bbox, (_response$crs3 = response.crs) !== null && _response$crs3 !== void 0 ? _response$crs3 : mapCrs, mapCrs) : CoordinatesUtils.reprojectBbox((_item$bbox = item.bbox) !== null && _item$bbox !== void 0 ? _item$bbox : [item.x, item.y, item.x, item.y], (_item$crs3 = item.crs) !== null && _item$crs3 !== void 0 ? _item$crs3 : mapCrs, mapCrs);
       _this.zoomToResultBBox(bbox, scale);
       _this.props.setCurrentSearchResult(item);
     });

package/components/map3d/Map3D.js

@@ -236,7 +236,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           sublayers: _preserveSublayerOptions(layer, prevOptions)
         });
         Object.assign(colorLayers[layer.id], LayerUtils.buildWMSLayerParams(colorLayers[layer.id]));
-        if (colorLayers[layer.id].fields === undefined && layerCreator.getFields) {
+        if (layerCreator.getFields) {
           layerCreator.getFields(layer).then(function (fields) {
             _this2.updateColorLayer(layer.id, {
               fields: fields
@@ -545,9 +545,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_this2, "updateSceneObject", function (objectId, options) {
       var flags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       _this2.setState(function (state) {
+        var _objectTree$options$p;
         var objectTree = _objectSpread({}, state.sceneContext.objectTree);
         var prevOptions = objectTree[objectId] || {};
         options = _objectSpread(_objectSpread({}, prevOptions), options);
+        // Don't allow hiding the visible child of a mutex group
+        if ((_objectTree$options$p = objectTree[options.parent]) !== null && _objectTree$options$p !== void 0 && _objectTree$options$p.mutuallyExclusive && !options.visibility && prevOptions.visibility) {
+          options.visibility = true;
+        }
         if (options.objectId) {
           _this2.applySceneObjectState(objectId, options, prevOptions, objectTree);
         } else if (options.children && options.visibility !== prevOptions.visibility) {
@@ -567,7 +572,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       }
       var changed = false;
       if (options.visibility !== prevOptions.visibility || options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
-        var _objectTree$options$p;
+        var _objectTree$options$p2;
         // Visibile if object is visibile and parents also
         var isVisible = options.opacity > 0 && options.visibility;
         for (var curId = options.parent; isVisible && curId !== undefined; curId = objectTree[curId].parent) {
@@ -575,12 +580,13 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         }
         changed |= object.visible !== isVisible;
         object.visible = isVisible;
-        if ((_objectTree$options$p = objectTree[options.parent]) !== null && _objectTree$options$p !== void 0 && _objectTree$options$p.mutuallyExclusive && objectTree[options.parent].children) {
+        if ((_objectTree$options$p2 = objectTree[options.parent]) !== null && _objectTree$options$p2 !== void 0 && _objectTree$options$p2.mutuallyExclusive && objectTree[options.parent].children) {
           objectTree[options.parent].children.forEach(function (child) {
             if (child !== objectId) {
               objectTree[child] = _objectSpread(_objectSpread({}, objectTree[child]), {}, {
                 visibility: false
               });
+              _this2.objectMap[child].visible = false;
             }
           });
         }
@@ -859,6 +865,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
             };
             // Need this separately to ensure object[groupId] is already assigned
             objectTree[groupId].children = _buildObjectTree(entry.items, groupId);
+            if (entry.mutuallyExclusive) {
+              // Ensure only one child is visible
+              var haveVisibleChild = false;
+              objectTree[groupId].children.forEach(function (childId) {
+                objectTree[childId].visibility = objectTree[childId].visibility && !haveVisibleChild;
+                haveVisibleChild |= objectTree[childId].visibility;
+              });
+            }
             nodeIds.push(groupId);
           } else if (entry.type === "tiles3d") {
             var _entry$title, _entry$visibility2, _entry$snap;
@@ -879,7 +893,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               idAttr: entry.idAttr,
               colorAttr: entry.colorAttr,
               alphaAttr: entry.alphaAttr,
-              labelAttr: entry.labelAttr
+              labelAttr: entry.labelAttr,
+              infoAttrBlacklist: entry.infoAttrBlacklist
             });
             _this2.applySceneObjectState(entry.name, objectTree[entry.name], {}, objectTree);
             nodeIds.push(entry.name);

package/components/map3d/layers/WFSLayer3D.js

@@ -84,6 +84,10 @@ export default {
   },
   getFields: function getFields(options) {
     return new Promise(function (resolve, reject) {
+      if (options.fields !== undefined) {
+        // Don't requery fields
+        resolve(options.fields);
+      }
       var typeName = options.version < "2.0.0" ? "typeName" : "typeNames";
       var urlParts = url.parse(options.url, true);
       var urlParams = Object.entries(urlParts.query).reduce(function (res, _ref3) {

package/components/map3d/utils/MiscUtils3D.js

@@ -247,7 +247,9 @@ export var TileMeshHelper = /*#__PURE__*/function () {
   }, {
     key: "getFeatureProperties",
     value: function getFeatureProperties(featureId) {
-      if (featureId in this.propertiesCache) {
+      if (featureId === null) {
+        return {};
+      } else if (featureId in this.propertiesCache) {
         return this.propertiesCache[featureId];
       } else if (this.object.userData.structuralMetadata) {
         this.propertiesCache[featureId] = this.object.userData.structuralMetadata.getPropertyTableData([this.propertyTable], [featureId])[0];

package/components/style/EditComboField.css

@@ -1,3 +1,8 @@
+div.edit-single-select {
+    display: flex;
+    align-items: center;
+}
+
 div.edit-multi-select {
     border: 1px solid var(--border-color);
     padding: 0.25em;