qwc2 2026.5.11 → 2026.5.26

package/actions/bookmark.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2025 Stadtwerke München GmbH
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import bookmarkReducer from '../reducers/bookmark';
+import ReducerIndex from '../reducers/index';
+import { getBookmarks, getVisibilityPresets } from '../utils/PermaLinkUtils';
+ReducerIndex.register("bookmark", bookmarkReducer);
+export var SET_BOOKMARKS = 'SET_BOOKMARKS';
+export var SET_VISIBILITY_PRESETS = 'SET_VISIBILITY_PRESETS';
+export function setBookmarks(bookmarks) {
+  return {
+    type: SET_BOOKMARKS,
+    bookmarks: bookmarks
+  };
+}
+export function setVisibilityPresets(visibilityPresets) {
+  return {
+    type: SET_VISIBILITY_PRESETS,
+    visibilityPresets: visibilityPresets
+  };
+}
+export function refreshBookmarks() {
+  return function (dispatch) {
+    getBookmarks(function (bookmarks) {
+      return dispatch(setBookmarks(bookmarks));
+    });
+  };
+}
+export function refreshVisibilityPresets() {
+  return function (dispatch) {
+    getVisibilityPresets(function (presets) {
+      return dispatch(setVisibilityPresets(presets));
+    });
+  };
+}

package/actions/theme.js

@@ -33,13 +33,12 @@ 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 } from './layers';
+import { LayerRole, addLayer, removeLayer, removeAllLayers, replacePlaceholderLayer, setSwipe, setThemeLayersVisibilityPreset } from './layers';
 import { configureMap } from './map';
 import { showNotification, NotificationType } from './windows';
 export var THEMES_LOADED = 'THEMES_LOADED';
 export var SET_THEME_LAYERS_LIST = 'SET_THEME_LAYERS_LIST';
 export var SET_CURRENT_THEME = 'SET_CURRENT_THEME';
-export var SWITCHING_THEME = 'SWITCHING_THEME';
 export function themesLoaded(themes) {
   return {
     type: THEMES_LOADED,
@@ -52,7 +51,7 @@ export function setThemeLayersList(theme) {
     themelist: theme
   };
 }
-export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask) {
+export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset) {
   var _theme$config$section, _theme$config, _theme$config2;
   // Create layer
   var themeLayer = ThemeUtils.createThemeLayer(theme, themes);
@@ -89,7 +88,7 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
       dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
     }
   }
-  var _iterator = _createForOfIteratorHelper(bgLayers),
+  var _iterator = _createForOfIteratorHelper(bgLayers.reverse()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -144,10 +143,9 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
     type: SET_CURRENT_THEME,
     theme: theme
   });
-  dispatch({
-    type: SWITCHING_THEME,
-    switching: false
-  });
+  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) {
@@ -164,6 +162,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;
   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) || [];
@@ -173,10 +172,6 @@ export function setCurrentTheme(theme, themes) {
       return;
     }
     var initialTheme = !getState().theme.current;
-    dispatch({
-      type: SWITCHING_THEME,
-      switching: true
-    });
 
     // Get current background layer if it needs to be preserved
     if (preserve && visibleBgLayer === null && ConfigUtils.getConfigProp("preserveBackgroundOnThemeSwitch", theme) === true) {
@@ -215,10 +210,6 @@ export function setCurrentTheme(theme, themes) {
     }
     dispatch(setSwipe(null));
     if (!theme) {
-      dispatch({
-        type: SWITCHING_THEME,
-        switching: false
-      });
       return;
     }
 
@@ -320,13 +311,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);
+        finishThemeSetup(dispatch, newTheme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset);
       });
     } 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);
+      finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPos, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTheme, initialTask, initialVisibilityPreset);
     }
   };
 }

package/components/AttributeForm.js

@@ -597,6 +597,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Convert text NULL to null
               value = null;
             }
+            if (nrelFieldConfig.type === 'number' && value !== null) {
+              // Ensure numeric values are numbers and not strings
+              value = Number(value);
+            }
 
             // relationValues for table must exist as rows are either pre-existing or were added
             if (!(field in relationValues[datasetname].features[index].properties)) {
@@ -639,6 +643,10 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
               // Convert text NULL to null
               value = null;
             }
