qwc2 2026.5.27 → 2026.6.3

package/actions/theme.js

@@ -33,7 +33,7 @@ import MapUtils from '../utils/MapUtils';
 import { UrlParams } from '../utils/PermaLinkUtils';
 import ServiceLayerUtils from '../utils/ServiceLayerUtils';
 import ThemeUtils from '../utils/ThemeUtils';
-import { LayerRole, addLayer, removeLayer, removeAllLayers, replacePlaceholderLayer, setSwipe, setThemeLayersVisibilityPreset } from './layers';
+import { LayerRole, addLayer, removeLayer, removeAllLayers, replacePlaceholderLayer, setSwipe } from './layers';
 import { configureMap } from './map';
 import { showNotification, NotificationType } from './windows';
 export var THEMES_LOADED = 'THEMES_LOADED';
@@ -51,7 +51,7 @@ export function setThemeLayersList(theme) {
     themelist: theme
   };
 }
-export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset) {
+export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask) {
   var _theme$config$section, _theme$config, _theme$config2;
   // Create layer
   var themeLayer = ThemeUtils.createThemeLayer(theme, themes);
@@ -143,9 +143,6 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
     type: SET_CURRENT_THEME,
     theme: theme
   });
-  if (initialVisibilityPreset) {
-    dispatch(setThemeLayersVisibilityPreset(initialVisibilityPreset));
-  }
   var section = ConfigUtils.isMobile() ? "mobile" : "desktop";
   var task = initialTask || ((_theme$config$section = theme === null || theme === void 0 || (_theme$config = theme.config) === null || _theme$config === void 0 || (_theme$config = _theme$config[section]) === null || _theme$config === void 0 ? void 0 : _theme$config.startupTask) !== null && _theme$config$section !== void 0 ? _theme$config$section : theme === null || theme === void 0 || (_theme$config2 = theme.config) === null || _theme$config2 === void 0 ? void 0 : _theme$config2.startupTask) || (initialTheme ? ConfigUtils.getConfigProp("startupTask") : null);
   if (task) {
@@ -162,7 +159,6 @@ 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;
   var initialTask = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : null;
-  var initialVisibilityPreset = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : null;
   return function (dispatch, getState) {
     var _getState$layers, _ref, _theme$mapTips;
     var curLayers = ((_getState$layers = getState().layers) === null || _getState$layers === void 0 ? void 0 : _getState$layers.flat) || [];
@@ -311,13 +307,13 @@ export function setCurrentTheme(theme, themes) {
             dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", diff.join(", ")), NotificationType.WARN, true));
           }
         }
-        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset);
+        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask);
       });
     } else {
       if (!isEmpty(missingThemeLayers)) {
         dispatch(showNotification("missinglayers", LocaleUtils.tr("app.missinglayers", Object.keys(missingThemeLayers).join(", ")), NotificationType.WARN, true));
       }
-      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset);
+      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask);
     }
   };
 }

package/components/ImportLayer.js

@@ -38,7 +38,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
 import isEmpty from 'lodash.isempty';
-import { WorkerMessageHandler } from "pdfjs-dist/build/pdf.worker";
 import Proj4js from 'proj4';
 import PropTypes from 'prop-types';
 import { addLayer, addLayerFeatures } from '../actions/layers';
