qwc2 2026.6.26 → 2026.6.27

package/components/map3d/Map3D.js

@@ -192,9 +192,11 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "collectColorLayers", function (prevColorLayers, prevLayers) {
+      var _ConfigUtils$getPlugi;
       var prevLayerMap = prevLayers.reduce(function (res, layer) {
         return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layer.id, layer));
       }, {});
+      var showRootEntry = ((_ConfigUtils$getPlugi = ConfigUtils.getPluginConfig("LayerTree")) === null || _ConfigUtils$getPlugi === void 0 || (_ConfigUtils$getPlugi = _ConfigUtils$getPlugi.cfg) === null || _ConfigUtils$getPlugi === void 0 ? void 0 : _ConfigUtils$getPlugi.showRootEntry) !== false;
       return _this2.props.layers.reduce(function (colorLayers, layer) {
         var _prevOptions$projecti, _prevOptions$visibili, _prevOptions$opacity, _prevOptions$extrusio, _prevOptions$fields;
         if (layer.role !== LayerRole.THEME && layer.role !== LayerRole.USERLAYER) {
@@ -220,16 +222,18 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               return _objectSpread(_objectSpread({}, child), {}, {
                 visibility: prevChild.visibility,
                 opacity: prevChild.opacity,
-                sublayers: _preserveSublayerOptions(child, prevChild)
+                sublayers: _preserveSublayerOptions(child, prevChild, false)
               });
             } else {
-              return child;
+              return _objectSpread(_objectSpread({}, child), {}, {
+                visibility: (entry === null || entry === void 0 ? void 0 : entry.role) === LayerRole.THEME && !showRootEntry ? _this2.props.defaultColorLayerVisibility : child.visibility
+              });
             }
           });
         };
         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,
+          visibility: (_prevOptions$visibili = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.visibility) !== null && _prevOptions$visibili !== void 0 ? _prevOptions$visibili : layer.role === LayerRole.THEME && !showRootEntry ? true : _this2.props.defaultColorLayerVisibility,
           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,
           fields: (_prevOptions$fields = prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.fields) !== null && _prevOptions$fields !== void 0 ? _prevOptions$fields : undefined,