+            if (fieldConfig.type === 'number' && value !== null) {
+              // Ensure numeric values are numbers and not strings
+              value = Number(value);
+            }
             if (!(name in feature.properties)) {
               feature.defaultedProperties = [].concat(_toConsumableArray(feature.defaultedProperties || []), [name]);
             }

package/components/BookmarkPanel.js

@@ -0,0 +1,307 @@
+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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Copyright 2021 Oslandia SAS <infos+qwc2@oslandia.com>
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import classnames from 'classnames';
+import isEmpty from 'lodash.isempty';
+import PropTypes from 'prop-types';
+import Icon from '../components/Icon';
+import InputContainer from '../components/widgets/InputContainer';
+import TextInput from '../components/widgets/TextInput';
+import ConfigUtils from '../utils/ConfigUtils';
+import LocaleUtils from '../utils/LocaleUtils';
+import MiscUtils from '../utils/MiscUtils';
+import './style/BookmarkPanel.css';
+
+/**
+ * Allows managing user bookmarks.
+ * or user visibility presets if `visibilityPresetsMode` is true.
+ *
+ * Bookmarks are only allowed for authenticated users.
+ *
+ * Requires `permalinkServiceUrl` to point to a `qwc-permalink-service`.
+ */
+var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
+  function BookmarkPanel() {
+    var _this;
+    _classCallCheck(this, BookmarkPanel);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, BookmarkPanel, [].concat(args));
+    _defineProperty(_this, "state", {
+      renameBookmark: null,
+      currentBookmark: null,
+      busy: false
+    });
+    _defineProperty(_this, "bookmarkClicked", function (ev, bookmark) {
+      if (_this.state.renameBookmark) {
+        // pass
+      } else if (_this.props.openOnClick) {
+        _this.props.onOpen(bookmark.key, ev.button === 1);
+      } else if (_this.state.currentBookmark === bookmark.key) {
+        _this.setState({
+          currentBookmark: null,
+          description: ""
+        });
+      } else {
+        _this.setState({
+          currentBookmark: bookmark.key,
+          description: bookmark.description
+        });
+      }
+    });
+    _defineProperty(_this, "updateBookmarkName", function (text) {
+      _this.setState({
+        busy: true
+      });
+      _this.props.onRename(_this.state.renameBookmark, text, function (success) {
+        if (!success) {
+          var _this$props$translati;
+          /* eslint-disable-next-line */
+          alert((_this$props$translati = _this.props.translations) === null || _this$props$translati === void 0 ? void 0 : _this$props$translati.savefailed);
+        }
+        _this.props.onRefresh();
+      });
+    });
+    _defineProperty(_this, "addBookmark", function () {
+      var _this$props$translati2;
+      _this.setState({
+        busy: true
+      });
+      _this.props.onAdd((_this$props$translati2 = _this.props.translations) === null || _this$props$translati2 === void 0 ? void 0 : _this$props$translati2.newbookmark, function (success, key) {
+        if (!success) {
+          var _this$props$translati3;
+          /* eslint-disable-next-line */
+          alert((_this$props$translati3 = _this.props.translations) === null || _this$props$translati3 === void 0 ? void 0 : _this$props$translati3.addfailed);
+        }
+        _this.props.onRefresh();
+      });
+      _this.setState({
+        description: "",
+        currentBookmark: null
+      });
+    });
+    _defineProperty(_this, "updateBookmark", function (key) {
+      _this.setState({
+        busy: true
+      });
+      var description = _this.props.bookmarks.find(function (bk) {
+        return bk.key === key;
+      }).description;
+      _this.props.onUpdate(key, description, function (success) {
+        if (!success) {
+          var _this$props$translati4;
+          /* eslint-disable-next-line */
+          alert((_this$props$translati4 = _this.props.translations) === null || _this$props$translati4 === void 0 ? void 0 : _this$props$translati4.savefailed);
+        }
+        _this.props.onRefresh();
+      });
+    });
+    _defineProperty(_this, "removeBookmark", function (key) {
+      _this.setState({
+        busy: true
+      });
+      _this.props.onRemove(key, function (success) {
+        if (!success) {
+          var _this$props$translati5;
+          /* eslint-disable-next-line */
+          alert((_this$props$translati5 = _this.props.translations) === null || _this$props$translati5 === void 0 ? void 0 : _this$props$translati5.removefailed);
+        }
+        _this.props.onRefresh();
+      });
+    });
+    return _this;
+  }
+  _inherits(BookmarkPanel, _React$Component);
+  return _createClass(BookmarkPanel, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      // Check exact identity of bookmarks array to reset busy state in all cases
+      if (prevProps.bookmarks !== this.props.bookmarks) {
+        this.setState({
+          renameBookmark: null,
+          busy: false
+        });
+        // Select a recently added bookmark
+        var addedBookmark = this.props.bookmarks.find(function (bookmark) {
+          return !prevProps.bookmarks.some(function (prevBookmark) {
+            return prevBookmark.key === bookmark.key;
+          });
+        });
+        if (addedBookmark) {
+          this.setState({
+            renameBookmark: addedBookmark.key,
+            currentBookmark: null
+          });
+        }
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props$translati6,
+        _this$props$translati7,
+        _this$props$translati8,
+        _this2 = this,
+        _this$props$translati9,
+        _this$props$translati0,
+        _this$props$translati1,
+        _this$props$translati10,
+        _this$props$translati11;
+      var username = ConfigUtils.getConfigProp("username");
+      var currentBookmark = this.state.currentBookmark;
+      var buttonsDisabled = !currentBookmark || this.state.busy;
+      return !username ? /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-body",
+        role: "body"
+      }, " ", (_this$props$translati6 = this.props.translations) === null || _this$props$translati6 === void 0 ? void 0 : _this$props$translati6.notloggedin) : /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-body",
+        role: "body"
+      }, /*#__PURE__*/React.createElement("h4", {
+        className: "bookmark-header"
+      }, /*#__PURE__*/React.createElement("span", null, (_this$props$translati7 = this.props.translations) === null || _this$props$translati7 === void 0 ? void 0 : _this$props$translati7.manage), /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        onClick: this.addBookmark,
+        title: (_this$props$translati8 = this.props.translations) === null || _this$props$translati8 === void 0 ? void 0 : _this$props$translati8.add
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "plus"
+      }))), !this.props.openOnClick ? /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-actions controlgroup"
+      }, /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.props.onOpen(currentBookmark, false);
+        },
+        title: (_this$props$translati9 = this.props.translations) === null || _this$props$translati9 === void 0 ? void 0 : _this$props$translati9.open
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "folder-open"
+      })), this.props.showOpenTab ? /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.props.onOpen(currentBookmark, true);
+        },
+        title: (_this$props$translati0 = this.props.translations) === null || _this$props$translati0 === void 0 ? void 0 : _this$props$translati0.openTab
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "open_link"
+      })) : null, this.props.showZoomToExtent ? /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.props.onZoomToExtent(currentBookmark);
+        },
+        title: (_this$props$translati1 = this.props.translations) === null || _this$props$translati1 === void 0 ? void 0 : _this$props$translati1.zoomToExtent
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "zoom"
+      })) : null, /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.updateBookmark(currentBookmark);
+        },
+        title: (_this$props$translati10 = this.props.translations) === null || _this$props$translati10 === void 0 ? void 0 : _this$props$translati10.update
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "save"
+      }))) : null, /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-list"
+      }, this.props.bookmarks.map(function (bookmark) {
+        var _this2$props$translat;
+        var itemclasses = classnames({
+          "bookmark-list-item": true,
+          "bookmark-list-item-active": currentBookmark === bookmark.key
+        });
+        return /*#__PURE__*/React.createElement("div", {
+          className: itemclasses,
+          key: bookmark.key,
+          onAuxClick: function onAuxClick(ev) {
+            return _this2.bookmarkClicked(ev, bookmark);
+          },
+          onClick: function onClick(ev) {
+            return _this2.bookmarkClicked(ev, bookmark);
+          },
+          onDoubleClick: function onDoubleClick() {
+            return _this2.props.onOpen(bookmark.key, false);
+          },
+          title: ((_this2$props$translat = _this2.props.translations) === null || _this2$props$translat === void 0 ? void 0 : _this2$props$translat.lastUpdate) + ": " + bookmark.date
+        }, _this2.state.renameBookmark === bookmark.key ? /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(TextInput, {
+          focusOnRef: true,
+          onChange: _this2.updateBookmarkName,
+          onNoChange: function onNoChange() {
+            return _this2.setState({
+              renameBookmark: null
+            });
+          },
+          role: "input",
+          showClear: false,
+          value: bookmark.description
+        }), /*#__PURE__*/React.createElement(Icon, {
+          icon: "ok",
+          onClick: MiscUtils.killEvent,
+          role: "suffix"
+        })) : /*#__PURE__*/React.createElement("span", null, bookmark.description), _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+          icon: "draw",
+          onClick: function onClick(ev) {
+            _this2.setState({
+              renameBookmark: bookmark.key,
+              currentBookmark: null
+            });
+            MiscUtils.killEvent(ev);
+          },
+          title: LocaleUtils.tr("common.rename")
+        }) : null, _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+          disabled: _this2.state.busy,
+          icon: "trash",
+          onClick: function onClick(ev) {
+            _this2.removeBookmark(bookmark.key);
+            MiscUtils.killEvent(ev);
+          },
+          title: LocaleUtils.tr("common.delete")
+        }) : null);
+      }), isEmpty(this.props.bookmarks) ? /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-list-item-empty"
+      }, (_this$props$translati11 = this.props.translations) === null || _this$props$translati11 === void 0 ? void 0 : _this$props$translati11.nobookmarks) : null));
+    }
+  }]);
+}(React.Component);
+_defineProperty(BookmarkPanel, "availableIn3D", true);
+_defineProperty(BookmarkPanel, "propTypes", {
+  bookmarks: PropTypes.array,
+  onAdd: PropTypes.func,
+  onOpen: PropTypes.func,
+  onRefresh: PropTypes.func,
+  onRemove: PropTypes.func,
+  onRename: PropTypes.func,
+  onUpdate: PropTypes.func,
+  onZoomToExtent: PropTypes.func,
+  /** Whether to directly open the bookmark on click / middle click, instead of showing dedicated open buttons. */
+  openOnClick: PropTypes.bool,
+  showOpenTab: PropTypes.bool,
+  showZoomToExtent: PropTypes.bool,
+  translations: PropTypes.objectOf(PropTypes.string)
+});
+_defineProperty(BookmarkPanel, "defaultProps", {
+  showOpenTab: true,
+  showZoomToExtent: false
+});
+export default BookmarkPanel;