@@ -439,8 +438,8 @@ var ImportLayer = /*#__PURE__*/function (_React$Component) {
         var tr = computeCorner(idxTR);
         var geoextent = [bl.coo[0], bl.coo[1], tr.coo[0], tr.coo[1]];
         var imgextent = [bl.pixel[0], bl.pixel[1], tr.pixel[0], tr.pixel[1]];
-        import('pdfjs-dist/build/pdf').then(function (pdfjsLib) {
-          pdfjsLib.GlobalWorkerOptions.workerSrc = WorkerMessageHandler;
+        import('pdfjs-dist').then(function (pdfjsLib) {
+          pdfjsLib.GlobalWorkerOptions.workerSrc = new URL('pdfjs-dist/build/pdf.worker.min.mjs', import.meta.url).toString();
           pdfjsLib.getDocument(ev.target.result).promise.then(function (pdf) {
             pdf.getPage(1).then(function (page) {
               var pageViewport = page.getViewport({

package/components/QtDesignerForm.js

@@ -273,7 +273,24 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
       } else {
         elname = nametransform(widget.name);
       }
-      if (widget["class"] === "QLabel") {
+      if (widget.component) {
+        return /*#__PURE__*/React.createElement(widget.component, {
+          addRelationRecord: _this.props.addRelationRecord,
+          editConfigs: _this.props.editConfigs,
+          feature: _this.props.feature,
+          inputConstraints: inputConstraints,
+          mapPrefix: _this.props.mapPrefix,
+          name: elname,
+          onChange: function onChange(val) {
+            return updateField(widget.name, val);
+          },
+          readOnly: _this.props.readOnly,
+          removeRelationRecord: _this.props.removeRelationRecord,
+          reorderRelationRecord: _this.props.reorderRelationRecord,
+          updateRelationField: _this.props.updateRelationField,
+          widget: widget
+        });
+      } else if (widget["class"] === "QLabel") {
         if (widget.name.startsWith("img__")) {
           var _feature$properties$w2, _feature$properties2;
           value = (_feature$properties$w2 = (_feature$properties2 = feature.properties) === null || _feature$properties2 === void 0 ? void 0 : _feature$properties2[widget.name.split("__")[1]]) !== null && _feature$properties$w2 !== void 0 ? _feature$properties$w2 : widget.property.text;

package/components/StandardApp.js

@@ -40,7 +40,6 @@ import deepmerge from 'deepmerge';
 import { register as olProj4Register } from 'ol/proj/proj4';
 import Proj4js from 'proj4';
 import PropTypes from 'prop-types';
-import { refreshBookmarks, refreshVisibilityPresets } from '../actions/bookmark';
 import { localConfigLoaded, setStartupParameters, setColorScheme } from '../actions/localConfig';
 import { changeLocale } from '../actions/locale';
 import { setCurrentTask } from '../actions/task';
@@ -164,7 +163,7 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
             layerParams.reverse();
           }
           var initialTaskParam = params.task ? JSON.parse(decodeURIComponent(params.task)) : null;
-          _this.props.setCurrentTheme(theme, themes, false, initialExtent, layerParams, (_params$bl = params.bl) !== null && _params$bl !== void 0 ? _params$bl : null, state.layers, _this.props.appConfig.themeLayerRestorer, _this.props.appConfig.externalLayerRestorer, initialTaskParam, state.visibilityPreset);
+          _this.props.setCurrentTheme(theme, themes, false, initialExtent, layerParams, (_params$bl = params.bl) !== null && _params$bl !== void 0 ? _params$bl : null, state.layers, _this.props.appConfig.themeLayerRestorer, _this.props.appConfig.externalLayerRestorer, initialTaskParam);
         } else if (!ConfigUtils.havePlugin("Portal")) {
           _this.props.showNotification("missingdefaulttheme", LocaleUtils.tr("app.missingdefaulttheme", params.t), NotificationType.WARN, true);
         }
@@ -205,7 +204,6 @@ var AppContainerComponent = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 _defineProperty(AppContainerComponent, "propTypes", {
   appConfig: PropTypes.object,
-  currentTheme: PropTypes.object,
   defaultUrlParams: PropTypes.string,
   haveMapSize: PropTypes.bool,
   localConfig: PropTypes.object,
@@ -213,7 +211,6 @@ _defineProperty(AppContainerComponent, "propTypes", {
   setBottombarHeight: PropTypes.func,
   setCurrentTask: PropTypes.func,
   setCurrentTheme: PropTypes.func,
-  setThemeLayersVisibilityPreset: PropTypes.func,
   setTopbarHeight: PropTypes.func,
   showNotification: PropTypes.func,
   startupConfig: PropTypes.object,
@@ -268,7 +265,7 @@ var StandardApp = /*#__PURE__*/function (_React$Component2) {
         return res;
       }, {});
       ConfigUtils.loadConfiguration(configParams).then(function (config) {
-        var _window$QWC2PluginCon, _window$QWC2PluginCon2, _window$QWC2PluginCon3, _ref5, _this2$props$appConfi, _this2$props$appConfi2, _this2$props$appConfi3;
+        var _window$QWC2PluginCon, _window$QWC2PluginCon2, _window$QWC2PluginCon3, _ref5, _ref6, _this2$props$appConfi, _this2$props$appConfi2, _this2$props$appConfi3;
         // Merge common config into mobile/desktop config, merge config from appConfig
         var renameTaskButtons = function renameTaskButtons(res, entry) {
           var _entry$cfg$task, _entry$cfg;
@@ -321,7 +318,7 @@ var StandardApp = /*#__PURE__*/function (_React$Component2) {
         });
 
         // Load locale
-        var lang = (_ref5 = (_this2$props$appConfi = (_this2$props$appConfi2 = (_this2$props$appConfi3 = _this2.props.appConfig).getDefaultLocale) === null || _this2$props$appConfi2 === void 0 ? void 0 : _this2$props$appConfi2.call(_this2$props$appConfi3)) !== null && _this2$props$appConfi !== void 0 ? _this2$props$appConfi : initialParams.lang) !== null && _ref5 !== void 0 ? _ref5 : navigator.language;
+        var lang = (_ref5 = (_ref6 = (_this2$props$appConfi = (_this2$props$appConfi2 = (_this2$props$appConfi3 = _this2.props.appConfig).getDefaultLocale) === null || _this2$props$appConfi2 === void 0 ? void 0 : _this2$props$appConfi2.call(_this2$props$appConfi3)) !== null && _this2$props$appConfi !== void 0 ? _this2$props$appConfi : initialParams.lang) !== null && _ref6 !== void 0 ? _ref6 : config.defaultLocale) !== null && _ref5 !== void 0 ? _ref5 : navigator.language;
         LocaleUtils.loadLocale(lang, _this2.props.appConfig.defaultLocaleData).then(function (localeData) {
           StandardApp.store.dispatch(changeLocale(localeData, _this2.props.appConfig.defaultLocaleData));
           _this2.setState({
@@ -334,10 +331,6 @@ var StandardApp = /*#__PURE__*/function (_React$Component2) {
         var colorScheme = initialParams.style || storedColorScheme || ConfigUtils.getConfigProp("defaultColorScheme");
         StandardApp.store.dispatch(setColorScheme(colorScheme));
 
-        // Load all bookmarks & visiblity presets
-        StandardApp.store.dispatch(refreshBookmarks());
-        StandardApp.store.dispatch(refreshVisibilityPresets());
-
         // Resolve permalink and restore settings
         resolvePermaLink(initialParams, function (params, state, success) {
           StandardApp.store.dispatch(setStartupParameters(params, state));

package/components/ThemeList.js

@@ -216,7 +216,12 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
           className: "theme-item-restricted-overlay"
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: "lock"
-        })), isEmpty(matches) ? null : /*#__PURE__*/React.createElement("div", {
+        })), item.hasRestrictedContent ? /*#__PURE__*/React.createElement("div", {
+          className: "theme-item-restricted-content",
+          title: LocaleUtils.tr("themeswitcher.restrictedcontent")
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "lock"
+        })) : null, isEmpty(matches) ? null : /*#__PURE__*/React.createElement("div", {
           className: "theme-item-filterinfo-overlay"
         }, matches.map(function (match) {
           return /*#__PURE__*/React.createElement("div", {

package/components/map3d/Map3D.js

@@ -586,7 +586,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
               objectTree[child] = _objectSpread(_objectSpread({}, objectTree[child]), {}, {
                 visibility: false
               });
-              _this2.objectMap[child].visible = false;
+              if (_this2.objectMap[child]) {
+                _this2.objectMap[child].visible = false;
+              }
             }
           });
         }
@@ -625,10 +627,12 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           }
           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]);
+          if (_this2.objectMap[child.objectId]) {
+            var changed = newVisible !== _this2.objectMap[child.objectId].visible;
+            _this2.objectMap[child.objectId].visible = newVisible;
+            if (changed) {
+              _this2.instance.notifyChange(_this2.objectMap[child.objectId]);
+            }
           }
         }
       });
@@ -803,7 +807,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       // Collect baselayers
       var externalLayers = {};
       var baseLayers = ThemeUtils.createThemeBackgroundLayers(_this2.props.theme.map3d.basemaps || [], _this2.props.themes, null, externalLayers);
-      baseLayers.push({
+      baseLayers.unshift({
         type: "blank",
         name: "",
         title: LocaleUtils.tr("bgswitcher.nobg")

package/components/map3d/utils/FirstPersonControls3D.js

@@ -347,19 +347,21 @@ var FirstPersonControls3D = /*#__PURE__*/function (_Controls) {
         this.target.y += step * dir.y;
 
         // Project overstep onto wall
-        var tangent = new Vector2(-inter.normal.y, inter.normal.x).normalize();
-        var slidestep = tangent.dot(dir) * overstep;
-        if (slidestep < 0) {
-          tangent.negate();
-          slidestep *= -1;
+        if (inter.normal) {
+          var tangent = new Vector2(-inter.normal.y, inter.normal.x).normalize();
+          var slidestep = tangent.dot(dir) * overstep;
+          if (slidestep < 0) {
+            tangent.negate();
+            slidestep *= -1;
+          }
+          raycaster.set(this.target, new Vector3(tangent.x, tangent.y, 0));
+          var slideInter = raycaster.intersectObjects(this.sceneContext.collisionObjects, true)[0];
+          if (slideInter && slideInter.distance - wallBuffer < slidestep) {
+            slidestep = slideInter.distance - wallBuffer;
+          }
+          this.target.x += slidestep * tangent.x;
+          this.target.y += slidestep * tangent.y;
         }
-        raycaster.set(this.target, new Vector3(tangent.x, tangent.y, 0));
-        var slideInter = raycaster.intersectObjects(this.sceneContext.collisionObjects, true)[0];
-        if (slideInter && slideInter.distance - wallBuffer < slidestep) {
-          slidestep = slideInter.distance - wallBuffer;
-        }
-        this.target.x += slidestep * tangent.x;
-        this.target.y += slidestep * tangent.y;
       } else {
         this.target.x += step * dir.x;
         this.target.y += step * dir.y;

package/components/style/SearchBox.css

@@ -1,10 +1,6 @@
 div.SearchBox {
     position: relative;
     display: flex;
-    height: 2em;
-    background-color: var(--input-bg-color);
-    color: var(--text-color);
-    border-radius: var(--border-radius);
 }
 
 div.searchbox-field {

package/components/style/ThemeList.css

@@ -200,3 +200,11 @@ div.ThemeList div.theme-item-restricted-overlay {
     justify-content: center;
     font-size: 400%;
 }
+
+div.ThemeList div.theme-item-restricted-content {
+    position: absolute;
+    right: 0;
+    top: 0;
+    opacity: .5;
+    padding: 0.25em;
+}

package/package.json

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

package/plugins/BackgroundSwitcher.js

@@ -395,7 +395,7 @@ var selector = function selector(state) {
   var backgroundLayers = Object.values(state.layers.flat.filter(function (layer) {
     return layer.role === LayerRole.BACKGROUND;
   }).reduce(function (res, l) {
-    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, l.group || l.name, l.group ? [].concat(_toConsumableArray(res[l.group] || []), [l]) : l));
+    return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, "_" + (l.group || l.name), l.group ? [].concat(_toConsumableArray(res["_" + l.group] || []), [l]) : l));
   }, {}));
   return {
     backgroundLayers: backgroundLayers