qwc2 2026.6.10 → 2026.6.23

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,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 } 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';
@@ -51,57 +51,81 @@ export function setThemeLayersList(theme) {
     themelist: theme
   };
 }
-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);
-  var layers = [themeLayer];
-
-  // Restore theme layer configuration, create placeholders for missing layers
+export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve, prevLayers, prevTheme, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTask, initialVisibilityPreset) {
+  var _bgLayers$find, _theme$config$section, _theme$config, _theme$config2;
+  var layers = [];
   var externalLayers = {};
-  if (!isEmpty(permalinkLayers) && ConfigUtils.getConfigProp("storeAllLayersInPermalink")) {
-    layers = permalinkLayers;
-  } else {
-    if (layerConfigs) {
-      if (ConfigUtils.getConfigProp("allowReorderingLayers", theme) !== true) {
-        layers = LayerUtils.restoreLayerParams(themeLayer, layerConfigs, permalinkLayers, externalLayers);
-      } else {
-        layers = LayerUtils.restoreOrderedLayerParams(themeLayer, layerConfigs, permalinkLayers, externalLayers);
-      }
+
+  // Get current background layer if it needs to be preserved
+  if (preserve && visibleBgLayer === null && ConfigUtils.getConfigProp("preserveBackgroundOnThemeSwitch", theme) === true) {
+    var _prevLayers$find$name, _prevLayers$find;
+    visibleBgLayer = (_prevLayers$find$name = (_prevLayers$find = prevLayers.find(function (layer) {
+      return layer.role === LayerRole.BACKGROUND && layer.visibility === true;
+    })) === null || _prevLayers$find === void 0 ? void 0 : _prevLayers$find.name) !== null && _prevLayers$find$name !== void 0 ? _prevLayers$find$name : null;
+  }
+
+  // Remove old layers
+  var preserveUserLayers = preserve && ConfigUtils.getConfigProp("preserveNonThemeLayersOnThemeSwitch", theme) === true;
+  var insPos = 0;
+  var bgLayerKept = false;
+  prevLayers.forEach(function (layer) {
+    if (layer.role === LayerRole.USERLAYER && preserveUserLayers) {
+      ++insPos;
+    } else if (layer.role === LayerRole.BACKGROUND && layer.name === visibleBgLayer) {
+      bgLayerKept = true;
+    } else {
+      dispatch(removeLayer(layer.id));
     }
-    if (isEmpty(layers)) {
-      layers = [_objectSpread(_objectSpread({}, themeLayer), {}, {
-        sublayers: []
-      })];
+  });
+  if (theme.url) {
+    // Create layer
+    var themeLayer = ThemeUtils.createThemeLayer(theme, themes);
+    layers.push(themeLayer);
+    // Restore theme layer configuration, create placeholders for missing layers
+    if (!isEmpty(permalinkLayers) && ConfigUtils.getConfigProp("storeAllLayersInPermalink")) {
+      layers = permalinkLayers;
+    } else {
+      if (layerConfigs) {
+        if (ConfigUtils.getConfigProp("allowReorderingLayers", theme) !== true) {
+          layers = LayerUtils.restoreLayerParams(themeLayer, layerConfigs, permalinkLayers, externalLayers);
+        } else {
+          layers = LayerUtils.restoreOrderedLayerParams(themeLayer, layerConfigs, permalinkLayers, externalLayers);
+        }
+      }
+      if (isEmpty(layers)) {
+        layers = [_objectSpread(_objectSpread({}, themeLayer), {}, {
+          sublayers: []
+        })];
+      }
     }
   }
 
   // Add background layers for theme
-  var haveVisibleBg = false;
   var bgLayers = ThemeUtils.createThemeBackgroundLayers(theme.backgroundLayers || [], themes, visibleBgLayer, externalLayers);
-  if (initialTheme && visibleBgLayer) {
-    var _bgLayers$find;
-    var visibleLayer = (_bgLayers$find = bgLayers.find(function (entry) {
-      return entry.visibility;
-    })) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
-    if (visibleLayer !== visibleBgLayer) {
-      dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
-    }
+  var actuallyVisibleBgLayer = (_bgLayers$find = bgLayers.find(function (entry) {
+    return entry.visibility;
+  })) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
+  if (!prevTheme && visibleBgLayer && actuallyVisibleBgLayer !== visibleBgLayer) {
+    dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
   }
   var _iterator = _createForOfIteratorHelper(bgLayers.reverse()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var bgLayer = _step.value;
-      haveVisibleBg |= bgLayer.visibility;
-      dispatch(addLayer(bgLayer));
+      // If previous visible BG layer kept, insert other BG layers around that layer
+      if (bgLayer.name === visibleBgLayer && bgLayerKept) {
+        bgLayerKept = false;
+      } else {
+        dispatch(addLayer(bgLayer, bgLayerKept ? 1 : 0));
+      }
     }
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
-  if (!haveVisibleBg) {
+  if (!actuallyVisibleBgLayer) {
     UrlParams.updateParams({
       bl: ""
     });
@@ -111,7 +135,7 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var layer = _step2.value;
-      dispatch(addLayer(layer, insertPos));
+      dispatch(addLayer(layer, insPos));
     }
 
     // Restore external layers
@@ -134,8 +158,10 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, insertPo
         // Don't expose sublayers
         if (layer) {
           layer.sublayers = null;
+          dispatch(replacePlaceholderLayer(id, layer));
+        } else {
+          dispatch(removeLayer(id));
         }
-        dispatch(replacePlaceholderLayer(id, layer));
       });
     }
   }
@@ -143,8 +169,11 @@ 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);
+  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) || (!prevTheme ? ConfigUtils.getConfigProp("startupTask") : null);
   if (task) {
     var mapClickAction = ConfigUtils.getPluginConfig(task.key).mapClickAction;
     dispatch(setCurrentTask(task.key, task.mode, mapClickAction, task.data));
@@ -159,68 +188,37 @@ 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) || [];
+    var _getState$layers, _themes$defaultMapCrs, _themes$defaultMapExt, _themes$defaultMapCrs2, _theme$bbox, _theme$initialBbox, _ref, _theme$version, _ref2, _theme$scales, _theme$printScales, _theme$printResolutio, _theme$printGrid, _theme$searchProvider, _ref3, _theme$backgroundLaye, _theme$mapTips;
+    dispatch(setSwipe(null));
     var mapCrs = theme.mapCrs || themes.defaultMapCrs || "EPSG:3857";
     if (!(mapCrs in CoordinatesUtils.getAvailableCRS())) {
       dispatch(showNotification("missingprojection", LocaleUtils.tr("app.missingprojection", theme.title, mapCrs), NotificationType.WARN, true));
-      return;
-    }
-    var initialTheme = !getState().theme.current;
-
-    // Get current background layer if it needs to be preserved
-    if (preserve && visibleBgLayer === null && ConfigUtils.getConfigProp("preserveBackgroundOnThemeSwitch", theme) === true) {
-      var curBgLayer = curLayers.find(function (layer) {
-        return layer.role === LayerRole.BACKGROUND && layer.visibility === true;
-      });
-      visibleBgLayer = curBgLayer ? curBgLayer.name : null;
-    }
-
-    // Remove old layers
-    var insertPos = 0;
-    if (preserve && ConfigUtils.getConfigProp("preserveNonThemeLayersOnThemeSwitch", theme) === true) {
-      // Compute insertion position of new theme layers by counting how many non-theme layers remain
-      insertPos = curLayers.filter(function (layer) {
-        return layer.role === LayerRole.USERLAYER;
-      }).length;
-      var removeLayers = curLayers.filter(function (layer) {
-        return layer.role !== LayerRole.USERLAYER;
-      }).map(function (layer) {
-        return layer.id;
-      });
-      var _iterator3 = _createForOfIteratorHelper(removeLayers),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var layerId = _step3.value;
-          dispatch(removeLayer(layerId));
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
-      }
-    } else {
       dispatch(removeAllLayers());
-    }
-    dispatch(setSwipe(null));
-    if (!theme) {
       return;
     }
