qwc2 2025.11.13 → 2025.11.18

package/components/AttributeTableWidget.js

@@ -119,7 +119,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
                 filteredSortedFeatures: _this.filteredSortedFeatures(features, state2),
                 loadedLayer: selectedLayer,
                 curEditConfig: editConfig,
-                curFieldTranslations: fieldTranslations
+                fieldTranslations: fieldTranslations
               };
             });
           } else {
@@ -942,15 +942,22 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           wmsName = _ref5[0],
           serviceConfigs = _ref5[1];
         return Object.entries(serviceConfigs).map(function (_ref6) {
-          var _ref8, _ref9, _match$layer$translat, _match$layer$translat2, _match$sublayer;
           var _ref7 = _slicedToArray(_ref6, 2),
             layerName = _ref7[0],
             editConfig = _ref7[1];
           var match = LayerUtils.searchLayer(_this2.props.layers, 'wms_name', wmsName, 'name', layerName);
-          if (!match) {
-            return null;
+          var layerTitle = layerName;
+          if (match) {
+            var _ref8, _ref9, _match$layer$translat, _match$layer$translat2, _match$sublayer;
+            layerTitle = (_ref8 = (_ref9 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref9 !== void 0 ? _ref9 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref8 !== void 0 ? _ref8 : layerName;
+          } else {
+            var _this2$props$layers$f, _ref10, _translations$layertr, _translations$layertr2;
+            // Note: geometry-less tables are filtered from the theme sublayers
+            var translations = (_this2$props$layers$f = _this2.props.layers.find(function (layer) {
+              return layer.wms_name === wmsName;
+            })) === null || _this2$props$layers$f === void 0 ? void 0 : _this2$props$layers$f.translations;
+            layerTitle = (_ref10 = (_translations$layertr = translations === null || translations === void 0 || (_translations$layertr2 = translations.layertree) === null || _translations$layertr2 === void 0 ? void 0 : _translations$layertr2[layerName]) !== null && _translations$layertr !== void 0 ? _translations$layertr : editConfig.layerTitle) !== null && _ref10 !== void 0 ? _ref10 : layerName;
           }
-          var layerTitle = (_ref8 = (_ref9 = (_match$layer$translat = (_match$layer$translat2 = match.layer.translations) === null || _match$layer$translat2 === void 0 || (_match$layer$translat2 = _match$layer$translat2.layertree) === null || _match$layer$translat2 === void 0 ? void 0 : _match$layer$translat2[layerName]) !== null && _match$layer$translat !== void 0 ? _match$layer$translat : editConfig.layerTitle) !== null && _ref9 !== void 0 ? _ref9 : match === null || match === void 0 || (_match$sublayer = match.sublayer) === null || _match$sublayer === void 0 ? void 0 : _match$sublayer.title) !== null && _ref8 !== void 0 ? _ref8 : layerName;
           var value = wmsName + "#" + layerName;
           return /*#__PURE__*/React.createElement("option", {
             key: value,

package/components/ResizeableWindow.js

@@ -274,7 +274,8 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
           width: width,
           height: height,
           docked: _this.props.initiallyDocked,
-          detached: false
+          detached: false,
+          minimized: _this.props.initiallyMinimized || false
         };
       }
       if (_this.props.splitScreenWhenDocked && geometry.docked) {
@@ -537,6 +538,7 @@ _defineProperty(ResizeableWindow, "propTypes", {
   initialX: PropTypes.number,
   initialY: PropTypes.number,
   initiallyDocked: PropTypes.bool,
+  initiallyMinimized: PropTypes.bool,
   mapMargins: PropTypes.object,
   maxHeight: PropTypes.number,
   maxWidth: PropTypes.number,

package/package.json

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

package/plugins/API.js

@@ -386,6 +386,7 @@ var API = /*#__PURE__*/function (_React$Component) {
       window.qwc2.CoordinatesUtils = CoordinatesUtils;
       window.qwc2.EditingInterface = EditingInterface;
       window.qwc2.EditingUtils = EditingUtils;
+      window.qwc2.LayerUtils = LayerUtils;
       window.qwc2.LocaleUtils = LocaleUtils;
       window.qwc2.MapUtils = MapUtils;
       window.qwc2.PermaLinkUtils = PermaLinkUtils;

package/plugins/Editing.js

@@ -348,7 +348,7 @@ var Editing = /*#__PURE__*/function (_React$Component) {
         // Get source layer's field configuration and build name-to-id mapping
         var sourceFields = (_this$props$editConfi = _this.props.editConfigs[mapName]) === null || _this$props$editConfi === void 0 || (_this$props$editConfi = _this$props$editConfi[layer]) === null || _this$props$editConfi === void 0 ? void 0 : _this$props$editConfi.fields;
         var sourceNameToIdMap = (sourceFields || []).reduce(function (res, field) {
-          return _objectSpread(_objectSpread({}, res), {}, _defineProperty(_defineProperty({}, sourceFields.name, sourceFields.id), sourceFields.id, sourceFields.id));
+          return _objectSpread(_objectSpread({}, res), {}, _defineProperty(_defineProperty({}, field.name, field.id), field.id, field.id));
         }, {});
         var sourcePropertiesById = Object.entries(sourceProperties).reduce(function (res, _ref7) {
           var _ref8 = _slicedToArray(_ref7, 2),

package/plugins/map/RedliningSupport.js

@@ -427,12 +427,12 @@ var RedliningSupport = /*#__PURE__*/function (_React$Component) {
         evt.feature.setId(uuidv4());
         evt.feature.set('shape', _this.props.redlining.geomType);
         _this.updateFeatureStyle(evt.feature);
-        _this.toggleFeatureMeasurements(ev.feature);
+        _this.toggleFeatureMeasurements(evt.feature);
         _this.selectFeatures([evt.feature]);
       }, _this);
       drawInteraction.on('drawend', function () {
         // Draw end
-        _this.commitFeatures(_this.selectFeatures, _this.props.redlining, true);
+        _this.commitFeatures(_this.selectedFeatures, _this.props.redlining, true);
         _this.reset(_this.props.redlining);
         // Ughh... Apparently we need to wait 250ms for the 'singleclick' event processing to finish to avoid pick interactions picking up the current event
         setTimeout(function () {

package/utils/EditingUtils.js

@@ -346,7 +346,6 @@ export function computeExpressionFields(editConfig, feature, editIface, mapCrs,
     }, {});
   }
   // Evaluate expressions
-  FeatureCache.clear();
   var mapPrefix = editConfig.editDataset.split(".")[0];
   parseExpressionsAsync(fieldExpressions, feature, editConfig, editIface, mapPrefix, mapCrs).then(function (result) {
     // Adjust values based on field type

package/utils/LayerUtils.js

@@ -1502,23 +1502,21 @@ var LayerUtils = {
     return null;
   },
   applyVisibilityPreset: function applyVisibilityPreset(layer, preset) {
+    var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var newLayer = _objectSpread({}, layer);
+    var itempath = [].concat(_toConsumableArray(path.slice(1)), [newLayer.name]).join("/");
     if (newLayer.sublayers) {
-      var haveVisibileSublayer = false;
+      newLayer.visibility = itempath in preset || path.length === 0;
       newLayer.sublayers = newLayer.sublayers.map(function (sublayer) {
-        var newSublayer = LayerUtils.applyVisibilityPreset(sublayer, preset);
-        haveVisibileSublayer || (haveVisibileSublayer = newSublayer.visibility === true);
-        return newSublayer;
+        return LayerUtils.applyVisibilityPreset(sublayer, preset, [].concat(_toConsumableArray(path), [layer.name]));
       });
-      newLayer.visibility = haveVisibileSublayer;
-      if (newLayer.name in preset) {
+    } else {
+      if (itempath in preset) {
         newLayer.visibility = true;
+        newLayer.style = preset[itempath];
+      } else {
+        newLayer.visibility = false;
       }
-    } else if (newLayer.name in preset) {
-      newLayer.visibility = true;
-      newLayer.style = preset[newLayer.name];
-    } else {
-      newLayer.visibility = false;
     }
     return newLayer;
   },

package/utils/ServiceLayerUtils.js

@@ -31,12 +31,12 @@ import ol from 'openlayers';
 import randomColor from 'randomcolor';
 import url from 'url';
 import { LayerRole } from '../actions/layers';
+import StandardApp from '../components/StandardApp';
 import ConfigUtils from './ConfigUtils';
 import CoordinatesUtils from './CoordinatesUtils';
 import LayerUtils from './LayerUtils';
 import LocaleUtils from './LocaleUtils';
 import MiscUtils from './MiscUtils';
-import StandardApp from '../components/StandardApp';
 function strcmp(a, b) {
   var al = a.toLowerCase();
   var bl = b.toLowerCase();