qwc2 2026.2.23 → 2026.2.24

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/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/Map3D.js

@@ -115,7 +115,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         addLayer: function addLayer(layer) {},
         getLayer: function getLayer(layerId) {},
         removeLayer: function removeLayer(layerId) {},
-        updateColorLayer: function updateColorLayer(layerId, options, path) {},
+        updateColorLayer: function updateColorLayer(layerId, options, flags) {},
         setBaseLayer: function setBaseLayer(layer, visibility) {},
         importTiles3D: function importTiles3D(url, name) {
           var addToLayerTree = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -136,7 +136,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         },
         getSceneObject: function getSceneObject(objectId) {},
         removeSceneObject: function removeSceneObject(objectId) {},
-        updateSceneObject: function updateSceneObject(objectId, options) {},
+        updateSceneObject: function updateSceneObject(objectId, options, flags) {},
         zoomToObject: function zoomToObject(objectId) {},
         getMap: function getMap() {},
         setViewToExtent: function setViewToExtent(bounds, angle) {},
@@ -199,7 +199,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layer.id, layer));
       }, {});
       return _this2.props.layers.reduce(function (colorLayers, layer) {
-        var _prevOptions$visibili, _prevOptions$opacity, _prevOptions$extrusio, _prevOptions$fields;
+        var _prevOptions$projecti, _prevOptions$visibili, _prevOptions$opacity, _prevOptions$extrusio, _prevOptions$fields;
         if (layer.role !== LayerRole.THEME && layer.role !== LayerRole.USERLAYER) {
           return colorLayers;
         }
@@ -231,6 +231,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           });
         };
         colorLayers[layer.id] = _objectSpread(_objectSpread({}, layer), {}, {
+          projection: (_prevOptions$projecti = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.projection) !== null && _prevOptions$projecti !== void 0 ? _prevOptions$projecti : _this2.props.theme.mapCrs,
           visibility: (_prevOptions$visibili = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.visibility) !== null && _prevOptions$visibili !== void 0 ? _prevOptions$visibili : false,
           opacity: (_prevOptions$opacity = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity) !== null && _prevOptions$opacity !== void 0 ? _prevOptions$opacity : 255,
           extrusionHeight: (_prevOptions$extrusio = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.extrusionHeight) !== null && _prevOptions$extrusio !== void 0 ? _prevOptions$extrusio : layerCreator.createFeatureSource ? 0 : undefined,
@@ -262,14 +263,17 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         var layerCreator = LayerRegistry[options.type];
         var mapLayer = _this2.getLayer(layerId);
         if (mapLayer) {
-          layerCreator.update3d(mapLayer.source, options, prevOptions, _this2.state.sceneContext.mapCrs);
+          layerCreator.update3d(mapLayer, options, prevOptions, _this2.state.sceneContext.mapCrs);
         } else {
           mapLayer = layerCreator.create3d(options, _this2.state.sceneContext.mapCrs);
           _this2.addLayer(layerId, mapLayer);
         }
         _this2.map.insertLayerAfter(mapLayer, layerBelow);
-        mapLayer.visible = options.visibility;
-        mapLayer.opacity = options.opacity / 255;
+        // WMS layer handles visibility and opacity internally
+        if (options.type !== "wms") {
+          mapLayer.visible = options.visibility;
+          mapLayer.opacity = options.opacity / 255;
+        }
         layerBelow = mapLayer;
         if (options.extrusionHeight !== undefined && options.extrusionHeight !== 0) {
           _this2.createUpdateExtrudedLayer(layerCreator, mapLayer, options, options.features !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.features));
@@ -381,16 +385,45 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "updateColorLayer", function (layerId, options) {
-      var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+      var flags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       _this2.setState(function (state) {
+        var _flags$path;
         var entry = _objectSpread({}, state.sceneContext.colorLayers[layerId]);
         var subentry = entry;
-        path.forEach(function (idx) {
+        var parent = null;
+        ((_flags$path = flags.path) !== null && _flags$path !== void 0 ? _flags$path : []).forEach(function (idx) {
           subentry.sublayers = _toConsumableArray(subentry.sublayers);
           subentry.sublayers[idx] = _objectSpread({}, subentry.sublayers[idx]);
+          parent = subentry;
           subentry = subentry.sublayers[idx];
         });
+        var prevOptions = _objectSpread({}, subentry);
         Object.assign(subentry, options);
+        if (subentry.visibility !== prevOptions.visibility) {
+          var _parent;
+          if (!isEmpty(subentry.sublayers) && flags.groupTogglesSublayers) {
+            // Propagate visibility to children
+            var _setChildVisibilities = function setChildVisibilities(child) {
+              child.sublayers = child.sublayers.map(function (gchild) {
+                var ngchild = _objectSpread(_objectSpread({}, gchild), {}, {
+                  visibility: options.visibility
+                });
+                if (!isEmpty(ngchild.sublayers)) {
+                  _setChildVisibilities(ngchild);
+                }
+                return ngchild;
+              });
+            };
+            _setChildVisibilities(subentry);
+          }
+          if ((_parent = parent) !== null && _parent !== void 0 && _parent.mutuallyExclusive) {
+            parent.sublayers = parent.sublayers.map(function (sublayer) {
+              return sublayer === subentry ? subentry : _objectSpread(_objectSpread({}, sublayer), {}, {
+                visibility: false
+              });
+            });
+          }
+        }
         Object.assign(entry, LayerUtils.buildWMSLayerParams(entry));
         return {
           sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
@@ -593,18 +626,19 @@ 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 = state.sceneContext.objectTree;
+        var objectTree = _objectSpread({}, state.sceneContext.objectTree);
         var prevOptions = objectTree[objectId] || {};
         options = _objectSpread(_objectSpread({}, prevOptions), options);
         if (options.objectId) {
           _this2.applySceneObjectState(objectId, options, prevOptions, objectTree);
-        } else if (options.children) {
-          _this2.setChildObjectVisibility(objectTree, options.children, options.visibility);
+        } else if (options.children && options.visibility !== prevOptions.visibility) {
+          _this2.setChildObjectVisibility(objectTree, options.children, options.visibility, flags.groupTogglesSublayers);
         }
         return {
           sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {
-            objectTree: _objectSpread(_objectSpread({}, state.sceneContext.objectTree), {}, _defineProperty({}, objectId, options))
+            objectTree: _objectSpread(_objectSpread({}, objectTree), {}, _defineProperty({}, objectId, options))
           })
         };
       });
@@ -613,6 +647,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var object = _this2.objectMap[objectId];
       var changed = false;
       if (options.visibility !== prevOptions.visibility || options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
+        var _objectTree$options$p;
         // 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) {
@@ -620,6 +655,15 @@ 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) {
+          objectTree[options.parent].children.forEach(function (child) {
+            if (child !== objectId) {
+              objectTree[child] = _objectSpread(_objectSpread({}, objectTree[child]), {}, {
+                visibility: false
+              });
+            }
+          });
+        }
       }
       if (options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
         if (object.opacity !== undefined) {
@@ -643,6 +687,26 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         _this2.loadTilesetStyle(objectId, (_options$styles = options.styles) === null || _options$styles === void 0 ? void 0 : _options$styles[options.style]);
       }
     });
+    _defineProperty(_this2, "setChildObjectVisibility", function (objectTree, children, visibility, groupTogglesSublayers) {
+      children.forEach(function (nodeId) {
+        if (objectTree[nodeId].children) {
+          _this2.setChildObjectVisibility(objectTree, objectTree[nodeId].children, visibility && objectTree[nodeId].visibility);
+        } else {
+          if (groupTogglesSublayers) {
+            objectTree[nodeId] = _objectSpread(_objectSpread({}, objectTree[nodeId]), {}, {
+              visibility: visibility
+            });
+          }
+          var child = objectTree[nodeId];
+          var newVisible = visibility && child.visibility && child.opacity > 0;
+          var changed = newVisible !== _this2.objectMap[child.objectId].visible;
+          _this2.objectMap[child.objectId].visible = newVisible;
+          if (changed) {
+            _this2.instance.notifyChange(_this2.objectMap[child.objectId]);
+          }
+        }
+      });
+    });
     _defineProperty(_this2, "loadTilesetStyle", function (objectId, url) {
       var applyTilesetStyle = function applyTilesetStyle(styleurl) {
         var tiles3d = _this2.objectMap[objectId];
@@ -668,21 +732,6 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         applyTilesetStyle(url);
       }
     });
-    _defineProperty(_this2, "setChildObjectVisibility", function (objectTree, children, visibility) {
-      children.forEach(function (nodeId) {
-        if (objectTree[nodeId].children) {
-          _this2.setChildObjectVisibility(objectTree, objectTree[nodeId].children, visibility && objectTree[nodeId].visibility);
-        } else {
-          var child = objectTree[nodeId];
-          var newVisible = visibility && child.visibility && child.opacity > 0;
-          var changed = newVisible !== _this2.objectMap[child.objectId].visible;
-          _this2.objectMap[child.objectId].visible = newVisible;
-          if (changed) {
-            _this2.instance.notifyChange(_this2.objectMap[child.objectId]);
-          }
-        }
-      });
-    });
     _defineProperty(_this2, "zoomToObject", function (objectId) {
       var margin = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 20;
       var obj = _this2.state.sceneContext.getSceneObject(objectId);
@@ -704,12 +753,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       if (el) {
         _this2.container = el;
         el.resizeObserver = new ResizeObserver(function (entries) {
-          var rect = entries[0].contentRect;
-          _this2.state.sceneContext.scene.view.dispatchEvent({
-            type: 'view-resized',
-            width: rect.width,
-            height: rect.height
-          });
+          if (_this2.state.sceneContext.scene) {
+            var rect = entries[0].contentRect;
+            _this2.state.sceneContext.scene.view.dispatchEvent({
+              type: 'view-resized',
+              width: rect.width,
+              height: rect.height
+            });
+          }
         });
         el.resizeObserver.observe(el);
         _this2.setupInstance();
@@ -841,12 +892,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         var nodeIds = [];
         entries.forEach(function (entry) {
           if (entry.type === "group") {
-            var _entry$visibility;
+            var _entry$visibility, _entry$mutuallyExclus, _entry$expanded;
             var groupId = uuidv4();
             objectTree[groupId] = {
               parent: parentId,
               title: entry.title,
-              visibility: (_entry$visibility = entry.visibility) !== null && _entry$visibility !== void 0 ? _entry$visibility : true
+              visibility: (_entry$visibility = entry.visibility) !== null && _entry$visibility !== void 0 ? _entry$visibility : true,
+              mutuallyExclusive: (_entry$mutuallyExclus = entry.mutuallyExclusive) !== null && _entry$mutuallyExclus !== void 0 ? _entry$mutuallyExclus : false,
+              expanded: (_entry$expanded = entry.expanded) !== null && _entry$expanded !== void 0 ? _entry$expanded : true
             };
             // Need this separately to ensure object[groupId] is already assigned
             objectTree[groupId].children = _buildObjectTree(entry.items, groupId);
@@ -1198,7 +1251,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               options: {
                 visibility: options.visibility,
                 opacity: options.opacity,
-                extrusionHeight: options.extrusionHeight
+                extrusionHeight: options.extrusionHeight,
+                expanded: options.expanded
               }
             };
           });
@@ -1307,7 +1361,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
             };
           });
         }
-      } else if (this.props.layers !== prevProps.layers) {
+      } else if (this.props.layers !== prevProps.layers && this.instance) {
         this.setState(function (state) {
           return {
             sceneContext: _objectSpread(_objectSpread({}, state.sceneContext), {}, {

package/components/map3d/layers/VectorLayer3D.js

@@ -36,15 +36,16 @@ export default {
     });
   },
   update3d: function update3d(layer, newOptions, oldOptions, projection) {
+    var source = layer.source.source;
     if (newOptions.styleName !== oldOptions.styleName || newOptions.styleOptions !== oldOptions.styleOptions) {
-      layer.source.setStyle(featureStyleFunction(newOptions));
+      source.setStyle(featureStyleFunction(newOptions));
     } else if (newOptions.styleFunction !== oldOptions.styleFunction) {
-      layer.source.setStyle(newOptions.styleFunction);
+      source.setStyle(newOptions.styleFunction);
     }
     if (newOptions.features !== oldOptions.features) {
-      updateFeatures(layer.source, newOptions, oldOptions, projection, true);
+      updateFeatures(source, newOptions, oldOptions, projection, true);
     } else if ((oldOptions.rev || 0) !== (newOptions.rev || 0)) {
-      layer.source.update();
+      source.update();
     }
   },
   getFields: function getFields(options) {

package/components/map3d/layers/WMSLayer3D.js

@@ -15,14 +15,16 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import ColorLayer from '@giro3d/giro3d/core/layer/ColorLayer';
 import TiledImageSource from '@giro3d/giro3d/sources/TiledImageSource.js';
 import ol from 'openlayers';
-import { wmsImageLoadFunction, wmsToOpenlayersOptions } from '../../map/layers/WMSLayer';
+import { wmsImageLoadFunction, wmsToOpenlayersOptions, getClientSideOpacity } from '../../map/layers/WMSLayer';
 export default {
   create3d: function create3d(options, projection) {
     var queryParameters = _objectSpread(_objectSpread({}, wmsToOpenlayersOptions(options)), {}, {
       __t: +new Date()
     });
-    return new ColorLayer({
+    var clientSideOpacity = getClientSideOpacity(options, queryParameters);
+    var layer = new ColorLayer({
       name: options.name,
+      opacity: clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1,
       source: new TiledImageSource({
         source: new ol.source.TileWMS({
           url: options.url.split("?")[0],
@@ -35,13 +37,17 @@ export default {
         })
       })
     });
+    layer.visible = queryParameters.LAYERS !== "" && options.visibility;
+    return layer;
   },
   update3d: function update3d(layer, newOptions, oldOptions, projection) {
-    var _layer$source;
-    if (oldOptions && layer !== null && layer !== void 0 && (_layer$source = layer.source) !== null && _layer$source !== void 0 && _layer$source.updateParams) {
+    var source = layer.source.source;
+    if (oldOptions && source.updateParams) {
       var changed = (oldOptions.rev || 0) !== (newOptions.rev || 0);
       var oldParams = wmsToOpenlayersOptions(oldOptions);
+      getClientSideOpacity(oldOptions, oldParams); // Make getClientSideOpacity transform oldParams if necessary
       var newParams = wmsToOpenlayersOptions(newOptions);
+      var clientSideOpacity = getClientSideOpacity(newOptions, newParams);
       Object.keys(oldParams).forEach(function (key) {
         if (!(key in newParams)) {
           newParams[key] = undefined;
@@ -60,15 +66,18 @@ export default {
         if (layer.__updateTimeout) {
           clearTimeout(layer.__updateTimeout);
         }
-        if (!newOptions.visibility || !queryParameters.LAYERS) {
+        if (!newOptions.visibility || queryParameters.LAYERS === "") {
           layer.visible = false;
         }
+        layer.opacity = clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1;
         layer.__updateTimeout = setTimeout(function () {
-          layer.visible = queryParameters.LAYERS && newOptions.visibility;
-          layer.source.updateParams(queryParameters);
-          layer.update();
+          layer.visible = queryParameters.LAYERS !== "" && newOptions.visibility;
+          source.updateParams(queryParameters);
+          layer.source.update();
           layer.__updateTimeout = null;
         }, 500);
+      } else {
+        layer.opacity = clientSideOpacity !== null && clientSideOpacity !== void 0 ? clientSideOpacity : 1;
       }
     }
   }

package/package.json

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

package/plugins/map3d/LayerTree3D.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -40,6 +42,7 @@ import Icon from '../../components/Icon';
 import ImportObjects3D from '../../components/map3d/ImportObjects3D';
 import SideBar from '../../components/SideBar';
 import NumberInput from '../../components/widgets/NumberInput';
+import LayerUtils from '../../utils/LayerUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
 import './style/LayerTree3D.css';
 
@@ -61,19 +64,25 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "renderBody", function () {
       var sceneContext = _this.props.sceneContext;
+      var objectsHaveGroups = sceneContext.objectTree["null"].children.some(function (child) {
+        return !isEmpty(sceneContext.objectTree[child].children);
+      });
+      var layersHaveSublayers = Object.values(sceneContext.colorLayers).some(function (layer) {
+        return !isEmpty(layer.sublayers);
+      });
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-layers"
       }, /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-section"
       }, LocaleUtils.tr("layertree3d.objects")), sceneContext.objectTree["null"].children.map(function (objectId) {
-        return _this.renderLayerEntry(objectId, sceneContext.objectTree[objectId], sceneContext.updateSceneObject, true);
+        return _this.renderLayerEntry(objectId, sceneContext.objectTree[objectId], null, _this.updateSceneObject, true, true, [], objectsHaveGroups);
       }), /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-section"
       }, LocaleUtils.tr("layertree3d.layers")), Object.entries(sceneContext.colorLayers).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           layerId = _ref2[0],
           entry = _ref2[1];
-        return _this.renderLayerEntry(layerId, entry, sceneContext.updateColorLayer, false);
+        return _this.renderLayerEntry(layerId, entry, null, _this.updateColorLayer, false, true, [], layersHaveSublayers);
       }), /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-option",
         onClick: function onClick() {
@@ -90,45 +99,72 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         sceneContext: _this.props.sceneContext
       }) : null);
     });
-    _defineProperty(_this, "renderLayerEntry", function (entryId, entry, updateCallback, isObject) {
+    _defineProperty(_this, "renderLayerEntry", function (entryId, entry, parent, updateCallback, isObject, parentVisible, path) {
       var _entry$title, _entry$title2;
-      var parentVisible = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+      var haveExpanders = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
       if (entry.layertree === false) {
         return null;
       }
+      var key = [entryId].concat(_toConsumableArray(path)).join(":");
       var classes = classNames({
         "layertree3d-item": true,
         "layertree3d-item-disabled": !entry.visibility || !parentVisible
       });
       var styleMenuClasses = classNames({
         "layertree3d-item-menubutton": true,
-        "layertree3d-item-menubutton-active": _this.state.activestylemenu === entryId
+        "layertree3d-item-menubutton-active": _this.state.activestylemenu === key
       });
       var optMenuClasses = classNames({
         "layertree3d-item-menubutton": true,
-        "layertree3d-item-menubutton-active": _this.state.activemenu === entryId
+        "layertree3d-item-menubutton-active": _this.state.activemenu === key
       });
+      var expander = null;
+      if (haveExpanders) {
+        expander = !isEmpty(entry.sublayers) || !isEmpty(entry.children) ? /*#__PURE__*/React.createElement(Icon, {
+          className: "layertree3d-item-expander",
+          icon: entry.expanded === false ? "tree_plus" : "tree_minus",
+          onClick: function onClick() {
+            var _entry$expanded;
+            return updateCallback(entryId, {
+              expanded: !((_entry$expanded = entry.expanded) !== null && _entry$expanded !== void 0 ? _entry$expanded : true)
+            }, {
+              path: path
+            });
+          }
+        }) : /*#__PURE__*/React.createElement("span", {
+          className: "layertree3d-item-expander"
+        });
+      }
       return /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-container",
-        key: entryId
+        key: key
       }, /*#__PURE__*/React.createElement("div", {
         className: classes
-      }, /*#__PURE__*/React.createElement(Icon, {
+      }, expander, /*#__PURE__*/React.createElement(Icon, {
         className: "layertree3d-item-checkbox",
-        icon: entry.visibility ? "checked" : "unchecked",
+        icon: _this.computeVisibilityIcon(isObject, entry, parent),
         onClick: function onClick() {
           return updateCallback(entryId, {
             visibility: !entry.visibility
+          }, {
+            path: path
           });
         }
       }), /*#__PURE__*/React.createElement("span", {
         className: "layertree3d-item-title",
+        onClick: function onClick() {
+          return updateCallback(entryId, {
+            visibility: !entry.visibility
+          }, {
+            path: path
+          });
+        },
         title: (_entry$title = entry.title) !== null && _entry$title !== void 0 ? _entry$title : entryId
       }, (_entry$title2 = entry.title) !== null && _entry$title2 !== void 0 ? _entry$title2 : entryId), Object.keys(entry.styles || {}).length > 1 ? /*#__PURE__*/React.createElement(Icon, {
         className: styleMenuClasses,
         icon: "paint",
         onClick: function onClick() {
-          return _this.layerStyleMenuToggled(entryId);
+          return _this.layerStyleMenuToggled(key);
         }
       }) : null, entry.drawGroup || entry.imported ? /*#__PURE__*/React.createElement(Icon, {
         className: "layertree3d-item-remove",
@@ -140,9 +176,9 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         className: optMenuClasses,
         icon: "cog",
         onClick: function onClick() {
-          return _this.layerMenuToggled(entryId);
+          return _this.layerMenuToggled(key);
         }
-      })), _this.state.activemenu === entryId ? /*#__PURE__*/React.createElement("div", {
+      })), _this.state.activemenu === key ? /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-optionsmenu"
       }, /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-optionsmenu-row"
@@ -166,12 +202,25 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         onChange: function onChange(ev) {
           return updateCallback(entryId, {
             opacity: parseInt(ev.target.value, 10)
+          }, {
+            path: path
           });
         },
         step: "1",
         type: "range",
         value: entry.opacity
-      })), entry.extrusionHeight !== undefined ? /*#__PURE__*/React.createElement("div", {
+      }), (!isEmpty(entry.children) || !isEmpty(entry.sublayers)) && !_this.props.groupTogglesSublayers ? /*#__PURE__*/React.createElement(Icon, {
+        icon: "tree",
+        onClick: function onClick() {
+          return updateCallback(entryId, {
+            visibility: !entry.visibility
+          }, {
+            path: path,
+            groupTogglesSublayers: true
+          });
+        },
+        title: LocaleUtils.tr("layertree.togglegroup")
+      }) : null), entry.extrusionHeight !== undefined ? /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-optionsmenu-row"
       }, /*#__PURE__*/React.createElement("span", null, "Extrude:"), /*#__PURE__*/React.createElement(React.Fragment, null, "\xA0"), /*#__PURE__*/React.createElement("select", {
         onChange: function onChange(ev) {
@@ -196,7 +245,7 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
           });
         },
         value: entry.extrusionHeight
-      }) : null) : null) : null, _this.state.activestylemenu === entryId ? /*#__PURE__*/React.createElement("div", {
+      }) : null) : null) : null, _this.state.activestylemenu === key ? /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-stylemenu"
       }, Object.keys(entry.styles).map(function (name) {
         return /*#__PURE__*/React.createElement("div", {
@@ -209,72 +258,47 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: entry.style === name ? "radio_checked" : "radio_unchecked"
         }), /*#__PURE__*/React.createElement("div", null, name));
-      })) : null, !isEmpty(entry.sublayers) ? /*#__PURE__*/React.createElement("div", {
+      })) : null, !isEmpty(entry.sublayers) && entry.expanded !== false ? /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-sublayers"
       }, entry.sublayers.map(function (sublayer, idx) {
-        return _this.renderSublayer(sublayer, entryId, updateCallback, [idx], entry.visibility);
-      })) : null, !isEmpty(entry.children) ? /*#__PURE__*/React.createElement("div", {
+        return _this.renderLayerEntry(entryId, sublayer, entry, updateCallback, isObject, parentVisible && entry.visibility, [].concat(_toConsumableArray(path), [idx]));
+      })) : null, !isEmpty(entry.children) && entry.expanded !== false ? /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-item-sublayers"
-      }, entry.children.map(function (childId) {
-        return _this.renderLayerEntry(childId, _this.props.sceneContext.objectTree[childId], updateCallback, true, parentVisible && entry.visibility);
+      }, entry.children.map(function (childId, idx) {
+        return _this.renderLayerEntry(childId, _this.props.sceneContext.objectTree[childId], entry, updateCallback, isObject, parentVisible && entry.visibility, [].concat(_toConsumableArray(path), [idx]));
       })) : null);
     });
