qwc2 2026.8.7 → 2026.8.13

package/actions/bookmark.js

@@ -8,7 +8,6 @@
 
 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';
@@ -23,18 +22,4 @@ export function setVisibilityPresets(visibilityPresets) {
     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/localConfig.js

@@ -13,7 +13,6 @@ export var LOCAL_CONFIG_LOADED = 'LOCAL_CONFIG_LOADED';
 export var SET_STARTUP_PARAMETERS = 'SET_STARTUP_PARAMETERS';
 export var SET_COLOR_SCHEME = 'SET_COLOR_SCHEME';
 export var SET_USER_INFO_FIELDS = 'SET_USER_INFO_FIELDS';
-export var SET_PERMALINK_PARAMETERS = 'SET_PERMALINK_PARAMETERS';
 export var REGISTER_CUSTOM_PLUGIN = 'REGISTER_CUSTOM_PLUGIN';
 export var UNREGISTER_CUSTOM_PLUGIN = 'UNREGISTER_CUSTOM_PLUGIN';
 export function localConfigLoaded(config) {
@@ -43,12 +42,6 @@ export function setUserInfoFields(fields) {
     fields: fields
   };
 }
-export function setPermalinkParameters(params) {
-  return {
-    type: SET_PERMALINK_PARAMETERS,
-    params: params
-  };
-}
 export function registerCustomPlugin(name, availableIn3D) {
   return {
     type: REGISTER_CUSTOM_PLUGIN,

package/components/BookmarkPanel.js

@@ -31,15 +31,6 @@ 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;
@@ -49,193 +40,202 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
     }
     _this = _callSuper(this, BookmarkPanel, [].concat(args));
     _defineProperty(_this, "state", {
-      renameBookmark: null,
       currentBookmark: null,
+      rename: false,
       busy: false
     });
     _defineProperty(_this, "bookmarkClicked", function (ev, bookmark) {
-      if (_this.state.renameBookmark) {
+      if (_this.state.rename) {
         // pass
       } else if (_this.props.openOnClick) {
         _this.props.onOpen(bookmark.key, ev.button === 1);
-      } else if (_this.state.currentBookmark === bookmark.key) {
+      } else if (_this.state.currentBookmark === bookmark) {
         _this.setState({
           currentBookmark: null,
           description: ""
         });
       } else {
         _this.setState({
-          currentBookmark: bookmark.key,
+          currentBookmark: bookmark,
           description: bookmark.description
         });
       }
     });
     _defineProperty(_this, "bookmarkDoubleClicked", function (ev, bookmark) {
-      if (!_this.state.renameBookmark) {
+      if (!_this.state.rename) {
         _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) {
+      _this.props.bookmarkIface.create(_this.props.translations["new"], 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);
+          alert(_this.props.translations.addfailed);
+          _this.setState({
+            busy: false
+          });
+        } else {
+          _this.props.bookmarkIface.getList(function (bookmarks) {
+            _this.props.setList(bookmarks);
+            _this.setState({
+              rename: true,
+              currentBookmark: bookmarks.find(function (bk) {
+                return bk.key === key;
+              }),
+              busy: false
+            });
+          });
         }
-        _this.props.onRefresh();
-      });
-      _this.setState({
-        description: "",
-        currentBookmark: null
       });
     });
-    _defineProperty(_this, "updateBookmark", function (key) {
+    _defineProperty(_this, "updateBookmark", function (bookmark, params) {
+      var updateData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      // eslint-disable-next-line no-alert
+      if (updateData && !confirm(_this.props.translations.confirmOverwrite)) {
+        return;
+      }
       _this.setState({
         busy: true
       });
-      var description = _this.props.bookmarks.find(function (bk) {
-        return bk.key === key;
-      }).description;
-      _this.props.onUpdate(key, description, function (success) {
+      _this.props.bookmarkIface.update(bookmark.key, params, updateData, 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);
+          alert(_this.props.translations.savefailed);
+          _this.setState({
+            busy: false
+          });
+        } else {
+          _this.props.bookmarkIface.getList(function (bookmarks) {
+            _this.props.setList(bookmarks);
+            _this.setState({
+              rename: false,
+              currentBookmark: bookmarks.find(function (bk) {
+                return bk.key === bookmark.key;
+              }),
+              busy: false
+            });
+          });
         }
-        _this.props.onRefresh();
       });
     });
-    _defineProperty(_this, "removeBookmark", function (key) {
+    _defineProperty(_this, "removeBookmark", function (bookmark) {
+      // eslint-disable-next-line no-alert
+      if (!confirm(_this.props.translations.confirmDelete)) {
+        return;
+      }
       _this.setState({
         busy: true
       });
-      _this.props.onRemove(key, function (success) {
+      _this.props.bookmarkIface["delete"](bookmark.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);
+          alert(_this.props.translations.removefailed);
+          _this.setState({
+            busy: false
+          });
         }
-        _this.props.onRefresh();
+        _this.props.bookmarkIface.getList(function (bookmarks) {
+          _this.props.setList(bookmarks);
+          _this.setState({
+            rename: false,
+            currentBookmark: null,
+            busy: false
+          });
+        });
       });
     });
     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 _this2 = this;
       var username = ConfigUtils.getConfigProp("username");
+      var hasPublicBookmarksCap = ConfigUtils.getConfigProp("capabilities", null, []).includes("public_bookmarks");
       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", {
+      var updatable = currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.own;
+      return /*#__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", {
+      }, /*#__PURE__*/React.createElement("span", null, this.props.translations.title), username ? /*#__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
+        title: this.props.translations["new"]
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "plus"
-      }))), !this.props.openOnClick ? /*#__PURE__*/React.createElement("div", {
+      })) : null), !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);
+          return _this2.props.onOpen(currentBookmark.key, false);
         },
