qwc2 2026.7.18 → 2026.7.30

package/components/IdentifyViewer.js

@@ -25,7 +25,6 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import htmlReactParser, { domToReact } from 'html-react-parser';
 /**
  * Copyright 2016-2024 Sourcepole AG
  * All rights reserved.
@@ -33,11 +32,11 @@ import htmlReactParser, { domToReact } from 'html-react-parser';
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import htmlReactParser, { domToReact } from 'html-react-parser';
 import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
 import clone from 'clone';
-import DOMPurify from 'dompurify';
 import FileSaver from 'file-saver';
 import JSZip from 'jszip';
 import isEmpty from 'lodash.isempty';
@@ -53,8 +52,11 @@ import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import MiscUtils, { ToggleSet } from '../utils/MiscUtils';
+import { registerPermalinkDataStoreHook, unregisterPermalinkDataStoreHook } from '../utils/PermaLinkUtils';
 import VectorLayerUtils from '../utils/VectorLayerUtils';
 import Icon from './Icon';
+import ButtonBar from './widgets/ButtonBar';
+import FeaturesTable from './widgets/FeaturesTable';
 import NavBar from './widgets/NavBar';
 import Spinner from './widgets/Spinner';
 import ToggleSwitch from './widgets/ToggleSwitch';
@@ -354,7 +356,16 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       compareEnabled: false,
       multiViewEnabled: false,
       currentPage: 0,
-      pageSize: 1
+      pageSize: 1,
+      tableSelection: {}
+    });
+    _defineProperty(_this, "storeIdentifyResults", function () {
+      return new Promise(function (resolve) {
+        return resolve({
+          identifyResults: _this.state.resultTree,
+          currentResultDisplayMode: _this.props.resultDisplayMode
+        });
+      });
     });
     _defineProperty(_this, "getCurrentResultFeature", function () {
       var _this$state$resultTre, _this$state$resultTre2, _this$state$resultTre3, _this$state$currentRe;
@@ -378,7 +389,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "setHighlightedFeatures", function (features) {
-      if (!features && _this.props.highlightAllResults) {
+      if (isEmpty(features) && _this.props.highlightAllResults) {
         var resultTree = _this.state.selectedLayer !== '' ? _defineProperty({}, _this.state.selectedLayer, _this.state.resultTree[_this.state.selectedLayer]) : _this.state.resultTree;
         features = Object.values(resultTree).flat();
       }
@@ -672,7 +683,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           });
         } else {
           rows = properties.map(function (attrib) {
-            if (_this.props.theme.skipEmptyFeatureAttributes && (feature.properties[attrib] === "" || feature.properties[attrib] === null || feature.properties[attrib] === "NULL")) {
+            if ((_this.props.theme.skipEmptyFeatureAttributes || _this.props.skipEmptyFeatureAttributes) && (feature.properties[attrib] === "" || feature.properties[attrib] === null || feature.properties[attrib] === "NULL")) {
               return null;
             }
             return /*#__PURE__*/React.createElement("tr", {
@@ -790,6 +801,101 @@ 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];
+        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)) {
+              fields[attr] = {
+                id: attr,
+                name: attr
+              };
+            }
+          });
+        });
+        var haveSel = !isEmpty(_this.state.tableSelection[layerid]);
+        var buttons = [{
+          key: "Export",
+          icon: "export"
+        }, {
+          key: "Delete",
+          icon: haveSel ? "trash_checked" : "trash"
+        }];
+        return /*#__PURE__*/React.createElement("div", {
+          className: "identify-results-table-container",
+          key: layerid
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "identify-results-table-titlebar"
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: _this.state.collapsedLayers.has(layerid) ? "expand" : "collapse",
+          onClick: function onClick() {
+            return _this.setState(function (state) {
+              return {
+                collapsedLayers: state.collapsedLayers.toggle(layerid)
+              };
+            });
+          }
+        }), /*#__PURE__*/React.createElement("span", null, features[0].layertitle, " (", features.length, ")"), /*#__PURE__*/React.createElement(ButtonBar, {
+          buttons: buttons,
+          onClick: function onClick(action) {
+            return _this.tableAction(layerid, action);
+          }
+        })), !_this.state.collapsedLayers.has(layerid) ? /*#__PURE__*/React.createElement(FeaturesTable, {
+          allowSelectAll: true,
+          features: features,
+          fields: Object.values(fields),
+          hideIdColumn: true,
+          highlightFeatures: _this.setHighlightedFeatures,
+          selectionChanged: function selectionChanged(sel) {
+            return _this.setState(function (state) {
+              return {
+                tableSelection: _objectSpread(_objectSpread({}, state.tableSelection), {}, _defineProperty({}, layerid, sel))
+              };
+            });
+          }
+        }) : null);
+      }));
+    });
+    _defineProperty(_this, "tableAction", function (layerid, action) {
+      if (action === "Export") {
+        var features = isEmpty(_this.state.tableSelection[layerid]) ? _this.state.resultTree[layerid] : Object.values(_this.state.tableSelection[layerid]);
+        _this["export"]({
+          layerid: features
+        });
+      } else if (action === "Delete") {
+        _this.setState(function (state) {
+          var tableSelection = state.tableSelection;
+          var selection = state.tableSelection[layerid];
+          var newLayerResults = !isEmpty(selection) ? state.resultTree[layerid].filter(function (f) {
+            return !(f.id in selection);
+          }) : [];
+          var newResultTree = _objectSpread({}, state.resultTree);
+          if (isEmpty(newLayerResults)) {
+            delete newResultTree[layerid];
+            tableSelection = _objectSpread({}, tableSelection);
+            delete tableSelection[layerid];
+          } else {
+            newResultTree[layerid] = newLayerResults;
+          }
+          return {
+            resultTree: newResultTree,
+            tableSelection: tableSelection
+          };
+        });
+      }
+    });
     _defineProperty(_this, "initBody", function (el) {
       if (el) {
         // HACK to trigger an additional repaint, since Safari/Chrome on iOS render the element cut off the first time
@@ -857,7 +963,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       var haveSettings = Object.values(enabledSettings).find(Boolean) !== undefined;
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-toolbar"
-      }, haveSettings ? toggleButton("settingsMenu", "cog", false) : null, _this.state.settingsMenu ? _this.renderSettingsMenu(enabledSettings) : null, _this.props.enableCompare ? toggleButton("compareEnabled", "compare", _this.state.selectedResults.size() < 2, LocaleUtils.tr("identify.compare")) : null, /*#__PURE__*/React.createElement("span", {
+      }, haveSettings ? toggleButton("settingsMenu", "cog", false) : null, _this.state.settingsMenu ? _this.renderSettingsMenu(enabledSettings) : null, _this.props.enableCompare && _this.props.resultDisplayMode !== "table" ? toggleButton("compareEnabled", "compare", _this.state.selectedResults.size() < 2, LocaleUtils.tr("identify.compare")) : null, /*#__PURE__*/React.createElement("span", {
         className: "identify-toolbar-spacer"
       }), infoLabel, /*#__PURE__*/React.createElement("span", {
         className: "identify-toolbar-spacer"
@@ -952,10 +1058,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 (_ref17) {
-        var _ref18 = _slicedToArray(_ref17, 2),
-          layername = _ref18[0],
-          reports = _ref18[1];
+      }, LocaleUtils.tr("identify.selectreport")), Object.entries(_this.state.reports).map(function (_ref21) {
+        var _ref22 = _slicedToArray(_ref21, 2),
+          layername = _ref22[0],
+          reports = _ref22[1];
         return reports.map(function (report, idx) {
           return /*#__PURE__*/React.createElement("option", {
             key: layername + "::" + idx,
@@ -1164,12 +1270,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       return _this.parsedContent(text);
     });
     _defineProperty(_this, "parsedContent", function (text) {
-      text = DOMPurify.sanitize(text, {
-        ADD_ATTR: ['target'],
-        ADD_TAGS: ["iframe"],
-        FORCE_BODY: true,
-        ALLOW_UNKNOWN_PROTOCOLS: true
-      }).replace('&#10;', '<br />');
+      text = MiscUtils.sanitizeHtml(text).replace('&#10;', '<br />');
       var options = {
         replace: function replace(node) {
           if (node.name === "a") {
@@ -1216,6 +1317,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _this.bodyEl = null;
     _this.state.exportFormat = !Array.isArray(props.enableExport) ? 'geojson' : props.enableExport[0];
     _this.state.multiViewEnabled = props.resultMultiDisplay;
+    registerPermalinkDataStoreHook("identifyresultstate", _this.storeIdentifyResults);
     return _this;
   }
   _inherits(IdentifyViewer, _React$Component);
@@ -1256,6 +1358,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.props.removeLayer("__identifyviewerhighlight");
+      unregisterPermalinkDataStoreHook("identifyresultstate");
     }
   }, {
     key: "render",
@@ -1263,10 +1366,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 (_ref21) {
-        var _ref22 = _slicedToArray(_ref21, 2),
-          layerid = _ref22[0],
-          features = _ref22[1];
+      var flatResults = Object.entries(resultTree).map(function (_ref25) {
+        var _ref26 = _slicedToArray(_ref25, 2),
+          layerid = _ref26[0],
+          features = _ref26[1];
         return features.map(function (feature) {
           return [layerid, feature];
         });
@@ -1294,10 +1397,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 (_ref23) {
-          var _ref24 = _slicedToArray(_ref23, 2),
-            layerid = _ref24[0],
-            features = _ref24[1];
+        }, Object.entries(resultTree).map(function (_ref27) {
+          var _ref28 = _slicedToArray(_ref27, 2),
+            layerid = _ref28[0],
+            features = _ref28[1];
           return features.map(function (feature) {
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           });
@@ -1311,10 +1414,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           body = /*#__PURE__*/React.createElement("div", {
             className: "identify-compare-results",
             style: _style
-          }, results.map(function (_ref25) {
-            var _ref26 = _slicedToArray(_ref25, 2),
-              layerid = _ref26[0],
-              feature = _ref26[1];
+          }, results.map(function (_ref29) {
+            var _ref30 = _slicedToArray(_ref29, 2),
+              layerid = _ref30[0],
+              feature = _ref30[1];
             return _this2.renderResultAttributes(layerid, feature, 'identify-result-frame');
           }));
         } else if (this.state.currentPage < flatResults.length) {
@@ -1325,6 +1428,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
             className: "identify-flat-results-list"
           }, this.renderResultAttributes(layerid, feature, 'identify-result-frame'));
         }
+      } else if (this.props.resultDisplayMode === 'table') {
+        body = this.renderResultsTable();
       }
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-body",
@@ -1359,6 +1464,7 @@ _defineProperty(IdentifyViewer, "propTypes", {
   setActiveLayerInfo: PropTypes.func,
   showLayerSelector: PropTypes.bool,
   showLayerTitles: PropTypes.bool,
+  skipEmptyFeatureAttributes: PropTypes.bool,
   theme: PropTypes.object,
   zoomToPoint: PropTypes.func
 });

package/components/LayerInfoWindow.js

@@ -22,7 +22,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import React from 'react';
 import { connect } from 'react-redux';
-import DOMPurify from 'dompurify';
 import PropTypes from 'prop-types';
 import { setActiveLayerInfo } from '../actions/layerinfo';
 import ResizeableWindow from '../components/ResizeableWindow';
@@ -45,7 +44,7 @@ var LayerInfoWindow = /*#__PURE__*/function (_React$Component) {
       if (content) {
         return /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, title, ":"), html ? /*#__PURE__*/React.createElement("td", {
           dangerouslySetInnerHTML: {
-            __html: MiscUtils.addLinkAnchors(DOMPurify.sanitize(content))
+            __html: MiscUtils.addLinkAnchors(MiscUtils.sanitizeHtml(content))
           }
         }) : /*#__PURE__*/React.createElement("td", null, content));
       }

package/components/LocationRecorder.js

@@ -45,7 +45,7 @@ var LocationRecorder = /*#__PURE__*/function (_React$Component) {
       } else {
         _this.props.drawInteraction.abortDrawing();
         _this.props.drawInteraction.setActive(false);
-        // Re-add overlay to map, removed by setActive(false), to ensure traced feature is visibile
+        // Re-add overlay to map, removed by setActive(false), to ensure traced feature is visible
         _this.props.drawInteraction.getOverlay().setMap(_this.props.map);
         _this.setState({
           recording: true

package/components/PickFeature.js

@@ -94,7 +94,7 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
         };
         if (newState.pendingQueries === 0) {
           if (newState.pickResults.length === 1) {
-            _this.props.featurePicked(newState.pickResults[0].layer, newState.pickResults[0].feature, newState.pickResults[0].mapName);
+            _this.props.featurePicked(newState.pickResults[0].layer, newState.pickResults[0].feature, newState.pickResults[0].mapName, state.mapPos);
             newState.pickResults = null;
             newState.pickGeom = null;
           } else if (newState.pickResults.length === 0) {
@@ -237,6 +237,7 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
           return {
             pickResults: pickResults,
             clickPos: clickPos,
+            mapPos: [maxX, maxY],
             pendingQueries: queryWmsLayers.length,
             reqId: reqId
           };
@@ -261,7 +262,7 @@ var PickFeature = /*#__PURE__*/function (_React$Component) {
           return /*#__PURE__*/React.createElement("div", {
             key: key,
             onClick: function onClick() {
-              return _this3.props.featurePicked(entry.layer, entry.feature, entry.mapName);
+              return _this3.props.featurePicked(entry.layer, entry.feature, entry.mapName, _this3.state.mapPos);
             },
             onMouseOut: function onMouseOut() {
               return _this3.clearHighlight(key, entry.feature);
@@ -330,6 +331,7 @@ _defineProperty(PickFeature, "defaultState", {
   pickGeom: null,
   pickResults: null,
   clickPos: null,
+  mapPos: null,
   highlightedFeature: null,
   pendingQueries: 0,
   reqId: null

package/components/ResizeableWindow.js

@@ -319,7 +319,7 @@ var ResizeableWindow = /*#__PURE__*/function (_React$Component) {
       }, _this.renderTitleBar(), /*#__PURE__*/React.createElement("div", {
         className: "resizeable-window-body"
       }, _this.portalNode ? /*#__PURE__*/React.createElement("div", {
-        className: "resizeable-window-portal-container"
+        className: "resizeable-window-portal-container resizeable-window-portal-container-detached"
       }, /*#__PURE__*/React.createElement(portals.OutPortal, {
         node: _this.portalNode
       })) : _this.props.children)), _this.state.externalWindow.document.body);

package/components/SearchBox.js

@@ -36,7 +36,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
 import classnames from 'classnames';
-import DOMPurify from 'dompurify';
 import isEmpty from 'lodash.isempty';
 import pointInPolygon from 'point-in-polygon';
 import polygonIntersectTest from 'polygon-intersect-test';
@@ -410,7 +409,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }) : null, /*#__PURE__*/React.createElement("span", {
         className: "searchbox-result-label",
         dangerouslySetInnerHTML: {
-          __html: DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig, ' ')
+          __html: MiscUtils.sanitizeHtml(result.text).replace(/<br\s*\/>/ig, ' ')
         },
         title: (_result$label = result.label) !== null && _result$label !== void 0 ? _result$label : result.text
       }), result.externalLink ? /*#__PURE__*/React.createElement(Icon, {
@@ -468,7 +467,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }) : null, /*#__PURE__*/React.createElement("span", {
         className: "searchbox-result-label",
         dangerouslySetInnerHTML: {
-          __html: DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig, ' ')
+          __html: MiscUtils.sanitizeHtml(result.text).replace(/<br\s*\/>/ig, ' ')
         },
         title: (_result$label3 = result.label) !== null && _result$label3 !== void 0 ? _result$label3 : result.text
       }), result.theme && addThemes ? /*#__PURE__*/React.createElement(Icon, {
@@ -501,7 +500,7 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }) : null), _this.state.activeLayerInfo === key ? /*#__PURE__*/React.createElement("div", {
         className: "searchbox-result-abstract",
         dangerouslySetInnerHTML: {
-          __html: MiscUtils.addLinkAnchors(DOMPurify.sanitize(((_result$layer = result.layer) === null || _result$layer === void 0 ? void 0 : _result$layer["abstract"]) || "")) || LocaleUtils.tr("search.nodescription")
+          __html: MiscUtils.addLinkAnchors(MiscUtils.sanitizeHtml(((_result$layer = result.layer) === null || _result$layer === void 0 ? void 0 : _result$layer["abstract"]) || "")) || LocaleUtils.tr("search.nodescription")
         },
         disabled: true,
         key: key + ":abstract",
@@ -533,13 +532,14 @@ var SearchBox = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/React.createElement("span", {
         className: "searchbox-result-label",
         dangerouslySetInnerHTML: {
-          __html: DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig, ' ')
+          __html: MiscUtils.sanitizeHtml(result.text).replace(/<br\s*\/>/ig, ' ')
         },
         title: (_result$label5 = result.label) !== null && _result$label5 !== void 0 ? _result$label5 : result.text
       }), result.theme && addThemes ? /*#__PURE__*/React.createElement(Icon, {
         icon: "plus",
         onClick: function onClick(ev) {
-          return _this.addThemeLayers(result.layer);
+          MiscUtils.killEvent(ev);
+          _this.addThemeLayers(result.layer);
         },
         title: LocaleUtils.tr("themeswitcher.addtotheme")
       }) : null);

package/components/ServiceInfoWindow.js

@@ -21,10 +21,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import React from 'react';
-import { connect } from 'react-redux';
-import DOMPurify from 'dompurify';
 import PropTypes from 'prop-types';
-import { setActiveServiceInfo } from '../actions/serviceinfo';
 import ResizeableWindow from '../components/ResizeableWindow';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
@@ -42,15 +39,12 @@ var ServiceInfoWindow = /*#__PURE__*/function (_React$Component) {
       if (content) {
         return /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, title, ":"), html ? /*#__PURE__*/React.createElement("td", {
           dangerouslySetInnerHTML: {
-            __html: MiscUtils.addLinkAnchors(DOMPurify.sanitize(content))
+            __html: MiscUtils.addLinkAnchors(MiscUtils.sanitizeHtml(content))
           }
         }) : /*#__PURE__*/React.createElement("td", null, content));
       }
       return null;
     });
-    _defineProperty(_this, "onClose", function () {
-      _this.props.setActiveServiceInfo(null);
-    });
     return _this;
   }
   _inherits(ServiceInfoWindow, _React$Component);
@@ -82,7 +76,7 @@ var ServiceInfoWindow = /*#__PURE__*/function (_React$Component) {
         initialX: this.props.layerInfoGeometry.initialX,
         initialY: this.props.layerInfoGeometry.initialY,
         initiallyDocked: this.props.layerInfoGeometry.initiallyDocked,
-        onClose: this.onClose,
+        onClose: this.props.onClose,
         title: LocaleUtils.tr("serviceinfo.title")
       }, /*#__PURE__*/React.createElement("div", {
         className: "service-info-window-body"
@@ -98,14 +92,7 @@ var ServiceInfoWindow = /*#__PURE__*/function (_React$Component) {
 }(React.Component);
 _defineProperty(ServiceInfoWindow, "propTypes", {
   layerInfoGeometry: PropTypes.object,
-  service: PropTypes.object,
-  setActiveServiceInfo: PropTypes.func
+  onClose: PropTypes.func,
+  service: PropTypes.object
 });
-var selector = function selector(state) {
-  return {
-    service: state.serviceinfo.service
-  };
-};
-export default connect(selector, {
-  setActiveServiceInfo: setActiveServiceInfo
-})(ServiceInfoWindow);
+export default ServiceInfoWindow;

package/components/ThemeList.js

@@ -29,7 +29,6 @@ import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
 import { remove as removeDiacritics } from 'diacritics';
-import DOMPurify from 'dompurify';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import { setActiveLayerInfo } from '../actions/layerinfo';
@@ -180,7 +179,7 @@ var ThemeList = /*#__PURE__*/function (_React$Component) {
         }, item.description ? /*#__PURE__*/React.createElement("div", {
           className: "theme-item-description",
           dangerouslySetInnerHTML: {
-            __html: DOMPurify.sanitize(item.description)
+            __html: MiscUtils.sanitizeHtml(item.description)
           }
         }) : null, /*#__PURE__*/React.createElement("img", {
           className: "theme-item-thumbnail",

package/components/map3d/Map3D.js

@@ -148,6 +148,8 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         zoomToObject: function zoomToObject(objectId) {},
         objectIsVisible: function objectIsVisible(objectId) {},
         objectContainsPoints: function objectContainsPoints(object) {},
+        addObjectAddedListener: function addObjectAddedListener(callback) {},
+        removeObjectAddedListener: function removeObjectAddedListener(callback) {},
         getMap: function getMap() {},
         computeBoundsTree: function computeBoundsTree(object) {},
         setViewToExtent: function setViewToExtent(bounds, angle) {},
@@ -384,6 +386,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         }
         _this2.computeBoundsTree(scene);
         _this2.instance.notifyChange(tiles);
+        _this2.notifyObjectAdded(scene);
       });
       // Show/hide labels when tile visibility changes
       tiles.tiles.addEventListener('tile-visibility-change', function (_ref3) {
@@ -394,6 +397,9 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
           l.labelObject.visible = visible;
           l.labelObject.element.style.display = visible ? 'initial' : 'none';
         });
+        if (visible) {
+          _this2.notifyObjectAdded(scene);
+        }
       });
       tiles.castShadow = true;
       tiles.receiveShadow = true;
@@ -473,6 +479,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         });
       } else {
         _this2.sceneObjectGroup.add(object);
+        _this2.notifyObjectAdded(object);
         callback === null || callback === void 0 || callback();
       }
       _this2.objectMap[objectId] = object;
@@ -583,7 +590,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var changed = false;
       if (options.visibility !== prevOptions.visibility || options.opacity !== (prevOptions === null || prevOptions === void 0 ? void 0 : prevOptions.opacity)) {
         var _objectTree$options$p2;
-        // Visibile if object is visibile and parents also
+        // Visible if object is visible and parents also
         var isVisible = options.opacity > 0 && options.visibility;
         for (var curId = options.parent; isVisible && curId !== undefined; curId = objectTree[curId].parent) {
           isVisible && (isVisible = objectTree[curId].visibility);
@@ -647,6 +654,11 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
         }
       });
     });
+    _defineProperty(_this2, "notifyObjectAdded", function (obj) {
+      _this2.objectAddedListeners.forEach(function (listener) {
+        return listener(obj);
+      });
+    });
     _defineProperty(_this2, "loadTilesetStyle", function (objectId, url) {
       var applyTilesetStyle = function applyTilesetStyle(styleurl) {
         var tiles3d = _this2.objectMap[objectId];
@@ -690,7 +702,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
       var objectTree = _this2.state.sceneContext.objectTree;
       var options = objectTree[objectId];
       var isVisible = options.opacity > 0 && options.visibility;
-      for (var curId = options.parent; isVisible && curId !== undefined; curId = objectTree[curId].parent) {
+      for (var curId = options.parent; isVisible && curId !== undefined && objectTree[curId]; curId = objectTree[curId].parent) {
         isVisible && (isVisible = objectTree[curId].visibility);
       }
       return isVisible;
@@ -1302,6 +1314,7 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _this2.sceneObjectGroup = null;
     _this2.objectMap = {};
     _this2.tilesetStyles = {};
+    _this2.objectAddedListeners = [];
     _this2.state.sceneContext.eventDispatcher = new EventDispatcher();
     _this2.state.sceneContext.addLayer = _this2.addLayer;
     _this2.state.sceneContext.getLayer = _this2.getLayer;
@@ -1314,6 +1327,14 @@ var Map3D = /*#__PURE__*/function (_React$Component2) {
     _this2.state.sceneContext.getSceneObject = _this2.getSceneObject;
     _this2.state.sceneContext.removeSceneObject = _this2.removeSceneObject;
     _this2.state.sceneContext.updateSceneObject = _this2.updateSceneObject;
+    _this2.state.sceneContext.addObjectAddedListener = function (callback) {
+      return _this2.objectAddedListeners.push(callback);
+    };
+    _this2.state.sceneContext.removeObjectAddedListener = function (callback) {
+      _this2.objectAddedListeners = _this2.objectAddedListeners.filter(function (cb) {
+        return cb !== callback;
+      });
+    };
     _this2.state.sceneContext.zoomToObject = _this2.zoomToObject;
     _this2.state.sceneContext.objectIsVisible = _this2.objectIsVisible;
     _this2.state.sceneContext.objectContainsPoints = _this2.objectContainsPoints;

package/components/map3d/utils/OrbitControls3D.js

@@ -79,12 +79,13 @@ var OrbitControls3D = /*#__PURE__*/function (_MapControls) {
     key: "disconnect",
     value: function disconnect() {
       this.animationId = null;
-      _superPropGet(OrbitControls3D, "disconnect", this, 3)([]);
       this.enabled = false;
       this.sceneContext.scene.view.setControls(null);
       this.domElement.removeEventListener('pointerdown', this.stopAnimations);
       this.domElement.removeEventListener('wheel', this.stopAnimations);
       this.removeEventListener('change', this.updateControlsTarget);
+      _superPropGet(OrbitControls3D, "disconnect", this, 3)([]);
+      this.domElement = null;
     }
   }, {
     key: "setView",

package/components/style/IdentifyViewer.css

@@ -219,3 +219,32 @@ div.identify-body td.identify-attr-spacer {
     height: 2px;
     background-color: var(--list-section-bg-color);
 }
+
+div.identify-body div.identify-results-tables {
+    flex: 1 1 auto;
+    overflow-y: auto;
+}
+
+div.identify-results-table-container {
+    padding-bottom: 0.5em;
+    border-bottom: 1px solid var(--border-color);
+    margin-bottom: 0.5em;
+}
+
+div.identify-results-table-titlebar {
+    display: flex;
+    align-items: center;
+    padding: 0.25em;
+    gap: 1em;
+}
+
+div.identify-results-table-titlebar > span:nth-child(2) {
+    flex: 1 1 auto;
+    font-weight: bold;
+    font-size: 110%;
+}
+
+div.identify-results-table-container > div.featurestable-frame {
+    max-height: 15em;
+    margin: 0.25em;
+}

package/components/style/ResizeableWindow.css

@@ -16,6 +16,16 @@ div.resizeable-window-portal-container > div {
     height: 100%;
 }
 
+div.resizeable-window-portal-container-detached {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 2.5em;
+    padding: 0.25em;
+    background-color: var(--container-bg-color);
+}
+
 div.resizeable-window-contents {
     display: flex;
     flex-direction: column;
@@ -37,6 +47,10 @@ div.resizeable-window-minimized {
     min-height: 2.5em!important;
 }
 
+div.resizeable-window-minimized div.resizeable-window-body {
+    padding: 0;
+}
+
 div.resizeable-window-docked-left {
     transform: none!important;
     left: 0!important;