package/components/MapButton.js

@@ -35,18 +35,6 @@ var MapButton = /*#__PURE__*/function (_React$Component) {
   }
   _inherits(MapButton, _React$Component);
   return _createClass(MapButton, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.componentDidUpdate({});
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (this.context && this.props.position !== prevProps.position) {
-        this.context.recomputeSpacers();
-      }
-    }
-  }, {
     key: "render",
     value: function render() {
       if (!this.context) {

package/components/PluginsContainer.js

@@ -171,6 +171,7 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
                 // Reorder child nodes for natural tab focus order
                 var children = _toConsumableArray(el.children);
                 var slots = {};
+                var usedSlots = new Set();
                 children.forEach(function (child) {
                   if (child.dataset.subslot === undefined) {
                     var _slots$child$dataset$;
@@ -178,12 +179,35 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
                     slots[child.dataset.slot] = child.dataset.subslot = subslot;
                     child.style.order = 100 * parseInt(child.style.order, 10) + subslot;
                   }
+                  if (child.dataset.slot !== undefined) {
+                    usedSlots.add(child.dataset.slot);
+                  }
                 });
                 children.sort(function (a, b) {
                   return b.style.order - a.style.order;
                 }).forEach(function (node) {
                   return el.appendChild(node);
                 });
+                var slotString = _toConsumableArray(usedSlots).sort().join(":");
+                if (slotString !== el.dataset.slotString) {
+                  // Recompute spacers
+                  children.forEach(function (child) {
+                    if (child.dataset.spacer) {
+                      el.removeChild(child);
+                    }
+                  });
+                  var maxSlot = Math.max.apply(Math, _toConsumableArray(usedSlots));
+                  for (var i = 0; i < maxSlot; ++i) {
+                    if (!usedSlots.has(String(i))) {
+                      var child = document.createElement("div");
+                      child.className = "map-buttons-spacer";
+                      child.dataset.spacer = 1;
+                      child.style.order = 100 * i;
+                      el.appendChild(child);
+                    }
+                  }
+                  el.dataset.slotString = slotString;
+                }
               }
             };
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -202,26 +226,6 @@ var PluginsContainer = /*#__PURE__*/function (_React$Component) {
           childList: true
         });
         resizeObserver.observe(el);
