qwc2 2026.7.7 → 2026.7.9

package/actions/theme.js

@@ -63,6 +63,16 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
       return layer.role === LayerRole.BACKGROUND && layer.visibility === true;
     })) === null || _prevLayers$find === void 0 ? void 0 : _prevLayers$find.name) !== null && _prevLayers$find$name !== void 0 ? _prevLayers$find$name : null;
   }
+  // Create theme background layers
+  var bgLayers = ThemeUtils.createThemeBackgroundLayers(theme.backgroundLayers || [], themes, visibleBgLayer, externalLayers);
+  var actuallyVisibleBgLayer = (_bgLayers$find = bgLayers.find(function (entry) {
+    return entry.visibility;
+  })) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
+  if (!prevTheme && visibleBgLayer && actuallyVisibleBgLayer !== visibleBgLayer) {
+    dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
+  } else if (actuallyVisibleBgLayer !== visibleBgLayer) {
+    visibleBgLayer = null;
+  }
 
   // Remove old layers
   var preserveUserLayers = preserve && ConfigUtils.getConfigProp("preserveNonThemeLayersOnThemeSwitch", theme) === true;
@@ -101,24 +111,16 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
   }
 
   // Add background layers for theme
-  var bgLayers = ThemeUtils.createThemeBackgroundLayers(theme.backgroundLayers || [], themes, visibleBgLayer, externalLayers);
-  var actuallyVisibleBgLayer = (_bgLayers$find = bgLayers.find(function (entry) {
-    return entry.visibility;
-  })) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
-  if (!prevTheme && visibleBgLayer && actuallyVisibleBgLayer !== visibleBgLayer) {
-    dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
-  }
   var _iterator = _createForOfIteratorHelper(bgLayers.reverse()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var bgLayer = _step.value;
       // If previous visible BG layer kept, insert other BG layers around that layer
-      if (bgLayer.name === visibleBgLayer && bgLayerKept) {
-        bgLayerKept = false;
-      } else {
-        dispatch(addLayer(bgLayer, bgLayerKept ? 1 : 0));
+      if (!(bgLayer.name === visibleBgLayer && bgLayerKept)) {
+        dispatch(addLayer(bgLayer, insPos));
       }
+      ++insPos;
     }
   } catch (err) {
     _iterator.e(err);
@@ -133,7 +135,7 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var layer = _step2.value;
-      dispatch(addLayer(layer, insPos));
+      dispatch(addLayer(layer));
     }
 
     // Restore external layers

package/components/AttributeForm.js

@@ -138,6 +138,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
           finished: _this.state.childEdit.finishCallback,
           iface: _this.props.iface,
           mapPrefix: _this.props.editContext.mapPrefix,
+          parentContextId: _this.props.editContext.id,
           pickFilter: _this.props.childPickFilter,
           readOnly: _this.props.readOnly,
           translations: _this.props.translations

package/components/EditUploadField.js

@@ -40,7 +40,8 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       camera: false,
       imageData: null,
-      imageFilename: null
+      imageFilename: null,
+      fileSelected: false
     });
     _defineProperty(_this, "fileSelected", function (ev) {
       if (ev.target.files[0].type.startsWith("image/")) {
@@ -57,6 +58,9 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
           _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
         };
       } else {
+        _this.setState({
+          fileSelected: true
+        });
         _this.props.updateFile(_this.props.fieldId, ev.target.files[0]);
         _this.props.updateField(_this.props.fieldId, ev.target.files[0].name);
       }
@@ -277,7 +281,7 @@ var EditUploadField = /*#__PURE__*/function (_React$Component) {
             onClick: this.props.disabled ? null : this.clearImage
           }));
         }