+    var prevLayers = ((_getState$layers = getState().layers) === null || _getState$layers === void 0 ? void 0 : _getState$layers.flat) || [];
+    var prevTheme = getState().theme.current;
+    var defaultExtent = {
+      crs: (_themes$defaultMapCrs = themes.defaultMapCrs) !== null && _themes$defaultMapCrs !== void 0 ? _themes$defaultMapCrs : "EPSG:3857",
+      bounds: (_themes$defaultMapExt = themes.defaultMapExtent) !== null && _themes$defaultMapExt !== void 0 ? _themes$defaultMapExt : CoordinatesUtils.reproject([-20037508.34, -20048966.10, 20037508.34, 20048966.10], "EPSG:3857", (_themes$defaultMapCrs2 = themes.defaultMapCrs) !== null && _themes$defaultMapCrs2 !== void 0 ? _themes$defaultMapCrs2 : "EPSG:3857")
+    };
 
     // Inherit defaults if necessary
     theme = _objectSpread(_objectSpread({}, theme), {}, {
       mapCrs: mapCrs,
-      version: theme.version || themes.defaultWMSVersion || "1.3.0",
-      scales: theme.scales || themes.defaultScales || MapUtils.getGoogleMercatorScales(0, 21),
-      printScales: theme.printScales || themes.defaultPrintScales || undefined,
-      printResolutions: theme.printResolutions || themes.defaultPrintResolutions || undefined,
-      printGrid: theme.printGrid || themes.defaultPrintGrid || undefined,
-      searchProviders: theme.searchProviders || themes.defaultSearchProviders || undefined,
-      backgroundLayers: theme.backgroundLayers || themes.defaultBackgroundLayers || [],
-      mapTips: (_ref = (_theme$mapTips = theme.mapTips) !== null && _theme$mapTips !== void 0 ? _theme$mapTips : themes.defaultMapTips) !== null && _ref !== void 0 ? _ref : undefined,
-      defaultDisplayCrs: theme.defaultDisplayCrs || themes.defaultDisplayCrs || undefined
+      bbox: (_theme$bbox = theme.bbox) !== null && _theme$bbox !== void 0 ? _theme$bbox : defaultExtent,
+      initialBbox: (_theme$initialBbox = theme.initialBbox) !== null && _theme$initialBbox !== void 0 ? _theme$initialBbox : defaultExtent,
+      version: (_ref = (_theme$version = theme.version) !== null && _theme$version !== void 0 ? _theme$version : themes.defaultWMSVersion) !== null && _ref !== void 0 ? _ref : "1.3.0",
+      scales: (_ref2 = (_theme$scales = theme.scales) !== null && _theme$scales !== void 0 ? _theme$scales : themes.defaultScales) !== null && _ref2 !== void 0 ? _ref2 : MapUtils.getGoogleMercatorScales(0, 21),
+      printScales: (_theme$printScales = theme.printScales) !== null && _theme$printScales !== void 0 ? _theme$printScales : themes.defaultPrintScales,
+      printResolutions: (_theme$printResolutio = theme.printResolutions) !== null && _theme$printResolutio !== void 0 ? _theme$printResolutio : themes.defaultPrintResolutions,
+      printGrid: (_theme$printGrid = theme.printGrid) !== null && _theme$printGrid !== void 0 ? _theme$printGrid : themes.defaultPrintGrid,
+      searchProviders: (_theme$searchProvider = theme.searchProviders) !== null && _theme$searchProvider !== void 0 ? _theme$searchProvider : themes.defaultSearchProviders,
+      backgroundLayers: (_ref3 = (_theme$backgroundLaye = theme.backgroundLayers) !== null && _theme$backgroundLaye !== void 0 ? _theme$backgroundLaye : themes.defaultBackgroundLayers) !== null && _ref3 !== void 0 ? _ref3 : [],
+      mapTips: (_theme$mapTips = theme.mapTips) !== null && _theme$mapTips !== void 0 ? _theme$mapTips : themes.defaultMapTips,
+      defaultDisplayCrs: theme.defaultDisplayCrs || themes.defaultDisplayCrs
     });
 
     // Preserve extent if desired and possible
@@ -307,13 +305,18 @@ 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, preserve, prevLayers, prevTheme, permalinkLayers, externalLayerRestorer, visibleBgLayer, 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, preserve, prevLayers, prevTheme, permalinkLayers, externalLayerRestorer, visibleBgLayer, initialTask, initialVisibilityPreset);
     }
   };
+}
+export function setBlankTheme(themes) {
+  return setCurrentTheme({
+    id: ""
+  }, themes);
 }

package/components/AttributeForm.js

@@ -441,6 +441,9 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "validateForm", function (feature) {
       var validCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var invalidCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+      if (!_this.form) {
+        return;
+      }
       var constraintExpressions = _this.props.editContext.editConfig.fields.reduce(function (res, cur) {
         var _cur$constraints;
         if ((_cur$constraints = cur.constraints) !== null && _cur$constraints !== void 0 && _cur$constraints.expression) {

package/components/BookmarkPanel.js

@@ -0,0 +1,312 @@
+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, "bookmarkDoubleClicked", function (ev, bookmark) {
+      if (!_this.state.renameBookmark) {
+        _this.props.onOpen(bookmark.key, false);
+      }
+    });
+    _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(ev) {
+            return _this2.bookmarkDoubleClicked(ev, bookmark);
+          },
+          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;