-        el.recomputeSpacers = function () {
-          var slots = new Set();
-          Array.from(el.childNodes).forEach(function (child) {
-            if (child.dataset.spacer) {
-              el.removeChild(child);
-            } else {
-              slots.add(child.dataset.slot);
-            }
-          });
-          var maxSlot = Math.max.apply(Math, _toConsumableArray(slots));
-          for (var i = 0; i < maxSlot; ++i) {
-            if (!slots.has(String(i))) {
-              var child = document.createElement("div");
-              child.className = "map-buttons-spacer";
-              child.dataset.spacer = 1;
-              child.style.order = 100 * i;
-              el.appendChild(child);
-            }
-          }
-        };
       }
     });
     return _this;

package/components/QtDesignerForm.js

@@ -612,7 +612,8 @@ var QtDesignerForm = /*#__PURE__*/function (_React$Component) {
           readOnly: inputConstraints.readOnly,
           required: inputConstraints.required,
           style: fontStyle,
-          value: value
+          value: value,
+          valueHasTz: field.data_type === "timestamp with time zone"
         });
       } else if (widget["class"] === "QListWidget") {
         return /*#__PURE__*/React.createElement(ListInput, {

package/components/ResizeableWindow.js

@@ -54,7 +54,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       ev.stopPropagation();
     });
     _defineProperty(_this, "renderTitleBar", function () {
-      if (_this.props.fullscreen) {
+      if (_this.props.fullscreen || _this.props.hideTitleBar) {
         return null;
       }
       var maximized = _this.state.geometry.maximized ? true : false;
@@ -118,7 +118,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
           onClick: entry.callback,
           title: entry.title
         });
-      }), !maximized && dockable ? /*#__PURE__*/React.createElement(Icon, {
+      }), !maximized && dockable && !_this.props.hideDockIcon ? /*#__PURE__*/React.createElement(Icon, {
         className: iconClasses,
         icon: dockIcon,
         onClick: _this.toggleDock,
@@ -549,6 +549,8 @@ _defineProperty(ResizeableWindow, "propTypes", {
   })),
   fitHeight: PropTypes.bool,
   fullscreen: PropTypes.bool,
+  hideDockIcon: PropTypes.bool,
+  hideTitleBar: PropTypes.bool,
   icon: PropTypes.string,
   initialHeight: PropTypes.number,
   initialWidth: PropTypes.number,

package/components/StandardApp.js

@@ -40,6 +40,7 @@ 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';
@@ -163,7 +164,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);
+          _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);
         } else if (!ConfigUtils.havePlugin("Portal")) {
           _this.props.showNotification("missingdefaulttheme", LocaleUtils.tr("app.missingdefaulttheme", params.t), NotificationType.WARN, true);
         }
@@ -204,6 +205,7 @@ 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,
@@ -211,6 +213,7 @@ _defineProperty(AppContainerComponent, "propTypes", {
   setBottombarHeight: PropTypes.func,
   setCurrentTask: PropTypes.func,
   setCurrentTheme: PropTypes.func,
+  setThemeLayersVisibilityPreset: PropTypes.func,
   setTopbarHeight: PropTypes.func,
   showNotification: PropTypes.func,
   startupConfig: PropTypes.object,
@@ -331,6 +334,10 @@ 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));