qwc2 2025.10.16 → 2025.10.24

package/actions/locate.js

@@ -19,10 +19,11 @@ export function changeLocateState(state) {
     state: state
   };
 }
-export function changeLocatePosition(position) {
+export function changeLocatePosition(position, mapPos) {
   return {
     type: CHANGE_LOCATE_POSITION,
-    position: position
+    position: position,
+    mapPos: mapPos
   };
 }
 export function onLocateError(error) {

package/components/AttributeTableWidget.js

@@ -123,7 +123,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
               loadedLayer: ""
             });
           }
-        }, bbox, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[selectedLayer], _this.props.filter.filterGeom);
+        }, bbox, (_this$props$filter$fi = _this.props.filter.filterParams) === null || _this$props$filter$fi === void 0 ? void 0 : _this$props$filter$fi[selectedLayer], _this.props.filter.filterGeom, _this.props.showDisplayFieldOnly ? [currentEditConfig.displayField, "geometry"] : null);
         return _objectSpread(_objectSpread({}, AttributeTableWidget.defaultState), {}, {
           loading: true,
           selectedLayer: selectedLayer,
@@ -663,7 +663,9 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       if (!currentEditConfig) {
         return;
       }
-      var fields = currentEditConfig.fields.filter(function (field) {
+      var fields = _this.props.showDisplayFieldOnly ? currentEditConfig.fields.filter(function (field) {
+        return field.name === currentEditConfig.displayField;
+      }) : currentEditConfig.fields.filter(function (field) {
         return field.id !== 'id';
       });
       var data = "";
@@ -692,6 +694,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
     _this.state = AttributeTableWidget.defaultState;
     _this.table = null;
     _this.attribTableContents = null;
+    _this.state.limitToExtent = props.limitToExtent;
     return _this;
   }
   _inherits(AttributeTableWidget, _React$Component);
@@ -735,7 +738,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var editConfig = this.props.theme.editConfig || {};
       var currentEditConfig = editConfig[this.state.loadedLayer];
       var editPermissions = (editConfig[this.state.loadedLayer] || {}).permissions || {};
-      var readOnly = editPermissions.updatable === false;
+      var readOnly = this.props.readOnly || editPermissions.updatable === false;
       var loadOverlay = null;
       if (this.state.selectedLayer && this.state.selectedLayer !== this.state.loadedLayer) {
         if (this.state.loading) {
@@ -755,11 +758,11 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var table = null;
       var footbar = null;
       if (currentEditConfig && this.state.features) {
-        var fields = currentEditConfig.fields.filter(function (field) {
-          return field.id !== "id";
-        }).filter(function (field) {
+        var fields = this.props.showDisplayFieldOnly ? currentEditConfig.fields.filter(function (field) {
+          return field.name === currentEditConfig.displayField;
+        }) : currentEditConfig.fields.filter(function (field) {
           var _field$constraints;
-          return _this2.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true;
+          return field.id !== "id" && (_this2.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true);
         });
         var indexOffset = this.state.currentPage * this.state.pageSize;
         var features = this.state.filteredSortedFeatures.slice(indexOffset, indexOffset + this.state.pageSize);
@@ -768,14 +771,14 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           ref: function ref(el) {
             _this2.table = el;
           }
-        }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null), /*#__PURE__*/React.createElement("th", {
+        }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", null), !this.props.showDisplayFieldOnly ? /*#__PURE__*/React.createElement("th", {
           onClick: function onClick() {
             return _this2.sortBy("id");
           },
           title: this.translateFieldName("id", this.state.loadedLayer)
         }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
           className: "attribtable-table-headername"
-        }, this.translateFieldName("id", this.state.loadedLayer)), this.renderSortIndicator("id"), this.renderColumnResizeHandle(1, 'r'))), fields.map(function (field, idx) {
+        }, this.translateFieldName("id", this.state.loadedLayer)), this.renderSortIndicator("id"), this.renderColumnResizeHandle(1, 'r'))) : null, fields.map(function (field, idx) {
           return /*#__PURE__*/React.createElement("th", {
             key: field.id,
             onClick: function onClick() {
@@ -790,7 +793,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           var disabled = readOnly || _this2.state.changedFeatureIdx !== null && _this2.state.changedFeatureIdx !== featureidx;
           var key = _this2.state.changedFeatureIdx === featureidx && _this2.state.newFeature ? "newfeature" : feature.id;
           return /*#__PURE__*/React.createElement("tr", {
-            className: disabled ? "row-disabled" : "",
+            className: disabled && !_this2.props.readOnly ? "row-disabled" : "",
             key: key,
             onMouseEnter: function onMouseEnter() {
               return _this2.setState({
@@ -814,7 +817,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
               });
             },
             type: "checkbox"
-          }), _this2.renderRowResizeHandle(filteredIndex + 1, 'b'))), /*#__PURE__*/React.createElement("td", null, feature.id), fields.map(function (field) {
+          }), _this2.renderRowResizeHandle(filteredIndex + 1, 'b'))), !_this2.props.showDisplayFieldOnly ? /*#__PURE__*/React.createElement("td", null, feature.id) : null, fields.map(function (field) {
             return /*#__PURE__*/React.createElement("td", {
               key: field.id
             }, _this2.renderField(currentEditConfig, field, featureidx, indexOffset + filteredIndex, disabled || !!_this2.state.filterVal && field.id === _this2.state.filterField));
@@ -907,9 +910,9 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var editing = this.state.changedFeatureIdx !== null;
       var layerChanged = this.state.selectedLayer !== this.state.loadedLayer;
       var hasGeometry = (currentEditConfig || {}).geomType !== null;
-      var showAddButton = editPermissions.creatable !== false && (this.props.allowAddForGeometryLayers || !hasGeometry);
-      var showDelButton = editPermissions.deletable !== false;
-      var showEditButton = ConfigUtils.havePlugin("Editing") && this.props.showEditFormButton;
+      var showAddButton = !this.props.readOnly && editPermissions.creatable !== false && (this.props.allowAddForGeometryLayers || !hasGeometry);
+      var showDelButton = !this.props.readOnly && editPermissions.deletable !== false;
+      var showEditButton = !this.props.readOnly && ConfigUtils.havePlugin("Editing") && this.props.showEditFormButton;
       var deleteButton = showDelButton ? /*#__PURE__*/React.createElement("button", {
         className: "button",
         disabled: layerChanged || editing || !Object.values(this.state.selectedFeatures).find(function (entry) {
@@ -1043,12 +1046,17 @@ _defineProperty(AttributeTableWidget, "propTypes", {
   iface: PropTypes.object,
   initialLayer: PropTypes.string,
   layers: PropTypes.array,
+  /** Whether to limit to the extent by default. */
+  limitToExtent: PropTypes.bool,
   mapBbox: PropTypes.object,
   mapCrs: PropTypes.string,
   mapScales: PropTypes.array,
+  readOnly: PropTypes.bool,
   removeLayer: PropTypes.func,
   setCurrentTask: PropTypes.func,
   setCurrentTaskBlocked: PropTypes.func,
+  /** Whether to show the display field only */
+  showDisplayFieldOnly: PropTypes.bool,
   /** Whether to show a button to open the edit form for selected layer. Requires the Editing plugin to be enabled. */
   showEditFormButton: PropTypes.bool,
   /** Whether to show hidden Fields. */
@@ -1067,7 +1075,8 @@ _defineProperty(AttributeTableWidget, "defaultProps", {
   zoomLevel: 1000,
   showEditFormButton: true,
   showHiddenFields: true,
-  showLayerSelection: true
+  showLayerSelection: true,
+  limitToExtent: false
 });
 _defineProperty(AttributeTableWidget, "defaultState", {
   loading: false,

package/components/FeatureAttributesWindow.js

@@ -0,0 +1,177 @@
+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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+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; }
+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 2025 Sourcepole AG
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import LocaleUtils from '../utils/LocaleUtils';
+import Icon from './Icon';
+import ResizeableWindow from './ResizeableWindow';
+import TextInput from './widgets/TextInput';
+import './style/FeatureAttributesWindow.css';
+var FeatureAttributesWindow = /*#__PURE__*/function (_React$Component) {
+  function FeatureAttributesWindow() {
+    var _this;
+    _classCallCheck(this, FeatureAttributesWindow);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, FeatureAttributesWindow, [].concat(args));
+    _defineProperty(_this, "renderAttributesList", function () {
+      var featureAttribs = new Set(Object.keys(_this.props.feature.properties || {}));
+      featureAttribs.add("label");
+      return /*#__PURE__*/React.createElement("form", {
+        action: "",
+        onSubmit: _this.addAttrib
+      }, /*#__PURE__*/React.createElement("table", null, /*#__PURE__*/React.createElement("tbody", null, Object.entries(_this.props.feature.properties || {}).filter(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          name = _ref2[0],
+          value = _ref2[1];
+        return name !== "label" && typeof value === 'string';
+      }).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          name = _ref4[0],
+          value = _ref4[1];
+        return /*#__PURE__*/React.createElement("tr", {
+          key: name
+        }, /*#__PURE__*/React.createElement("td", null, name), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(TextInput, {
+          onChange: function onChange(text) {
+            return _this.updateAttrib(name, text);
+          },
+          value: value
+        })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("button", {
+          className: "button",
+          type: "button"
+        }, /*#__PURE__*/React.createElement(Icon, {
+          icon: "trash",
+          onClick: function onClick() {
+            return _this.removeAttrib(name);
+          }
+        }))));
+      }), _this.props.allAttribs.filter(function (attrib) {
+        return !featureAttribs.has(attrib);
+      }).map(function (name) {
+        return /*#__PURE__*/React.createElement("tr", {
+          key: name
+        }, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("i", null, name)), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(TextInput, {
+          onChange: function onChange(text) {
+            return _this.updateAttrib(name, text);
+          },
+          value: ""
+        })), /*#__PURE__*/React.createElement("td", null));
+      }), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("input", {
+        name: "name",
+        placeholder: LocaleUtils.tr("featureattributes.name"),
+        type: "text"
+      })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("input", {
+        name: "value",
+        placeholder: LocaleUtils.tr("featureattributes.value"),
+        type: "text"
+      })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("button", {
+        className: "button",
+        type: "submit"
+      }, /*#__PURE__*/React.createElement(Icon, {
+        icon: "plus"
+      })))))));
+    });
+    _defineProperty(_this, "updateAttrib", function (name, value) {
+      var newFeature = _objectSpread({}, _this.props.feature);
+      newFeature.properties = _objectSpread({}, newFeature.properties);
+      newFeature.properties[name] = value.trim();
+      _this.props.onFeatureChanged(newFeature);
+    });
+    _defineProperty(_this, "removeAttrib", function (name) {
+      var newFeature = _objectSpread({}, _this.props.feature);
+      newFeature.properties = _objectSpread({}, newFeature.properties);
+      delete newFeature.properties[name];
+      _this.props.onFeatureChanged(newFeature, [name]);
+    });
+    _defineProperty(_this, "addAttrib", function (ev) {
+      ev.preventDefault();
+      var newFeature = _objectSpread({}, _this.props.feature);
+      newFeature.properties = _objectSpread({}, newFeature.properties);
+      var name = ev.target.elements.name.value.trim();
+      var value = ev.target.elements.value.value.trim();
+      if (name && !(name in newFeature.properties)) {
+        newFeature.properties[name] = value;
+        _this.props.onFeatureChanged(newFeature);
+        ev.target.elements.name.value = "";
+        ev.target.elements.value.value = "";
+      }
+    });
+    return _this;
+  }
+  _inherits(FeatureAttributesWindow, _React$Component);
+  return _createClass(FeatureAttributesWindow, [{
+    key: "render",
+    value: function render() {
+      var body = null;
+      if (!this.props.feature) {
+        body = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("featureattributes.nofeature"));
+      } else {
+        body = this.renderAttributesList();
+      }
+      return /*#__PURE__*/React.createElement(ResizeableWindow, {
+        fitHeight: true,
+        icon: "list-alt",
+        initialWidth: 320,
+        onClose: this.props.onClose,
+        scrollable: true,
+        title: LocaleUtils.tr("featureattributes.windowtitle")
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "feature-attributes-body",
+        role: "body"
+      }, body));
+    }
+  }]);
+}(React.Component);
+_defineProperty(FeatureAttributesWindow, "propTypes", {
+  allAttribs: PropTypes.array,
+  feature: PropTypes.object,
+  onClose: PropTypes.func,
+  onFeatureChanged: PropTypes.func
+});
+export default connect(function (state, ownProps) {
+  var _state$layers$flat$fi, _state$layers$flat$fi2;
+  return {
+    allAttribs: _toConsumableArray(((_state$layers$flat$fi = (_state$layers$flat$fi2 = state.layers.flat.find(function (layer) {
+      return layer.id === ownProps.layerid;
+    })) === null || _state$layers$flat$fi2 === void 0 ? void 0 : _state$layers$flat$fi2.features) !== null && _state$layers$flat$fi !== void 0 ? _state$layers$flat$fi : []).reduce(function (res, feature) {
+      Object.keys(feature.properties || {}).forEach(function (key) {
+        return res.add(key);
+      });
+      return res;
+    }, new Set()))
+  };
+}, {})(FeatureAttributesWindow);

