qwc2 2026.5.27 → 2026.5.28

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/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,
@@ -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/package.json

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

package/plugins/Bookmark.js

@@ -12,23 +12,37 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 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 { connect } from 'react-redux';
+import classnames from 'classnames';
+import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
-import { refreshBookmarks } from '../actions/bookmark';
-import { zoomToExtent, zoomToPoint } from "../actions/map";
-import BookmarkPanel from '../components/BookmarkPanel';
+import { zoomToExtent, zoomToPoint } from '../actions/map';
+import Icon from '../components/Icon';
 import SideBar from '../components/SideBar';
-import LocaleUtils from "../utils/LocaleUtils";
-import MapUtils from "../utils/MapUtils";
-import { createBookmark, removeBookmark, renameBookmark, resolveBookmark, updateBookmark } from '../utils/PermaLinkUtils';
+import InputContainer from '../components/widgets/InputContainer';
+import TextInput from '../components/widgets/TextInput';
+import ConfigUtils from '../utils/ConfigUtils';
+import LocaleUtils from '../utils/LocaleUtils';
+import MapUtils from '../utils/MapUtils';
+import MiscUtils from '../utils/MiscUtils';
+import { createBookmark, getBookmarks, removeBookmark, renameBookmark, resolveBookmark, updateBookmark } from '../utils/PermaLinkUtils';
+import './style/Bookmark.css';
 