-        title: (_this$props$translati9 = this.props.translations) === null || _this$props$translati9 === void 0 ? void 0 : _this$props$translati9.open
+        title: this.props.translations.open
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "folder-open"
-      })), this.props.showOpenTab ? /*#__PURE__*/React.createElement("button", {
+      })), /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: buttonsDisabled,
         onClick: function onClick() {
-          return _this2.props.onOpen(currentBookmark, true);
+          return _this2.props.onOpen(currentBookmark.key, true);
         },
-        title: (_this$props$translati0 = this.props.translations) === null || _this$props$translati0 === void 0 ? void 0 : _this$props$translati0.openTab
+        title: this.props.translations.openTab
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "open_link"
-      })) : null, this.props.showZoomToExtent ? /*#__PURE__*/React.createElement("button", {
+      })), this.props.onZoomToExtent ? /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: buttonsDisabled,
         onClick: function onClick() {
-          return _this2.props.onZoomToExtent(currentBookmark);
+          return _this2.props.onZoomToExtent(currentBookmark.key);
         },
-        title: (_this$props$translati1 = this.props.translations) === null || _this$props$translati1 === void 0 ? void 0 : _this$props$translati1.zoomToExtent
+        title: this.props.translations.zoomToExtent
       }, /*#__PURE__*/React.createElement(Icon, {
         icon: "zoom"
       })) : null, /*#__PURE__*/React.createElement("button", {
         className: "button",
-        disabled: buttonsDisabled,
+        disabled: !updatable,
         onClick: function onClick() {
-          return _this2.updateBookmark(currentBookmark);
+          return _this2.updateBookmark(currentBookmark, {}, true);
         },
-        title: (_this$props$translati10 = this.props.translations) === null || _this$props$translati10 === void 0 ? void 0 : _this$props$translati10.update
+        title: this.props.translations.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
+          "bookmark-list-item-active": (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.key) === bookmark.key
         });