package/components/IdentifyViewer.js

@@ -324,7 +324,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "state", {
       collapsedLayers: new ToggleSet(),
       expandedResults: new ToggleSet(),
-      pinnedResults: new ToggleSet(),
+      selectedResults: new ToggleSet(),
       resultTree: {},
       reports: {},
       currentResult: null,
@@ -358,13 +358,9 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       });
     });
     _defineProperty(_this, "setHighlightedFeatures", function (features) {
-      var paginated = _this.props.resultDisplayMode === 'paginated';
-      if (!features && (_this.props.highlightAllResults || paginated)) {
+      if (!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();
-        if (paginated) {
-          features = [features[_this.state.currentPage]];
-        }
       }
       features = (features || []).filter(function (feature) {
         return feature.type.toLowerCase() === "feature";
@@ -412,26 +408,41 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           collapsedLayers["delete"](layerid);
         }
         var selectedLayer = isEmpty(newResultTree[layerid]) ? '' : state.selectedLayer;
-        var pinnedResults = state.pinnedResults["delete"](layerid + "$" + feature.id);
+        var selectedResults = state.selectedResults["delete"](layerid + "$" + feature.id);
         return {
           resultTree: newResultTree,
           currentResult: ((_state$currentResult2 = state.currentResult) === null || _state$currentResult2 === void 0 ? void 0 : _state$currentResult2.featureid) === feature.id ? null : state.currentResult,
           selectedLayer: selectedLayer,
-          pinnedResults: pinnedResults,
+          selectedResults: selectedResults,
           expandedResults: state.expandedResults["delete"](layerid + "$" + feature.id),
           collapsedLayers: collapsedLayers,
-          compareEnabled: state.compareEnabled && pinnedResults.size > 1
+          compareEnabled: state.compareEnabled && selectedResults.size > 1
         };
       });
     });
     _defineProperty(_this, "exportResults", function () {
       var clipboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var filteredResults = {};
-      Object.keys(_this.state.selectedLayer !== '' ? _defineProperty({}, _this.state.selectedLayer, _this.state.resultTree[_this.state.selectedLayer]) : _this.state.resultTree).map(function (key) {
-        if (!isEmpty(_this.state.resultTree[key])) {
-          filteredResults[key] = _this.state.resultTree[key];
-        }
-      });
+      if (_this.state.selectedResults.size() > 0) {
+        _this.state.selectedResults.entries().forEach(function (key) {
+          var _key$split = key.split("$"),
+            _key$split2 = _slicedToArray(_key$split, 2),
+            layerid = _key$split2[0],
+            featureid = _key$split2[1];
+          if (!filteredResults[layerid]) {
+            filteredResults[layerid] = [];
+          }
+          filteredResults[layerid].push(_this.state.resultTree[layerid].find(function (feature) {
+            return feature.id === featureid;
+          }));
+        });
+      } else {
+        Object.keys(_this.state.selectedLayer !== '' ? _defineProperty({}, _this.state.selectedLayer, _this.state.resultTree[_this.state.selectedLayer]) : _this.state.resultTree).map(function (key) {
+          if (!isEmpty(_this.state.resultTree[key])) {
+            filteredResults[key] = _this.state.resultTree[key];
+          }
+        });
+      }
       _this["export"](filteredResults, clipboard);
     });
     _defineProperty(_this, "exportResultLayer", function (layer) {
@@ -537,7 +548,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
               return _this.setCurrentResult(layerid, feature.id);
             },
             ref: ref
-          }, feature.displayname, _this.state.pinnedResults.has(layerid + "$" + feature.id) ? /*#__PURE__*/React.createElement(Icon, {
+          }, feature.displayname, _this.state.selectedResults.has(layerid + "$" + feature.id) ? /*#__PURE__*/React.createElement(Icon, {
             icon: "pin"
           }) : null), exportEnabled ? /*#__PURE__*/React.createElement(Icon, {
             className: "identify-export-result",
@@ -704,7 +715,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       }
       var key = layerid + "$" + feature.id;
       var expanded = _this.state.expandedResults.has(key);
-      var pinned = _this.state.pinnedResults.has(key);
+      var selected = _this.state.selectedResults.has(key);
       return /*#__PURE__*/React.createElement("div", {
         className: resultClass,
         key: key
@@ -720,9 +731,10 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           });
         }
       }) : null, _this.props.enableCompare ? /*#__PURE__*/React.createElement(Icon, {
-        icon: pinned ? "unpin" : "pin",
+        className: "identify-result-checkbox",
+        icon: selected ? "checked" : "unchecked",
         onClick: function onClick() {
-          return _this.togglePinnedResult(key);
+          return _this.toggleSelectedResult(key);
         }
       }) : null, /*#__PURE__*/React.createElement("span", null, (_this.props.showLayerTitles ? feature.layertitle + ": " : "") + feature.displayname), zoomToFeatureButton, /*#__PURE__*/React.createElement(Icon, {
         icon: "info-sign",
@@ -738,37 +750,47 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         className: "identify-result-container"
       }, resultbox, extraattribs));
     });