-/**
- * Allows managing user bookmarks which are storing the current view, including the location and zoom level.
- *
- * Bookmarks are only allowed for authenticated users.
- *
- * Requires `permalinkServiceUrl` to point to a `qwc-permalink-service`.
+/**
+ * Allows managing user bookmarks.
+ *
+ * Bookmarks are only allowed for authenticated users.
+ *
+ * Requires `permalinkServiceUrl` to point to a `qwc-permalink-service`.
  */
 var Bookmark = /*#__PURE__*/function (_React$Component) {
   function Bookmark() {
@@ -38,46 +52,57 @@ var Bookmark = /*#__PURE__*/function (_React$Component) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, Bookmark, [].concat(args));
-    _defineProperty(_this, "translations", {
-      add: LocaleUtils.tr("bookmark.add"),
-      addfailed: LocaleUtils.tr("bookmark.addfailed"),
-      lastUpdate: LocaleUtils.tr("bookmark.lastUpdate"),
-      manage: LocaleUtils.tr("bookmark.manage"),
-      newbookmark: LocaleUtils.tr("bookmark.newbookmark"),
-      nobookmarks: LocaleUtils.tr("bookmark.nobookmarks"),
-      notloggedin: LocaleUtils.tr("bookmark.notloggedin"),
-      open: LocaleUtils.tr("bookmark.open"),
-      openTab: LocaleUtils.tr("bookmark.openTab"),
-      update: LocaleUtils.tr("bookmark.update"),
-      zoomToExtent: LocaleUtils.tr("bookmark.zoomToExtent"),
-      removefailed: LocaleUtils.tr("bookmark.removefailed"),
-      savefailed: LocaleUtils.tr("bookmark.savefailed")
+    _defineProperty(_this, "state", {
+      bookmarks: [],
+      renameBookmark: null,
+      currentBookmark: null,
+      description: "",
+      busy: false
+    });
+    _defineProperty(_this, "bookmarkClicked", function (ev, bookmark) {
+      if (_this.state.renameBookmark) {
+        // pass
+      } else if (_this.props.openOnClick) {
+        _this.open(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, "renderBody", function () {
-      return /*#__PURE__*/React.createElement(BookmarkPanel, {
-        bookmarks: _this.props.bookmarks,
-        onAdd: createBookmark,
-        onOpen: _this.onOpen,
-        onRefresh: _this.props.refreshBookmarks,
-        onRemove: removeBookmark,
-        onRename: renameBookmark,
-        onUpdate: updateBookmark,
-        onZoomToExtent: _this.zoomToBookmarkExtent,
-        openOnClick: _this.props.openOnClick,
-        showZoomToExtent: _this.props.mapCrs && _this.props.mapScales,
-        translations: _this.translations
+    _defineProperty(_this, "updateBookmarkName", function (text) {
+      _this.setState({
+        busy: true
+      });
+      renameBookmark(_this.state.renameBookmark, text, function (success) {
+        if (!success) {
+          /* eslint-disable-next-line */
+          alert(LocaleUtils.tr("bookmark.savefailed"));
+        }
+        _this.refresh(function () {
+          return _this.setState({
+            renameBookmark: null,
+            busy: false
+          });
+        });
       });
     });
-    _defineProperty(_this, "onOpen", function (key, newtab) {
-      var url = location.href.split("?")[0] + '?bk=' + key;
+    _defineProperty(_this, "open", function (bookmarkkey, newtab) {
+      var url = location.href.split("?")[0] + '?bk=' + bookmarkkey;
       if (newtab) {
         window.open(url, '_blank');
       } else {
         location.href = url;
       }
     });
-    _defineProperty(_this, "zoomToBookmarkExtent", function (key) {
-      resolveBookmark(key, function (params) {
+    _defineProperty(_this, "zoomToBookmarkExtent", function (bookmarkkey) {
+      resolveBookmark(bookmarkkey, function (params) {
         if ('c' in params && 's' in params) {
           var _params$crs;
           var scale = parseFloat(params.s);
@@ -95,53 +120,237 @@ var Bookmark = /*#__PURE__*/function (_React$Component) {
         }
       });
     });
+    _defineProperty(_this, "addBookmark", function () {
+      _this.setState({
+        busy: true
+      });
+      createBookmark(LocaleUtils.tr("bookmark.newbookmark"), function (success, key) {
+        if (!success) {
+          /* eslint-disable-next-line */
+          alert(LocaleUtils.tr("bookmark.addfailed"));
+        } else {
+          _this.refresh(function () {
+            return _this.setState({
+              renameBookmark: key,
+              busy: false
+            });
+          });
+        }
+      });
+      _this.setState({
+        description: "",
+        currentBookmark: null
+      });
+    });
+    _defineProperty(_this, "updateBookmark", function (key) {
+      _this.setState({
+        busy: true
+      });
+      var description = _this.state.bookmarks.find(function (bk) {
+        return bk.key === key;
+      }).description;
+      updateBookmark(key, description, function (success) {
+        if (!success) {
+          /* eslint-disable-next-line */
+          alert(LocaleUtils.tr("bookmark.savefailed"));
+        }
+        _this.refresh(function () {
+          return _this.setState({
+            busy: false,
+            currentBookmark: null
+          });
+        });
+      });
+    });
+    _defineProperty(_this, "removeBookmark", function (key) {
+      _this.setState({
+        busy: true
+      });
+      removeBookmark(key, function (success) {
+        if (!success) {
+          /* eslint-disable-next-line */
+          alert(LocaleUtils.tr("bookmark.removefailed"));
+        }
+        _this.refresh(function () {
+          return _this.setState({
+            busy: false
+          });
+        });
+      });
+    });
+    _defineProperty(_this, "refresh", function () {
+      var callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      if (ConfigUtils.getConfigProp("username")) {
+        getBookmarks(function (bookmarks) {
+          _this.setState({
+            bookmarks: bookmarks
+          });
+          callback === null || callback === void 0 || callback(bookmarks);
+        });
+      }
+    });
     return _this;
   }
   _inherits(Bookmark, _React$Component);
   return _createClass(Bookmark, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.refresh();
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this2 = this;
+      var openTitle = LocaleUtils.tr("bookmark.open");
+      var openTabTitle = LocaleUtils.tr("bookmark.openTab");
+      var zoomTitle = LocaleUtils.tr("bookmark.zoomToExtent");
+      var username = ConfigUtils.getConfigProp("username");
+      var updateTitle = LocaleUtils.tr("bookmark.update");
+      var lastUpdateTitle = LocaleUtils.tr("bookmark.lastUpdate");
+      var currentBookmark = this.state.currentBookmark;
+      var buttonsDisabled = !currentBookmark || this.state.busy;
       return /*#__PURE__*/React.createElement(SideBar, {
         icon: "bookmark",
         id: "Bookmark",
+        onShow: this.refresh,
         side: this.props.side,
         title: LocaleUtils.tr("appmenu.items.Bookmark"),
         width: "20em"
-      }, function () {
-        return {
-          body: _this2.renderBody()
-        };
-      });
+      }, !username ? /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-body",
+        role: "body"
+      }, LocaleUtils.tr("bookmark.notloggedin")) : /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-body",
+        role: "body"
+      }, /*#__PURE__*/React.createElement("h4", {
+        className: "bookmark-header"
+      }, /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("bookmark.manage")), /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        onClick: this.addBookmark,
+        title: LocaleUtils.tr("bookmark.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.open(currentBookmark, false);
+        },
+        title: openTitle
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "folder-open"
+      })), /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.open(currentBookmark, true);
+        },
+        title: openTabTitle
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "open_link"
+      })), this.props.mapCrs && this.props.mapScales ? /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.zoomToBookmarkExtent(currentBookmark);
+        },
+        title: zoomTitle
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "zoom"
+      })) : null, /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        disabled: buttonsDisabled,
+        onClick: function onClick() {
+          return _this2.updateBookmark(currentBookmark);
+        },
+        title: updateTitle
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "save"
+      }))) : null, /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-list"
+      }, this.state.bookmarks.map(function (bookmark) {
+        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.open(bookmark.key, false);
+          },
+          title: lastUpdateTitle + ": " + 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.state.bookmarks) ? /*#__PURE__*/React.createElement("div", {
+        className: "bookmark-list-item-empty"
+      }, LocaleUtils.tr("bookmark.nobookmarks")) : null)));
     }
   }]);
 }(React.Component);
 _defineProperty(Bookmark, "availableIn3D", true);
 _defineProperty(Bookmark, "propTypes", {
-  bookmarks: PropTypes.array,
   mapCrs: PropTypes.string,
   mapScales: PropTypes.array,
   /** Whether to directly open the bookmark on click / middle click, instead of showing dedicated open buttons. */
   openOnClick: PropTypes.bool,
-  refreshBookmarks: PropTypes.func,
   /** The side of the application on which to display the sidebar. */
   side: PropTypes.string,
+  theme: PropTypes.object,
   zoomToExtent: PropTypes.func,
   zoomToPoint: PropTypes.func
 });
 _defineProperty(Bookmark, "defaultProps", {
   side: 'right'
 });