-    _defineProperty(_this, "renderSublayer", function (sublayer, entryId, updateCallback, path, parentVisible) {
-      var key = entryId + ":" + path.join(":");
-      var classes = classNames({
-        "layertree3d-item": true,
-        "layertree3d-item-disabled": !parentVisible || !sublayer.visibility
-      });
-      var optMenuClasses = classNames({
-        "layertree3d-item-menubutton": true,
-        "layertree3d-item-menubutton-active": _this.state.activemenu === key
-      });
-      return /*#__PURE__*/React.createElement("div", {
-        className: "layertree3d-item-container",
-        key: key
-      }, /*#__PURE__*/React.createElement("div", {
-        className: classes
-      }, /*#__PURE__*/React.createElement(Icon, {
-        className: "layertree3d-item-checkbox",
-        icon: sublayer.visibility ? "checked" : "unchecked",
-        onClick: function onClick() {
-          return updateCallback(entryId, {
-            visibility: !sublayer.visibility
-          }, path);
-        },
-        sublayer: "layertree3d-item-checkbox"
-      }), /*#__PURE__*/React.createElement("span", {
-        className: "layertree3d-item-title",
-        title: sublayer.title
-      }, sublayer.title), /*#__PURE__*/React.createElement(Icon, {
-        className: optMenuClasses,
-        icon: "cog",
-        onClick: function onClick() {
-          return _this.layerMenuToggled(key);
+    _defineProperty(_this, "computeVisibilityIcon", function (isObject, entry, parent) {
+      if (parent !== null && parent !== void 0 && parent.mutuallyExclusive) {
+        return entry.visibility ? "radio_checked" : "radio_unchecked";
+      }
+      if (!entry.visibility) {
+        return "unchecked";
+      } else {
+        if (_this.props.groupTogglesSublayers) {
+          var subtreevisibility = isObject ? _this.computeObjectTreeVisibility(entry) : LayerUtils.computeLayerVisibility(entry);
+          return subtreevisibility === 1 ? "checked" : "tristate";
+        } else {
+          return "checked";
         }
-      })), _this.state.activemenu === key ? /*#__PURE__*/React.createElement("div", {
-        className: "layertree3d-item-optionsmenu"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "layertree3d-item-optionsmenu-row"
-      }, /*#__PURE__*/React.createElement(Icon, {
-        icon: "transparency"
-      }), /*#__PURE__*/React.createElement("input", {
-        className: "layertree3d-item-transparency-slider",
-        max: "255",
-        min: "0",
-        onChange: function onChange(ev) {
-          return updateCallback(entryId, {
-            opacity: parseInt(ev.target.value, 10)
-          }, path);
-        },
-        step: "1",
-        type: "range",
-        value: sublayer.opacity
-      }))) : null, !isEmpty(sublayer.sublayers) ? /*#__PURE__*/React.createElement("div", {
-        className: "layertree3d-item-sublayers"
-      }, sublayer.sublayers.map(function (child, idx) {
-        return _this.renderSublayer(child, entryId, updateCallback, [].concat(_toConsumableArray(path), [idx]), parentVisible && sublayer.visibility);
-      })) : null);
+      }
+    });
+    _defineProperty(_this, "computeObjectTreeVisibility", function (entry) {
+      if (isEmpty(entry.children) || entry.visibility === false) {
+        return entry.visibility ? 1 : 0;
+      }
+      var visible = 0;
+      entry.children.map(function (childId) {
+        var _child$visibility;
+        var child = _this.props.sceneContext.objectTree[childId];
+        var sublayervisibility = (_child$visibility = child.visibility) !== null && _child$visibility !== void 0 ? _child$visibility : true;
+        if (child.children && sublayervisibility) {
+          visible += _this.computeObjectTreeVisibility(entry);
+        } else {
+          visible += sublayervisibility ? 1 : 0;
+        }
+      });
+      return visible / entry.children.length;
     });
     _defineProperty(_this, "layerStyleMenuToggled", function (entryId) {
       _this.setState(function (state) {
@@ -295,6 +319,18 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         objectId: objectId
       });
     });
+    _defineProperty(_this, "updateSceneObject", function (objectId, options) {
+      var flags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      _this.props.sceneContext.updateSceneObject(objectId, options, _objectSpread({
+        groupTogglesSublayers: _this.props.groupTogglesSublayers
+      }, flags));
+    });
+    _defineProperty(_this, "updateColorLayer", function (objectId, options) {
+      var flags = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      _this.props.sceneContext.updateColorLayer(objectId, options, _objectSpread({
+        groupTogglesSublayers: _this.props.groupTogglesSublayers
+      }, flags));
+    });
     return _this;
   }
   _inherits(LayerTree3D, _React$Component);
@@ -316,6 +352,8 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(LayerTree3D, "propTypes", {
+  /** Whether toggling a group also toggles all sublayers. */
+  groupTogglesSublayers: PropTypes.bool,
   /** Base URL of imported tile sets. */
   importedTilesBaseUrl: PropTypes.string,
   sceneContext: PropTypes.object,

package/plugins/map3d/style/LayerTree3D.css

@@ -6,6 +6,11 @@
     padding: 0.25em 0 0 0.25em;
 }
 
+#LayerTree3D span.layertree3d-item-expander {
+    margin-right: 0.25em;
+    flex: 0 0 1em;
+}
+
 #LayerTree3D div.layertree3d-item-container {
     padding-left: 0.5em;
 }