-    _defineProperty(_this, "togglePinnedResult", function (key) {
+    _defineProperty(_this, "toggleSelectedResult", function (key) {
       _this.setState(function (state) {
-        var pinnedResults = state.pinnedResults.toggle(key);
+        var selectedResults = state.selectedResults.toggle(key);
         return {
-          pinnedResults: pinnedResults,
-          compareEnabled: pinnedResults.size > 1
+          selectedResults: selectedResults,
+          compareEnabled: selectedResults.size > 1
         };
       });
     });
-    _defineProperty(_this, "renderToolbar", function (resultCount) {
-      var toggleButton = function toggleButton(key, icon) {
+    _defineProperty(_this, "renderToolbar", function (results) {
+      var resultCount = results.length;
+      var toggleButton = function toggleButton(key, icon, disabled) {
+        var tooltip = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
         return /*#__PURE__*/React.createElement("button", {
           className: "button" + (_this.state[key] ? " pressed" : ""),
+          disabled: disabled,
           onClick: function onClick() {
             return _this.setState(function (state) {
               return _defineProperty({}, key, !state[key]);
             });
-          }
+          },
+          title: tooltip
         }, /*#__PURE__*/React.createElement(Icon, {
           icon: icon
         }));
       };
       var infoLabel = null;
       if (_this.state.compareEnabled) {
-        infoLabel = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("identify.comparing", _this.state.pinnedResults.size()));
+        infoLabel = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("identify.comparing", _this.state.selectedResults.size()));
       } else if (_this.props.resultDisplayMode !== 'paginated') {
         infoLabel = /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("identify.featurecount", resultCount));
       }
+      var checkedPages = results.reduce(function (res, entry, idx) {
+        if (_this.state.selectedResults.has(entry[0] + "$" + entry[1].id)) {
+          return [].concat(_toConsumableArray(res), [idx]);
+        }
+        return res;
+      }, []);
       return /*#__PURE__*/React.createElement("div", {
         className: "identify-toolbar"
-      }, toggleButton("settingsMenu", "cog"), _this.state.settingsMenu ? _this.renderSettingsMenu() : null, _this.state.pinnedResults.size() > 1 ? toggleButton("compareEnabled", "compare") : null, /*#__PURE__*/React.createElement("span", {
+      }, toggleButton("settingsMenu", "cog", false), _this.state.settingsMenu ? _this.renderSettingsMenu() : null, _this.props.enableCompare ? 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"
@@ -780,7 +802,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
             currentPage: page
           });
         },
-        pageSizes: [1]
+        pageSizes: [1],
+        selectedPages: checkedPages
       }) : null);
     });
     _defineProperty(_this, "renderSettingsMenu", function () {
@@ -798,10 +821,8 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         className: "controlgroup"
       }, /*#__PURE__*/React.createElement("select", {
         className: "controlgroup-expanditem",
-        onChange: function onChange(e) {
-          return _this.setState({
-            selectedLayer: e.target.value
-          });
+        onChange: function onChange(ev) {
+          return _this.setSelectedLayer(ev.target.value);
         }
       }, /*#__PURE__*/React.createElement("option", {
         value: ""
@@ -876,6 +897,20 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         icon: "report"
       }))))) : null)));
     });
