qwc2 2026.2.17 → 2026.2.24

package/actions/layers.js

@@ -22,6 +22,7 @@ export var REMOVE_LAYER_FEATURES = 'REMOVE_LAYER_FEATURES';
 export var CLEAR_LAYER = 'CLEAR_LAYER';
 export var CHANGE_LAYER_PROPERTY = 'CHANGE_LAYER_PROPERTY';
 export var SET_LAYER_DIMENSIONS = 'SET_LAYER_DIMENSIONS';
+export var SET_LAYER_METADATA = 'SET_LAYER_METADATA';
 export var REFRESH_LAYER = 'REFRESH_LAYER';
 export var REMOVE_ALL_LAYERS = 'REMOVE_ALL_LAYERS';
 export var REPLACE_PLACEHOLDER_LAYER = 'REPLACE_PLACEHOLDER_LAYER';
@@ -39,12 +40,17 @@ export function addLayer(layer) {
   var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   return function (dispatch) {
+    dispatch({
+      type: ADD_LAYER,
+      layer: layer,
+      pos: pos,
+      options: options
+    });
     LayerUtils.queryLayerMetadata(layer, function (result) {
       return dispatch({
-        type: ADD_LAYER,
-        layer: result,
-        pos: pos,
-        options: options
+        type: SET_LAYER_METADATA,
+        id: layer.id,
+        metadata: result
       });
     });
   };
@@ -65,11 +71,11 @@ export function removeLayer(layerId) {
     sublayerpath: sublayerpath
   };
 }