@@ -1463,6 +1467,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
 _defineProperty(Map3D, "contextType", MapContainerPortalContext);
 _defineProperty(Map3D, "propTypes", {
   controlsPosition: PropTypes.string,
+  defaultColorLayerVisibility: PropTypes.bool,
   defaultFov: PropTypes.number,
   defaultPointSize: PropTypes.number,
   defaultSceneQuality: PropTypes.number,

package/package.json

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

package/plugins/NewsPopup.js

@@ -22,6 +22,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import React from 'react';
 import { connect } from 'react-redux';
+import axios from 'axios';
 import PropTypes from 'prop-types';
 import { setCurrentTask } from '../actions/task';
 import Icon from '../components/Icon';
@@ -42,6 +43,7 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, NewsPopup);
     _this = _callSuper(this, NewsPopup, [props]);
     _defineProperty(_this, "state", {
+      body: '',
       dontShowAgain: false,
       showPopup: false,
       side: 'right',
@@ -51,8 +53,13 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/React.createElement("div", {
         className: "newspopup-dialog-popup-body",
         role: "body"
-      }, /*#__PURE__*/React.createElement("iframe", {
+      }, _this.props.embedIframe ? /*#__PURE__*/React.createElement("iframe", {
         src: _this.props.newsDocument.replace('{lang}', LocaleUtils.lang())
+      }) : /*#__PURE__*/React.createElement("div", {
+        className: "newspopup-dialog-popup-content",
+        dangerouslySetInnerHTML: {
+          __html: _this.state.body
+        }
       }), /*#__PURE__*/React.createElement("div", {
         className: "newspopup-dialog-popup-buttonbar"
       }, /*#__PURE__*/React.createElement("button", {
@@ -97,6 +104,23 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
   }
   _inherits(NewsPopup, _React$Component);
   return _createClass(NewsPopup, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.componentDidUpdate({});
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _this2 = this;
+      if (this.props.newsDocument && this.props.newsDocument !== prevProps.newsDocument) {
+        axios.get(this.props.newsDocument.replace('{lang}', LocaleUtils.lang())).then(function (response) {
+          _this2.setState({
+            body: response.data
+          });
+        })["catch"](function () {});
+      }
+    }
+  }, {
     key: "render",
     value: function render() {
       if (this.props.showInSidebar) {
@@ -126,6 +150,8 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
   }]);
 }(React.Component);
 _defineProperty(NewsPopup, "propTypes", {
+  /** Whether to embed the news document in an iframe instead of a div. */
+  embedIframe: PropTypes.bool,
   /** URL to the news HTML document to display in the popup. Can contain `{lang}` as a placeholder which will be replaced with the current viewer language.*/
   newsDocument: PropTypes.string,
   /** Revision of the document. */
@@ -138,6 +164,9 @@ _defineProperty(NewsPopup, "propTypes", {
   /** The default width of the sidebar, as a CSS width string. */
   sidebarWidth: PropTypes.string
 });
+_defineProperty(NewsPopup, "defaultProps", {
+  embedIframe: true
+});
 export default connect(function () {
   return {};
 }, {

package/plugins/View3D.js

@@ -455,6 +455,7 @@ var View3D = /*#__PURE__*/function (_React$Component) {
           pluginsConfig: pluginsConfig
         }, /*#__PURE__*/React.createElement(Map3D, {
           controlsPosition: this.props.controlsPosition,
+          defaultColorLayerVisibility: this.props.defaultColorLayerVisibility,
           defaultFov: this.props.defaultFov,
           defaultPointSize: this.props.defaultPointSize,
           defaultSceneQuality: this.props.defaultSceneQuality,
@@ -480,6 +481,8 @@ _defineProperty(View3D, "propTypes", {
   bookmark: PropTypes.object,
   /** The position of the navigation controls. Either `top` or `bottom`. */
   controlsPosition: PropTypes.string,
+  /** Whether 2D layers should be visible by default when opening the 3D view. */
+  defaultColorLayerVisibility: PropTypes.bool,
   /** The default field of view (`20`: min, `100`: max). */
   defaultFov: PropTypes.number,
   /** The default point size for point cloud tiles (`0`: min, `20`: max). Automatic size computation when the value is `0`. */
@@ -522,6 +525,7 @@ _defineProperty(View3D, "propTypes", {
 });
 _defineProperty(View3D, "defaultProps", {
   controlsPosition: 'top',
+  defaultColorLayerVisibility: false,
   defaultFov: 30,
   defaultPointSize: 0,
   defaultSceneQuality: 100,

package/plugins/map3d/LayerTree3D.js

@@ -37,11 +37,13 @@ import { connect } from 'react-redux';
 import classNames from 'classnames';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
+import { LayerRole } from '../../actions/layers';
 import { setCurrentTask } from '../../actions/task';
 import Icon from '../../components/Icon';
 import ImportObjects3D from '../../components/map3d/ImportObjects3D';
 import SideBar from '../../components/SideBar';
 import NumberInput from '../../components/widgets/NumberInput';
+import ConfigUtils from '../../utils/ConfigUtils';
 import LayerUtils from '../../utils/LayerUtils';
 import LocaleUtils from '../../utils/LocaleUtils';
 import './style/LayerTree3D.css';
@@ -63,12 +65,20 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
       importvisible: false
     });
     _defineProperty(_this, "renderBody", function () {
+      var _ConfigUtils$getPlugi;
+      var showRootEntry = ((_ConfigUtils$getPlugi = ConfigUtils.getPluginConfig("LayerTree")) === null || _ConfigUtils$getPlugi === void 0 || (_ConfigUtils$getPlugi = _ConfigUtils$getPlugi.cfg) === null || _ConfigUtils$getPlugi === void 0 ? void 0 : _ConfigUtils$getPlugi.showRootEntry) !== false;
       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);
+        if (layer.role === LayerRole.THEME && !showRootEntry) {
+          return layer.sublayers.some(function (sublayer) {
+            return !isEmpty(sublayer.sublayers);
+          });
+        } else {
+          return !isEmpty(layer.sublayers);
+        }
       });
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-layers"
@@ -82,7 +92,13 @@ var LayerTree3D = /*#__PURE__*/function (_React$Component) {
         var _ref2 = _slicedToArray(_ref, 2),
           layerId = _ref2[0],
           entry = _ref2[1];
-        return _this.renderLayerEntry(layerId, entry, null, _this.updateColorLayer, false, true, [], layersHaveSublayers);
+        if (entry.role === LayerRole.THEME && !showRootEntry) {
+          return entry.sublayers.map(function (sublayer, idx) {
+            return _this.renderLayerEntry(layerId, sublayer, entry, _this.updateColorLayer, false, true, [idx]);
+          });
+        } else {
+          return _this.renderLayerEntry(layerId, entry, null, _this.updateColorLayer, false, true, [], layersHaveSublayers);
+        }
       }), /*#__PURE__*/React.createElement("div", {
         className: "layertree3d-option",
         onClick: function onClick() {

package/plugins/style/NewsPopup.css

@@ -47,6 +47,7 @@ div.newspopup-dialog-popup-body {
     flex: 1 1 auto;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
 }
 
 div.newspopup-dialog-popup-body > iframe {
@@ -57,6 +58,12 @@ div.newspopup-dialog-popup-body > iframe {
     height: 0;
 }
 
+div.newspopup-dialog-popup-body > div.newspopup-dialog-popup-content {
+    flex: 1 1 auto;
+    overflow: auto;
+    padding: 0.5em;
+}
+
 div.newspopup-dialog-popup-body > div.newspopup-dialog-popup-buttonbar {
     border-top: 1px solid var(--border-color);
     flex: 0 0 auto;