+    _defineProperty(_this, "setSelectedLayer", function (layer) {
+      _this.setState(function (state) {
+        var newSelectedResults = state.selectedResults;
+        if (layer !== '') {
+          newSelectedResults = state.selectedResults.filtered(function (key) {
+            return key.startsWith(layer + "$");
+          });
+        }
+        return {
+          selectedResults: newSelectedResults,
+          selectedLayer: layer
+        };
+      });
+    });
     _defineProperty(_this, "computeExtraAttributes", function (layer, result) {
       var _window$qwc;
       var rows = [];
@@ -1147,11 +1182,11 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
       if (this.state.compareEnabled) {
         body = /*#__PURE__*/React.createElement("div", {
           className: "identify-compare-results"
-        }, this.state.pinnedResults.entries().map(function (key) {
-          var _key$split = key.split("$"),
-            _key$split2 = _slicedToArray(_key$split, 2),
-            layerid = _key$split2[0],
-            featureid = _key$split2[1];
+        }, this.state.selectedResults.entries().map(function (key) {
+          var _key$split3 = key.split("$"),
+            _key$split4 = _slicedToArray(_key$split3, 2),
+            layerid = _key$split4[0],
+            featureid = _key$split4[1];
           var feature = _this2.state.resultTree[layerid].find(function (f) {
             return f.id === featureid;
           });
@@ -1184,7 +1219,13 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
           layerid = _flatResults$this$sta[0],
           feature = _flatResults$this$sta[1];
         body = /*#__PURE__*/React.createElement("div", {
-          className: "identify-flat-results-list"
+          className: "identify-flat-results-list",
+          onMouseEnter: function onMouseEnter() {
+            return _this2.setHighlightedFeatures([feature]);
+          },
+          onMouseLeave: function onMouseLeave() {
+            return _this2.setHighlightedFeatures(null);
+          }
         }, this.renderResultAttributes(layerid, feature, 'identify-result-frame'));
       }
       // "el.style.background='inherit'": HACK to trigger an additional repaint, since Safari/Chrome on iOS render the element cut off the first time
@@ -1193,7 +1234,7 @@ var IdentifyViewer = /*#__PURE__*/function (_React$Component) {
         ref: function ref(el) {
           if (el) el.style.background = 'inherit';
         }
-      }, body, flatResults.length > 0 ? this.renderToolbar(flatResults.length) : null);
+      }, body, flatResults.length > 0 ? this.renderToolbar(flatResults) : null);
     }
   }]);
 }(React.Component);