-var selector = function selector(state) {
-  var _state$bookmark, _state$map, _state$map2;
+export default connect(function (state) {
+  var _state$map, _state$map2;
   return {
-    bookmarks: (_state$bookmark = state.bookmark) === null || _state$bookmark === void 0 ? void 0 : _state$bookmark.bookmarks,
     mapCrs: (_state$map = state.map) === null || _state$map === void 0 ? void 0 : _state$map.projection,
-    mapScales: (_state$map2 = state.map) === null || _state$map2 === void 0 ? void 0 : _state$map2.scales
+    mapScales: (_state$map2 = state.map) === null || _state$map2 === void 0 ? void 0 : _state$map2.scales,
+    theme: state.theme.current
   };
-};
-export default connect(selector, {
-  refreshBookmarks: refreshBookmarks,
+}, {
   zoomToExtent: zoomToExtent,
   zoomToPoint: zoomToPoint
 })(Bookmark);

package/plugins/BottomBar.js

@@ -36,17 +36,14 @@ import React from 'react';
 import { connect } from 'react-redux';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
-import { setThemeLayersVisibilityPreset } from '../actions/layers';
 import { changeZoomLevel, setDisplayCrs } from '../actions/map';
 import { openExternalUrl, setBottombarHeight } from '../actions/windows';
 import CoordinateDisplayer from '../components/CoordinateDisplayer';
-import GroupSelect from '../components/widgets/GroupSelect';
 import InputContainer from '../components/widgets/InputContainer';
 import NumberInput from '../components/widgets/NumberInput';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
-import { resolveVisibilityPreset } from "../utils/PermaLinkUtils";
 import './style/BottomBar.css';
 
 /**
@@ -94,22 +91,6 @@ var BottomBar = /*#__PURE__*/function (_React$Component) {
       });
       ev.preventDefault();
     });