+        var renaming = (currentBookmark === null || currentBookmark === void 0 ? void 0 : currentBookmark.key) === bookmark.key && _this2.state.rename;
+        var publicIcon = null;
+        if (bookmark.own && hasPublicBookmarksCap) {
+          publicIcon = /*#__PURE__*/React.createElement(Icon, {
+            disabled: _this2.state.busy,
+            icon: "public",
+            inactive: !bookmark["public"],
+            onClick: function onClick(ev) {
+              _this2.updateBookmark(bookmark, {
+                "public": !bookmark["public"]
+              });
+              MiscUtils.killEvent(ev);
+            },
+            title: _this2.props.translations.togglePublic
+          });
+        } else if (bookmark["public"]) {
+          publicIcon = /*#__PURE__*/React.createElement(Icon, {
+            icon: "public",
+            title: _this2.props.translations["public"]
+          });
+        }
         return /*#__PURE__*/React.createElement("div", {
           className: itemclasses,
           key: bookmark.key,
@@ -248,13 +248,17 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
           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, {
+          title: _this2.props.translations.lastUpdate + ": " + bookmark.date
+        }, renaming ? /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(TextInput, {
           focusOnRef: true,
-          onChange: _this2.updateBookmarkName,
+          onChange: function onChange(text) {
+            return _this2.updateBookmark(bookmark, {
+              description: text
+            });
+          },
           onNoChange: function onNoChange() {
             return _this2.setState({
-              renameBookmark: null
+              rename: false
             });
           },
           role: "input",
@@ -264,49 +268,42 @@ var BookmarkPanel = /*#__PURE__*/function (_React$Component) {
           icon: "ok",
           onClick: MiscUtils.killEvent,
           role: "suffix"
-        })) : /*#__PURE__*/React.createElement("span", null, bookmark.description), _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+        })) : /*#__PURE__*/React.createElement("span", null, bookmark.description), !renaming ? publicIcon : null, bookmark.own && !renaming ? [/*#__PURE__*/React.createElement(Icon, {
+          disabled: _this2.state.busy,
           icon: "draw",
+          key: "draw",
           onClick: function onClick(ev) {
             _this2.setState({
-              renameBookmark: bookmark.key,
-              currentBookmark: null
+              currentBookmark: bookmark,
+              rename: true
             });
             MiscUtils.killEvent(ev);
           },
           title: LocaleUtils.tr("common.rename")
-        }) : null, _this2.state.renameBookmark !== bookmark.key ? /*#__PURE__*/React.createElement(Icon, {
+        }), /*#__PURE__*/React.createElement(Icon, {
           disabled: _this2.state.busy,
           icon: "trash",
+          key: "trash",
           onClick: function onClick(ev) {
-            _this2.removeBookmark(bookmark.key);
+            _this2.removeBookmark(bookmark);
             MiscUtils.killEvent(ev);
           },
           title: LocaleUtils.tr("common.delete")
-        }) : null);
+        })] : 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));
+      }, this.props.translations.noitems) : null));
     }
   }]);
 }(React.Component);
 _defineProperty(BookmarkPanel, "availableIn3D", true);
 _defineProperty(BookmarkPanel, "propTypes", {
+  bookmarkIface: PropTypes.object,
   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,
+  setList: PropTypes.func,
   translations: PropTypes.objectOf(PropTypes.string)
 });
-_defineProperty(BookmarkPanel, "defaultProps", {
-  showOpenTab: true,
-  showZoomToExtent: false
-});
 export default BookmarkPanel;

package/components/Icon.js