-      } else if (fileValue) {
+      } else if (fileValue && !this.state.fileSelected) {
         return /*#__PURE__*/React.createElement("span", {
           className: "edit-upload-field edit-upload-field-imagelink" + (this.props.disabled ? " edit-upload-field-disabled" : "")
         }, /*#__PURE__*/React.createElement("a", {

package/components/ExportSelection.js

@@ -128,10 +128,25 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
       }
       if (this.props.frameRatio !== prevProps.frameRatio) {
         this.setState(function (state) {
+          var maxWidth = _this2.exportContainer.offsetWidth;
+          var maxHeight = _this2.exportContainer.offsetHeight;
           var newheight = _this2.props.frameRatio ? Math.round(state.width * _this2.props.frameRatio) : state.height;
+          var newwidth = state.width;
+          if (_this2.props.frameRatio) {
+            if (newwidth > maxWidth) {
+              newwidth = maxWidth;
+              newheight = Math.round(newwidth * _this2.props.frameRatio);
+            }
+            if (newheight > maxHeight) {
+              newheight = maxHeight;
+              newwidth = Math.round(newheight / _this2.props.frameRatio);
+            }
+          }
           return {
             frameRatio: _this2.props.frameRatio,
-            y: state.y + 0.5 * (state.height - newheight),
+            x: 0.5 * (maxWidth - newwidth),
+            y: 0.5 * (maxHeight - newheight),
+            width: newwidth,
             height: newheight
           };
         }, function () {
@@ -150,7 +165,10 @@ var ExportSelection = /*#__PURE__*/function (_React$Component) {
         height: this.state.height + 'px'
       };
       return /*#__PURE__*/React.createElement("div", {
-        className: "export-selection-container"
+        className: "export-selection-container",
+        ref: function ref(el) {
+          _this3.exportContainer = el;
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: "export-selection",
         onContextMenu: MiscUtils.killEvent,

package/components/LinkFeatureForm.js

@@ -119,7 +119,8 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
             feature: this.props.feature,
             geomType: this.props.editConfig.geomType,
             editConfig: this.props.editConfig,
-            mapPrefix: this.props.mapPrefix
+            mapPrefix: this.props.mapPrefix,
+            parentContextId: this.props.parentContextId
           });
         } else {
           this.props.iface.getFeatureById(this.props.editConfig, this.props.featureId, this.props.map.projection, function (result) {
@@ -129,7 +130,8 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
                 feature: result,
                 geomType: _this2.props.editConfig.geomType,
                 editConfig: _this2.props.editConfig,
-                mapPrefix: _this2.props.mapPrefix
+                mapPrefix: _this2.props.mapPrefix,
+                parentContextId: _this2.props.parentContextId
               });
             }
           });
@@ -145,13 +147,15 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
             geomType: _this2.props.editConfig.geomType,
             feature: feature,
             editConfig: _this2.props.editConfig,
-            mapPrefix: _this2.props.mapPrefix
+            mapPrefix: _this2.props.mapPrefix,
+            parentContextId: _this2.props.parentContextId
           });
         });
       } else if (this.props.action === 'Pick') {
         this.props.setEditContext(this.props.editContextId, {
           editConfig: this.props.editConfig,
-          mapPrefix: this.props.mapPrefix
+          mapPrefix: this.props.mapPrefix,
+          parentContextId: this.props.parentContextId
         });
       }
     }