-    _defineProperty(_this, "openBookmarkOrPreset", function (prefixedKey) {
-      if (prefixedKey.startsWith("vp:")) {
-        var key = prefixedKey.slice("vp:".length);
-        resolveVisibilityPreset(key, function (preset) {
-          if (preset) {
-            _this.props.setThemeLayersVisibilityPreset(preset);
-          }
-        });
-      } else if (prefixedKey.startsWith("bk:")) {
-        var _key2 = prefixedKey.slice("bk:".length);
-        location.href = location.href.split("?")[0] + '?bk=' + _key2;
-      } else {
-        /* eslint-disable-next-line */
-        console.warn("openBookmarkOrPreset: unexpected key format:", prefixedKey);
-      }
-    });
     _defineProperty(_this, "setScale", function (value) {
       var scale = parseInt(value, 10);
       if (!isNaN(scale)) {
@@ -176,6 +157,7 @@ var BottomBar = /*#__PURE__*/function (_React$Component) {
         rightBottomLinks.push(this.renderLink(_entry));
       }
       var enabledMouseCrs = [].concat(_toConsumableArray(this.props.additionalMouseCrs || []), [this.props.map.projection, "EPSG:4326"]);
+      // eslint-disable-next-line no-unused-vars
       var availableCRS = Object.fromEntries(Object.entries(CoordinatesUtils.getAvailableCRS()).filter(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           key = _ref2[0],
@@ -240,23 +222,6 @@ var BottomBar = /*#__PURE__*/function (_React$Component) {
           value: this.state.scale
         })));
       }
-      var quickSelectDropdown = null;
-      if (this.props.displayQuickSelectDropdown && (this.props.bookmarks && this.props.bookmarks.length > 0 || this.props.visibilityPresets && this.props.visibilityPresets.length > 0)) {
-        var bookmarks = this.props.bookmarks || [];
-        var visibilityPresets = this.props.visibilityPresets || [];
-        var options = _defineProperty(_defineProperty({}, LocaleUtils.tr("appmenu.items.Bookmark"), bookmarks.map(function (bm) {
-          return ["bk:" + bm.key, bm.description];
-        })), LocaleUtils.tr("appmenu.items.VisibilityPresets"), visibilityPresets.map(function (bm) {
-          return ["vp:" + bm.key, bm.description];
-        }));
-        quickSelectDropdown = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
-          className: "bottombar-quick-select-label"
-        }, LocaleUtils.tr("bottombar.quick_select_label"), ":\xA0"), /*#__PURE__*/React.createElement(GroupSelect, {
-          onChange: this.openBookmarkOrPreset,
-          options: options,
-          placeholder: LocaleUtils.tr("bottombar.select")
-        }));
-      }
       var style = {
         marginLeft: this.props.mapMargins.outerLeft + 'px',
         marginRight: this.props.mapMargins.outerRight + 'px'
@@ -269,7 +234,7 @@ var BottomBar = /*#__PURE__*/function (_React$Component) {
         className: "bottombar-links"
       }, leftBottomLinks), /*#__PURE__*/React.createElement("span", {
         className: "bottombar-spacer"
-      }), coordinates, scales, quickSelectDropdown, /*#__PURE__*/React.createElement("span", {
+      }), coordinates, scales, /*#__PURE__*/React.createElement("span", {
         className: "bottombar-spacer"
       }), /*#__PURE__*/React.createElement("span", {
         className: "bottombar-links"
@@ -288,14 +253,11 @@ _defineProperty(BottomBar, "propTypes", {
     icon: PropTypes.string
   })),
   additionalMouseCrs: PropTypes.array,
-  bookmarks: PropTypes.array,
   changeZoomLevel: PropTypes.func,
   /** Custom coordinate formatter, as `(coordinate, crs) => string`. */
   coordinateFormatter: PropTypes.func,
   /** Whether to display the coordinates in the bottom bar. */
   displayCoordinates: PropTypes.bool,
-  /** Whether to display a dropdown menu for the selection of user bookmarks and visibility presets in the bottom bar. */
-  displayQuickSelectDropdown: PropTypes.bool,
   /** Whether to display the scalebar in the bottom bar. */
   displayScalebar: PropTypes.bool,
   /** Whether to display the scale in the bottom bar. */
@@ -308,7 +270,6 @@ _defineProperty(BottomBar, "propTypes", {
   scalebarOptions: PropTypes.object,
   setBottombarHeight: PropTypes.func,
   setDisplayCrs: PropTypes.func,
-  setThemeLayersVisibilityPreset: PropTypes.func,
   /** The URL of the terms label anchor. */
   termsUrl: PropTypes.string,
   /** Icon of the terms inline window. Relevant only when `termsUrlTarget` is `iframe`. */
@@ -320,21 +281,17 @@ _defineProperty(BottomBar, "propTypes", {
   /** Icon of the viewer title inline window. Relevant only when `viewertitleUrl` is `iframe`. */
   viewertitleUrlIcon: PropTypes.string,
   /** The target where to open the viewer title URL. If `iframe`, it will be displayed in an inline window, otherwise in a new tab. You can also use the `:iframedialog:<dialogname>:<options>` syntax to set up the inline window. */
-  viewertitleUrlTarget: PropTypes.string,
-  visibilityPresets: PropTypes.array
+  viewertitleUrlTarget: PropTypes.string
 });
 _defineProperty(BottomBar, "defaultProps", {
   displayCoordinates: true,
-  displayQuickSelectDropdown: false,
   displayScalebar: true,
   displayScales: true
 });
 export default connect(function (state) {
-  var _state$bookmark, _state$bookmark2, _state$display, _state$theme$current$, _state$theme$current;
+  var _state$display, _state$theme$current$, _state$theme$current;
   return {
     map: state.map,
-    bookmarks: (_state$bookmark = state.bookmark) === null || _state$bookmark === void 0 ? void 0 : _state$bookmark.bookmarks,
-    visibilityPresets: (_state$bookmark2 = state.bookmark) === null || _state$bookmark2 === void 0 ? void 0 : _state$bookmark2.visibilityPresets,
     fullscreen: (_state$display = state.display) === null || _state$display === void 0 ? void 0 : _state$display.fullscreen,
     mapMargins: state.windows.mapMargins,
     additionalMouseCrs: (_state$theme$current$ = (_state$theme$current = state.theme.current) === null || _state$theme$current === void 0 ? void 0 : _state$theme$current.additionalMouseCrs) !== null && _state$theme$current$ !== void 0 ? _state$theme$current$ : []
@@ -343,6 +300,5 @@ export default connect(function (state) {
   changeZoomLevel: changeZoomLevel,
   openExternalUrl: openExternalUrl,
   setBottombarHeight: setBottombarHeight,
-  setDisplayCrs: setDisplayCrs,
-  setThemeLayersVisibilityPreset: setThemeLayersVisibilityPreset
+  setDisplayCrs: setDisplayCrs
 })(BottomBar);