@@ -38,6 +38,7 @@ var Icon = /*#__PURE__*/function (_React$Component) {
       var classes = classnames(_defineProperty(_defineProperty(_defineProperty({
         icon: true,
         icon_disabled: this.props.disabled,
+        icon_inactive: this.props.inactive,
         icon_clickable: !!this.props.onClick || !!this.props.onMouseDown || !!this.props.onPointerDown
       }, "icon-" + this.props.icon, true), "icon_" + this.props.size, !!this.props.size), this.props.className, !!this.props.className));
       var tabIndex = undefined;
@@ -85,6 +86,7 @@ _defineProperty(Icon, "propTypes", {
   className: PropTypes.string,
   disabled: PropTypes.bool,
   icon: PropTypes.string,
+  inactive: PropTypes.bool,
   onClick: PropTypes.func,
   onMouseDown: PropTypes.func,
   onMouseUp: PropTypes.func,

package/components/IdentifyViewer.js

@@ -363,11 +363,35 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "storeIdentifyResults", function () {
       return new Promise(function (resolve) {
         return resolve({
-          identifyResults: _this.state.resultTree,
-          currentResultDisplayMode: _this.props.resultDisplayMode
+          state: {
+            identifyResults: _this.serializeResults(),
+            currentResultDisplayMode: _this.props.resultDisplayMode
+          }
         });
       });
     });
+    _defineProperty(_this, "serializeResults", function () {
+      return Object.fromEntries(Object.entries(_this.state.resultTree).map(function (_ref10) {
+        var _ref11 = _slicedToArray(_ref10, 2),
+          layerid = _ref11[0],
+          features = _ref11[1];
+        var _layerid$split = layerid.split("#", 2),
+          _layerid$split2 = _slicedToArray(_layerid$split, 2),
+          layerUrl = _layerid$split2[0],
+          layerName = _layerid$split2[1];
+        var match = LayerUtils.searchLayer(_this.props.layers, 'url', layerUrl, 'name', layerName);
+        if (match && match.sublayer.primary_key) {
+          return [layerid, {
+            key: match.sublayer.primary_key,
+            values: features.map(function (feature) {
+              return MiscUtils.isNumeric(feature.id) ? Number(feature.id) : feature.id;
+            })
+          }];
+        } else {
+          return [layerid, features];
+        }
+      }));
+    });
     _defineProperty(_this, "getCurrentResultFeature", function () {
       var _this$state$resultTre, _this$state$resultTre2, _this$state$resultTre3, _this$state$currentRe;
       return (_this$state$resultTre = (_this$state$resultTre2 = _this.state.resultTree[(_this$state$currentRe = _this.state.currentResult) === null || _this$state$currentRe === void 0 ? void 0 : _this$state$currentRe.layerid]) === null || _this$state$resultTre2 === void 0 || (_this$state$resultTre3 = _this$state$resultTre2.find) === null || _this$state$resultTre3 === void 0 ? void 0 : _this$state$resultTre3.call(_this$state$resultTre2, function (feature) {
@@ -490,10 +514,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
       if (exporter) {
         if (!_this.props.exportGeometry) {
-          json = Object.entries(json).reduce(function (res, _ref12) {
-            var _ref13 = _slicedToArray(_ref12, 2),
-              layerId = _ref13[0],
-              features = _ref13[1];
+          json = Object.entries(json).reduce(function (res, _ref14) {
+            var _ref15 = _slicedToArray(_ref14, 2),
+              layerId = _ref15[0],
+              features = _ref15[1];
             return _objectSpread(_objectSpread({}, res), {}, _defineProperty({}, layerId, features.map(function (feature) {
               return MiscUtils.objectOmit(feature, ['geometry']);
             })));
@@ -521,10 +545,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         style: {
           maxHeight: _this.state.currentResult ? '10em' : 'initial'
         }
-      }, Object.entries(_this.state.resultTree).map(function (_ref14) {
-        var _ref15 = _slicedToArray(_ref14, 2),
-          layerid = _ref15[0],
-          features = _ref15[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref16) {
+        var _ref17 = _slicedToArray(_ref16, 2),
+          layerid = _ref17[0],
+          features = _ref17[1];
         if (features.length === 0) {
           return null;
         }
@@ -805,20 +829,20 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderResultsTable", function () {
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-results-tables"
-      }, Object.entries(_this.state.resultTree).map(function (_ref16) {
-        var _ref17 = _slicedToArray(_ref16, 2),
-          layerid = _ref17[0],
-          features = _ref17[1];
+      }, Object.entries(_this.state.resultTree).map(function (_ref18) {
+        var _ref19 = _slicedToArray(_ref18, 2),
+          layerid = _ref19[0],
+          features = _ref19[1];
         if (features.length === 0 || _this.state.selectedLayer && layerid !== _this.state.selectedLayer) {
           return null;
         }
         var fields = {};
         features.map(function (feature) {
-          Object.entries(feature.properties).map(function (_ref18) {
-            var _ref19 = _slicedToArray(_ref18, 2),
-              attr = _ref19[0],
-              value = _ref19[1];
-            if (!(attr in fields)) {
+          Object.entries(feature.properties).map(function (_ref20) {
+            var _ref21 = _slicedToArray(_ref20, 2),
+              attr = _ref21[0],
+              value = _ref21[1];
+            if (!(attr in fields) && !['htmlContent', 'htmlContentInline'].includes(attr)) {
               fields[attr] = {
                 id: attr,
                 name: attr
@@ -1061,10 +1085,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref21) {
-        var _ref22 = _slicedToArray(_ref21, 2),
-          layername = _ref22[0],
-          reports = _ref22[1];
+      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref23) {
+        var _ref24 = _slicedToArray(_ref23, 2),
+          layername = _ref24[0],
+          reports = _ref24[1];
         return reports.map(function (report, idx) {
           return /*#__PURE__*/React.createElement("option", {
             key: layername + "::" + idx,
@@ -1328,6 +1352,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.updateResultTree();
+      this.props.innerRef(this);
     }
   }, {
     key: "componentDidUpdate",
@@ -1360,6 +1385,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
+      this.props.innerRef(null);
       this.props.removeLayer("__identifyviewerhighlight");
       unregisterPermalinkDataStoreHook("identifyresultstate");
     }
@@ -1369,10 +1395,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var _this2 = this;
       var body = null;
       var resultTree = this.state.selectedLayer !== '' ? _defineProperty({}, this.state.selectedLayer, this.state.resultTree[this.state.selectedLayer]) : this.state.resultTree;
-      var flatResults = Object.entries(resultTree).map(function (_ref25) {
-        var _ref26 = _slicedToArray(_ref25, 2),
-          layerid = _ref26[0],
-          features = _ref26[1];
+      var flatResults = Object.entries(resultTree).map(function (_ref27) {
+        var _ref28 = _slicedToArray(_ref27, 2),
+          layerid = _ref28[0],
+          features = _ref28[1];
         return features.map(function (feature) {
           return [layerid, feature];
         });
@@ -1400,10 +1426,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       } else if (this.props.resultDisplayMode === 'flat') {
         body = /*#__PURE__*/React.createElement("div", {
           className: "identify-flat-results-list"
-        }, Object.entries(resultTree).map(function (_ref27) {
-          var _ref28 = _slicedToArray(_ref27, 2),
-            layerid = _ref28[0],
-            features = _ref28[1];
+        }, Object.entries(resultTree).map(function (_ref29) {
+          var _ref30 = _slicedToArray(_ref29, 2),
+            layerid = _ref30[0],
+            features = _ref30[1];
           return features.map(function (feature) {
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           });
@@ -1417,10 +1443,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           body = /*#__PURE__*/React.createElement("div", {
             className: "identify-compare-results",
             style: _style
-          }, results.map(function (_ref29) {
-            var _ref30 = _slicedToArray(_ref29, 2),
-              layerid = _ref30[0],
-              feature = _ref30[1];
+          }, results.map(function (_ref31) {
+            var _ref32 = _slicedToArray(_ref31, 2),
+              layerid = _ref32[0],
+              feature = _ref32[1];
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           }));
         } else if (this.state.currentPage < flatResults.length) {
@@ -1455,6 +1481,7 @@ _defineProperty(IdentifyViewer, "propTypes", {
   highlightAllResults: PropTypes.bool,
   identifyResults: PropTypes.object,
   iframeDialogsInitiallyDocked: PropTypes.bool,
+  innerRef: PropTypes.func,
   layers: PropTypes.array,
   longAttributesDisplay: PropTypes.oneOf(['ellipsis', 'wrap']),
   map: PropTypes.object,

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';
@@ -337,10 +336,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));