-export function reorderLayer(layer, sublayerpath, direction) {
+export function reorderLayer(layerId, sublayerpath, direction) {
   return function (dispatch, getState) {
     dispatch({
       type: REORDER_LAYER,
-      layer: layer,
+      layerId: layerId,
       sublayerpath: sublayerpath,
       direction: direction,
       preventSplittingGroups: ConfigUtils.getConfigProp("preventSplittingGroupsWhenReordering", getState().theme.current)
@@ -101,11 +107,20 @@ export function clearLayer(layerId) {
   };
 }
 export function addThemeSublayer(layer) {
-  return function (dispatch) {
+  return function (dispatch, getState) {
+    var _getState$layers$flat;
+    dispatch({
+      type: ADD_THEME_SUBLAYER,
+      layer: layer
+    });
+    var layerId = (_getState$layers$flat = getState().layers.flat.find(function (l) {
+      return l.role === LayerRole.THEME;
+    })) === null || _getState$layers$flat === void 0 ? void 0 : _getState$layers$flat.id;
     LayerUtils.queryLayerMetadata(layer, function (result) {
       return dispatch({
-        type: ADD_THEME_SUBLAYER,
-        layer: result
+        type: SET_LAYER_METADATA,
+        id: layerId,
+        metadata: result
       });
     });
   };
@@ -177,11 +192,16 @@ export function removeAllLayers() {
 }
 export function replacePlaceholderLayer(id, layer) {
   return function (dispatch) {
+    dispatch({
+      type: REPLACE_PLACEHOLDER_LAYER,
+      id: id,
+      layer: layer
+    });
     LayerUtils.queryLayerMetadata(layer, function (result) {
       return dispatch({
-        type: REPLACE_PLACEHOLDER_LAYER,
+        type: SET_LAYER_METADATA,
         id: id,
-        layer: result
+        metadata: result
       });
     });
   };

package/actions/theme.js

@@ -163,7 +163,7 @@ export function setCurrentTheme(theme, themes) {
   var themeLayerRestorer = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
   var externalLayerRestorer = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : null;
   return function (dispatch, getState) {
-    var _getState$layers;
+    var _getState$layers, _ref, _theme$mapTips;
     var curLayers = ((_getState$layers = getState().layers) === null || _getState$layers === void 0 ? void 0 : _getState$layers.flat) || [];
     var mapCrs = theme.mapCrs || themes.defaultMapCrs || "EPSG:3857";
     if (!(mapCrs in CoordinatesUtils.getAvailableCRS())) {
@@ -230,6 +230,7 @@ export function setCurrentTheme(theme, themes) {
       printGrid: theme.printGrid || themes.defaultPrintGrid || undefined,
       searchProviders: theme.searchProviders || themes.defaultSearchProviders || undefined,
       backgroundLayers: theme.backgroundLayers || themes.defaultBackgroundLayers || [],
+      mapTips: (_ref = (_theme$mapTips = theme.mapTips) !== null && _theme$mapTips !== void 0 ? _theme$mapTips : themes.defaultMapTips) !== null && _ref !== void 0 ? _ref : undefined,
       defaultDisplayCrs: theme.defaultDisplayCrs || themes.defaultDisplayCrs || undefined
     });
 

package/components/AttributeForm.js

@@ -161,11 +161,12 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
         readOnlyMsg = LocaleUtils.tr("editing.geomnonzeroz");
       }
       return /*#__PURE__*/React.createElement("div", {
-        className: "AttributeForm"
+        className: "AttributeForm ".concat(_this.state.childEdit ? "attrib-form-has-child" : "")
       }, readOnlyMsg ? /*#__PURE__*/React.createElement("div", {
         className: "attrib-form-geom-readonly"
       }, readOnlyMsg) : null, /*#__PURE__*/React.createElement("form", {
         action: "",
+        className: "attrib-form-parent-form",
         onChange: function onChange(ev) {
           return _this.formChanged(ev);
         },

package/components/SearchBox.js

@@ -473,14 +473,16 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         title: (_result$label3 = result.label) !== null && _result$label3 !== void 0 ? _result$label3 : result.text
       }), result.theme && addThemes ? /*#__PURE__*/React.createElement(Icon, {
         icon: "plus",
-        onClick: function onClick() {
-          return _this.selectLayerResult(provider, group, result);
+        onClick: function onClick(ev) {
+          MiscUtils.killEvent(ev);
+          _this.selectLayerResult(provider, group, result);
         },
         title: LocaleUtils.tr("themeswitcher.addtotheme")
       }) : null, _this.props.searchOptions.allowAddLayerAsGroup && result.sublayers ? /*#__PURE__*/React.createElement(Icon, {
         icon: "group",
-        onClick: function onClick() {
-          return _this.selectLayerResult(provider, group, result, true);
+        onClick: function onClick(ev) {
+          MiscUtils.killEvent(ev);
+          _this.selectLayerResult(provider, group, result, true);
         },
         title: LocaleUtils.tr("importlayer.asgroup")
       }) : null, result.info ? /*#__PURE__*/React.createElement(Icon, {
@@ -666,7 +668,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
           type: "placeholder",
           name: params.name,
           title: (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : params.name,
-          role: params.USERLAYER,
+          role: LayerRole.USERLAYER,
           loading: true
         });
         ServiceLayerUtils.findLayers(params.type, params.url, [params], _this.props.map.projection, function (id, layer) {
@@ -1022,7 +1024,11 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
         var text = LocaleUtils.tr("search.existinglayer") + ": " + existingLayerName;
         _this.props.showNotification("existinglayer", text);
       } else {
+        var existingLayer = _this.props.layers.find(function (l) {
+          return l.type === layer.type && l.url === layer.url;
+        });
         _this.props.addLayer(_objectSpread(_objectSpread({}, layer), {}, {
+          srcid: existingLayer === null || existingLayer === void 0 ? void 0 : existingLayer.srcid,
           role: LayerRole.USERLAYER
         }));
       }

package/components/map/layers/WMSLayer.js

@@ -138,8 +138,8 @@ export default {
         }, options.sourceConfig || {}))
       }, options.layerConfig || {}));
     }
-    layer.setVisible(queryParameters.LAYERS && options.visibility);
-    layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 100);
+    layer.setVisible(queryParameters.LAYERS !== "" && options.visibility);
+    layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1);
     return layer;
   },
   update: function update(layer, newOptions, oldOptions) {
@@ -147,7 +147,7 @@ export default {
     if (oldOptions && layer !== null && layer !== void 0 && (_layer$getSource = layer.getSource()) !== null && _layer$getSource !== void 0 && _layer$getSource.updateParams) {
       var changed = (oldOptions.rev || 0) !== (newOptions.rev || 0);
       var oldParams = wmsToOpenlayersOptions(oldOptions);
-      getClientSideOpacity(oldOptions, oldParams);
+      getClientSideOpacity(oldOptions, oldParams); // Make getClientSideOpacity transform oldParams if necessary
       var newParams = wmsToOpenlayersOptions(newOptions);
       var clientSideOpacity = getClientSideOpacity(newOptions, newParams);
       Object.keys(oldParams).forEach(function (key) {
@@ -168,18 +168,18 @@ export default {
         if (layer.get("updateTimeout")) {
           clearTimeout(layer.get("updateTimeout"));
         }
-        if (!newOptions.visibility || !queryParameters.LAYERS) {
+        if (!newOptions.visibility || queryParameters.LAYERS === "") {
           layer.setVisible(false);
         }
-        layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 100);
+        layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1);
         layer.set("updateTimeout", setTimeout(function () {
-          layer.setVisible(queryParameters.LAYERS && newOptions.visibility);
+          layer.setVisible(queryParameters.LAYERS !== "" && newOptions.visibility);
           layer.getSource().updateParams(queryParameters);
           layer.getSource().changed();
           layer.set("updateTimeout", null);
         }, 500));
       } else {
-        layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 100);
+        layer.setOpacity(clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1);
       }
     }
   }

package/components/map3d/ImportObjects3D.js

@@ -30,7 +30,6 @@ import ConfigUtils from '../../utils/ConfigUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
 import FileSelector from '../widgets/FileSelector';
 import Spinner from '../widgets/Spinner';
-import { importGltf } from './utils/MiscUtils3D';
 import './style/ImportObjects3D.css';
 var ImportObjects3D = /*#__PURE__*/function (_React$Component) {
   function ImportObjects3D() {
@@ -63,7 +62,8 @@ var ImportObjects3D = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "importGltfFile", function (file, taskid) {
       var reader = new FileReader();
       reader.onload = function (ev) {
-        importGltf(ev.target.result, file.name, _this.props.sceneContext, {
+        _this.props.sceneContext.importObject3D(ev.target.result, uuidv4(), true, {
+          title: file.name,
           drawGroup: true,
           imported: true
         }, true);
@@ -110,8 +110,9 @@ var ImportObjects3D = /*#__PURE__*/function (_React$Component) {
         headers: headers
       }).then(function (response) {
         var tilesetUrl = _this.props.importedTilesBaseUrl + response.data.result.value;
-        _this.props.sceneContext.add3dTiles(tilesetUrl, taskid, {
-          title: file.name
+        _this.props.sceneContext.importTiles3D(tilesetUrl, taskid, true, {
+          title: file.name,
+          imported: true
         }, true);
         _this.setState({
           selectedfile: null,