@@ -240,6 +244,7 @@ _defineProperty(LinkFeatureForm, "propTypes", {
   iface: PropTypes.object,
   map: PropTypes.object,
   mapPrefix: PropTypes.string,
+  parentContextId: PropTypes.string,
   pickFilter: PropTypes.func,
   readOnly: PropTypes.bool,
   removeLayer: PropTypes.func,

package/components/map3d/utils/OrbitControls3D.js

@@ -56,7 +56,7 @@ var OrbitControls3D = /*#__PURE__*/function (_MapControls) {
     _this.enableDamping = true;
     _this.dampingFactor = 0.2;
     _this.keyPanSpeed = 10.0;
-    _this.maxPolarAngle = Math.PI * 0.5;
+    _this.maxPolarAngle = 89 / 180 * Math.PI;
     _this.mouseButtons = mouseButtons;
     _this.zoomSpeed = 5;
     return _this;
@@ -65,10 +65,9 @@ var OrbitControls3D = /*#__PURE__*/function (_MapControls) {
   return _createClass(OrbitControls3D, [{
     key: "connect",
     value: function connect(sceneContext) {
-      this.domElement = sceneContext.scene.domElement;
       this.sceneContext = sceneContext;
       this.enabled = true;
-      _superPropGet(OrbitControls3D, "connect", this, 3)([]);
+      _superPropGet(OrbitControls3D, "connect", this, 3)([sceneContext.scene.domElement]);
       this.listenToKeyEvents(this.domElement);
       this.domElement.addEventListener('pointerdown', this.stopAnimations);
       this.domElement.addEventListener('wheel', this.stopAnimations);

package/components/widgets/LayerCatalogWidget.js

@@ -162,7 +162,7 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
       var _collectSublayers = function collectSublayers(entry) {
         var _entry$resource2;
         var entryParams = LayerUtils.splitLayerUrlParam((_entry$resource2 = entry.resource) !== null && _entry$resource2 !== void 0 ? _entry$resource2 : "");
-        if (stripQuery(entryParams.url) === groupUrl) {
+        if (isEmpty(entry.sublayers) && stripQuery(entryParams.url) === groupUrl) {
           sublayers[entryParams.name] = entryParams;
         }
         (entry.sublayers || []).forEach(_collectSublayers);
@@ -214,10 +214,12 @@ var LayerCatalogWidget = /*#__PURE__*/function (_React$PureComponent) {
             } else if (sublayerSubset) {
               var _filterSublayers = function filterSublayers(sublayers) {
                 return sublayers.map(function (sublayer) {
-                  if (sublayer.sublayers) {
-                    return _filterSublayers(sublayer.sublayers);
-                  } else if (sublayer.name in sublayerSubset) {
-                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset);
+                  if (sublayer.name in sublayerSubset) {
+                    return _objectSpread(_objectSpread({}, sublayer), sublayerSubset[sublayer.name]);
+                  } else if (sublayer.sublayers) {
+                    return _objectSpread(_objectSpread({}, sublayer), {}, {
+                      sublayers: _filterSublayers(sublayer.sublayers)
+                    });
                   } else {
                     return null;
                   }

package/components/widgets/TextInput.js

@@ -248,11 +248,11 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
       var wrapperClassName = classNames({
         "TextInput": true,
         "text-input-wrapper": true,
-        "text-input-wrapper-multiline": this.props.multiline,
         "text-input-wrapper-focused": this.state.focus
       });
       var preClassName = classNames({
         "text-input": true,
+        "text-input-multiline": this.props.multiline,
         "text-input-disabled": this.props.disabled,
         "text-input-readonly": this.props.readOnly || !this.state.curValue,
         "text-input-invalid": this.props.required && !this.state.curValue

package/components/widgets/style/TextInput.css

@@ -38,9 +38,11 @@ pre.text-input {
     flex: 1 1 auto;
 }
 
-
-text-input-wrapper-multiline > pre.text-input {
+pre.text-input.text-input-multiline {
+    overflow-x: hidden;
     white-space: pre-wrap;
+    overflow-wrap: break-word;
+    word-break: break-word;
 }
 
 pre.text-input[contenteditable="true"] a {

package/package.json

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

package/plugins/TimeManager.js

@@ -227,7 +227,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
       }, LocaleUtils.tr("timemanager.displayfeatures")), /*#__PURE__*/React.createElement("option", {
         value: "layers"
       }, LocaleUtils.tr("timemanager.displaylayers"))))) : null)));
-      var timeSpan = _this.state.endTime !== null ? _this.state.endTime.diff(_this.state.startTime) : dayjs().diff(_this.state.startTime);
+      var timeSpan = _this.state.endTime.diff(_this.state.startTime);
       var Timeline = _this.state.timelineMode === 'infinite' ? InfiniteTimeline : FixedTimeline;
       var filterActive = !isEmpty(_this.props.filter.filterParams) || !!_this.props.filter.filterGeom;
       var startdate = _this.state.timeData.values.length > 0 ? _this.state.timeData.values[0].hour(0).minute(0).second(0) : null;
@@ -760,7 +760,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
             timeData: timeData,
             currentTimestamp: (_state$currentTimesta = state.currentTimestamp) !== null && _state$currentTimesta !== void 0 ? _state$currentTimesta : timeData.values.length > 0 ? +timeData.values[0] : null,
             startTime: startdate,
-            endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : null
+            endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : dayjs()
           };
         });
         this.updateTimeFeatures(timeData);
@@ -784,7 +784,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
           }
           return {
             startTime: startdate,
-            endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : null
+            endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : dayjs()
           };
         });
       }

package/reducers/editing.js

@@ -69,6 +69,18 @@ export default function editing() {
           contexts: _objectSpread({}, state.contexts),
           currentContext: state.currentContext === action.contextId ? action.newActiveContextId : state.currentContext
         };
+        var _clearChildContexts = function clearChildContexts(parentId) {
+          Object.values(newState.contexts).forEach(function (context) {
+            if (context.parentContextId === parentId) {
+              _clearChildContexts(context.id);
+              delete newState.contexts[context.id];
+              if (newState.currentContext === context.id) {
+                newState.currentContext = action.newActiveContextId;
+              }
+            }
+          });
+        };
+        _clearChildContexts(action.contextId);
         delete newState.contexts[action.contextId];
         return newState;
       }