@@ -31,6 +36,7 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    cursor: pointer;
 }
 
 #LayerTree3D span.layertree3d-item-transparency {

package/reducers/layers.js

@@ -224,7 +224,6 @@ export default function layers() {
           return state;
         }
       }
-      ;
     case ADD_LAYER_SEPARATOR:
       {
         var _newLayers4 = LayerUtils.insertSeparator(state.flat, action.title, action.afterLayerId, action.afterSublayerPath).map(function (layer) {

package/scripts/themesConfig.js

@@ -668,6 +668,7 @@ function genThemes(themesConfig) {
       defaultPrintResolutions: config.defaultPrintResolutions,
       defaultPrintGrid: config.defaultPrintGrid,
       defaultSearchProviders: config.defaultSearchProviders,
+      defaultMapTips: config.defaultMapTips,
       defaultBackgroundLayers: config.defaultBackgroundLayers || [],
       externalLayers: config.themes.externalLayers || [],
       pluginData: config.themes.pluginData,

package/scripts/themesConfig.py

@@ -625,6 +625,7 @@ def genThemes(themesConfig):
             "defaultPrintGrid": config["defaultPrintGrid"] if "defaultPrintGrid" in config else None,
             "defaultSearchProviders": config["defaultSearchProviders"] if "defaultSearchProviders" in config else None,
             "defaultBackgroundLayers": config["defaultBackgroundLayers"] if "defaultBackgroundLayers" in config else [],
+            "defaultMapTips": config["defaultMapTips"] if "defaultMapTips" in config else None,
             "pluginData": config["themes"]["pluginData"] if "pluginData" in config["themes"] else [],
             "themeInfoLinks": config["themes"]["themeInfoLinks"] if "themeInfoLinks" in config["themes"] else [],
             "externalLayers": config["themes"]["externalLayers"] if "externalLayers" in config["themes"] else [],

package/utils/EditingUtils.js

@@ -193,11 +193,11 @@ export function parseExpression(expr, feature, editConfig, editIface, mapPrefix,
   };
   var result = null;
   try {
-    parser.feed(expr.replace(/\n/, ' '));
+    parser.feed(expr.replace(/\n/g, ' '));
     result = parser.results[0];
   } catch (_unused2) {
     /* eslint-disable-next-line */
-    console.warn("Failed to evaluate expression " + expr.replace(/\n/, ' '));
+    console.warn("Failed to evaluate expression " + expr.replace(/\n/g, ' '));
   }
   delete window.qwc2ExpressionParserContext;
   if (promises.length > 0) {
@@ -244,13 +244,13 @@ export function parseExpressionsAsync(fieldExpressions, feature, editConfig, edi
         expression = _ref.expression;
       var parser = new nearley.Parser(nearley.Grammar.fromCompiled(grammar));
       try {
-        parser.feed(expression.replace(/\n/, ' '));
+        parser.feed(expression.replace(/\n/g, ' '));
         // NOTE: include intermediate results in next context feature
         newfeature.properties[field] = parser.results[0];
         return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, field, parser.results[0]));
       } catch (_unused3) {
         /* eslint-disable-next-line */
-        console.warn("Failed to evaluate expression " + expression.replace(/\n/, ' '));
+        console.warn("Failed to evaluate expression " + expression.replace(/\n/g, ' '));
         return res;
       }
     }, {});