qwc2 2025.12.17 → 2025.12.18

package/plugins/FeatureSearch.js

@@ -86,7 +86,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("option", {
         disabled: true,
         value: ""
-      }, LocaleUtils.tr("featuresearch.select")), Object.entries(_this.state.providerGroups).map(function (_ref) {
+      }, LocaleUtils.tr("common.select")), Object.entries(_this.state.providerGroups).map(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           group = _ref2[0],
           entries = _ref2[1];
@@ -165,7 +165,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         }, /*#__PURE__*/React.createElement("option", {
           disabled: true,
           value: ""
-        }, LocaleUtils.tr("featuresearch.select")), options.map(function (entry) {
+        }, LocaleUtils.tr("common.select")), options.map(function (entry) {
           var _entry$value, _entry$value2, _entry$label;
           return /*#__PURE__*/React.createElement("option", {
             key: (_entry$value = entry.value) !== null && _entry$value !== void 0 ? _entry$value : entry,
@@ -195,7 +195,7 @@ var FeatureSearch = /*#__PURE__*/function (_React$Component) {
         className: "feature-search-results"
       }, isEmpty(_this.state.searchResults) ? /*#__PURE__*/React.createElement("div", {
         className: "feature-search-noresults"
-      }, LocaleUtils.tr("featuresearch.noresults")) : /*#__PURE__*/React.createElement(IdentifyViewer, {
+      }, LocaleUtils.tr("common.noresults")) : /*#__PURE__*/React.createElement(IdentifyViewer, {
         collapsible: true,
         displayResultTree: false,
         enableExport: _this.props.enableExport,

package/plugins/GeometryDigitizer.js

@@ -32,6 +32,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import polySelfIntersections from 'geojson-polygon-self-intersections';
 import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 import PropTypes from 'prop-types';
 import { LayerRole, removeLayer, addLayerFeatures, removeLayerFeatures, clearLayer } from '../actions/layers';
 import { changeRedliningState, resetRedliningState } from '../actions/redlining';
@@ -42,6 +43,7 @@ import ButtonBar from '../components/widgets/ButtonBar';
 import NumberInput from '../components/widgets/NumberInput';
 import Spinner from '../components/widgets/Spinner';
 import ConfigUtils from '../utils/ConfigUtils';
+import { EXCLUDE_ATTRS, EXCLUDE_PROPS } from '../utils/IdentifyUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import VectorLayerUtils from '../utils/VectorLayerUtils';
@@ -68,7 +70,8 @@ import './style/Redlining.css';
  *         "name": "<geomLinkName>",                // Link name referenced in theme item
  *         "title": "<geomLinkTitle>",              // Link title, displayed in the selection combo
  *         "geomType": ["<geomType>", "<geomType>"] // Supported geometry types (Point, LineString, Polygon)
- *         "url": "<targetApplicationUrl>",         // Application target URL, receiving the POST submit
+ *         "format": "wkt|geojson",                 // Format of data to send to application
+ *         "url": "<targetApplicationUrl>",         // Application target URL, receiving the POST submit. Can contain the $username$ placeholder parameter.
  *         "params": {"<key>": "<value>", ...}      // Optional: additional form parameters to post to URL
  *         "target": "<target>" | {                 // Optional: form POST target which to display the result
  *           "iframedialog": true,                  // Use an iframe dialog
@@ -80,6 +83,10 @@ import './style/Redlining.css';
  *   }
  * }
  * ```
+ * If you are using `qwc-services`, you will need to explicitly permit the geometry links in the `qwc-admin-gui` as follows:
+ *
+ * * Create and permit a `Plugin` resource with name `geometryLinks`
+ * * Create and permit `Plugin data` resources with name equal to `<geomLinkName>`
  */
 var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
   function GeometryDigitizer(props) {
@@ -109,7 +116,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       _this.props.resetRedliningState();
     });
     _defineProperty(_this, "renderBody", function () {
-      var _this$props$layers$fi, _geomLinkData$target, _geomLinkData$target2, _this$props$theme$plu;
+      var _this$props$layers$fi, _geomLinkData$target, _geomLinkData$target2, _this$props$theme$plu, _geomLinkData$url;
       var geomLinkData = _this.geometryLinkData(_this.state.geomLink);
       var activeButton = null;
       if (_this.state.pickGeomType) {
@@ -129,7 +136,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       } : {
         key: "Point",
-        tooltip: LocaleUtils.tr("redlining.point"),
+        tooltip: LocaleUtils.tr("common.point"),
         icon: "point",
         data: {
           action: "Draw",
@@ -148,7 +155,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       } : {
         key: "LineString",
-        tooltip: LocaleUtils.tr("redlining.line"),
+        tooltip: LocaleUtils.tr("common.line"),
         icon: "line",
         data: {
           action: "Draw",
@@ -158,7 +165,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         disabled: !supportedGeomType.includes("LineString")
       }, {
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
         data: {
           action: "Draw",
@@ -169,7 +176,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }];
       var editButtons = [{
         key: "Pick",
-        tooltip: LocaleUtils.tr("redlining.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "pick",
         data: {
           action: "Pick",
@@ -178,7 +185,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       }, {
         key: "Delete",
-        tooltip: LocaleUtils.tr("redlining.delete"),
+        tooltip: LocaleUtils.tr("common.delete"),
         icon: "trash",
         data: {
           action: "Delete",
@@ -237,7 +244,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         }
       })), /*#__PURE__*/React.createElement("div", {
         className: "redlining-groupcontrol"
-      }, /*#__PURE__*/React.createElement("div", null, LocaleUtils.tr("redlining.pick")), /*#__PURE__*/React.createElement(ButtonBar, {
+      }, /*#__PURE__*/React.createElement("div", null, LocaleUtils.tr("common.pick")), /*#__PURE__*/React.createElement(ButtonBar, {
         active: activeButton,
         buttons: pickButtons,
         onClick: function onClick(key, data) {
@@ -271,7 +278,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
           value: entry
         }, _this.geometryLinkData(entry).title);
       })), /*#__PURE__*/React.createElement("form", {
-        action: geomLinkData.url,
+        action: (_geomLinkData$url = geomLinkData.url) === null || _geomLinkData$url === void 0 ? void 0 : _geomLinkData$url.replace('$username$', ConfigUtils.getConfigProp("username") || ""),
         method: "post",
         onSubmit: _this.submitGeometryLink,
         target: target
@@ -335,7 +342,7 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
         className: "geomdigitizer-output-window-body"
       }, !_this.state.outputLoaded ? /*#__PURE__*/React.createElement("span", {
         className: "geomdigitizer-output-window-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("geomdigitizer.wait"))) : null, /*#__PURE__*/React.createElement("iframe", {
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", /*#__PURE__*/React.createElement("span", null, LocaleUtils.tr("common.loading"))) : null, /*#__PURE__*/React.createElement("iframe", {
         name: "geomdigitizer-output-window",
         onLoad: function onLoad() {
           return _this.setState({
@@ -492,19 +499,26 @@ var GeometryDigitizer = /*#__PURE__*/function (_React$Component) {
       }
       var data = _this.geometryLinkData(_this.state.geomLink);
       var supportedGeomType = data.geomType || [];
-      var geometries = features.filter(function (feature) {
+      var supportedFeatures = features.filter(function (feature) {
         return supportedGeomType.includes(_this.state.bufferDistance > 0 ? "Polygon" : feature.geometry.type.replace(/^Multi/, ''));
-      }).map(function (feature) {
-        return VectorLayerUtils.geoJSONGeomToWkt(feature.geometry);
       });
-      if (isEmpty(geometries)) {
+      if (isEmpty(supportedFeatures)) {
         ev.preventDefault();
         return;
-      } else {
-        ev.target.GEOMETRIES.value = geometries.join(";");
-        ev.target.GEOMCOUNT.value = geometries.length;
-        ev.target.BUFFERDIST.value = _this.state.bufferDistance;
       }
+      var geometries = (data.format || "wkt").toLowerCase() === "wkt" ? supportedFeatures.map(function (feature) {
+        return VectorLayerUtils.geoJSONGeomToWkt(feature.geometry);
+      }).join(";") : JSON.stringify({
+        type: "FeatureCollection",
+        features: supportedFeatures.map(function (feature) {
+          var newFeature = omit(feature, EXCLUDE_PROPS);
+          newFeature.properties = omit(newFeature.properties, EXCLUDE_ATTRS);
+          return newFeature;
+        })
+      });
+      ev.target.GEOMETRIES.value = geometries;
+      ev.target.GEOMCOUNT.value = supportedFeatures.length;
+      ev.target.BUFFERDIST.value = _this.state.bufferDistance;
       if (ev.target.target === "geomdigitizer-output-window") {
         _this.setState({
           outputWindowVisible: true,

package/plugins/Identify.js

@@ -230,7 +230,7 @@ var Identify = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_this, "parseResult", function (response, layer, format, clickPoint) {
       var ctrlPick = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-      var newResults = IdentifyUtils.parseResponse(response, layer, format, clickPoint, _this.props.map.projection, _this.props.featureInfoReturnsLayerName);
+      var newResults = IdentifyUtils.parseResponse(response, layer, format, clickPoint, _this.props.map.projection);
       // Merge with previous
       _this.setState(function (state) {
         var identifyResults = _objectSpread({}, state.identifyResults);
@@ -481,8 +481,6 @@ _defineProperty(Identify, "propTypes", {
   exitTaskOnResultsClose: PropTypes.bool,
   /** Whether to include the geometry in exported features. Default: `true`. */
   exportGeometry: PropTypes.bool,
-  /** Whether to assume that XML GetFeatureInfo responses specify the technical layer name in the `name` attribute, rather than the layer title. */
-  featureInfoReturnsLayerName: PropTypes.bool,
   /** Default window geometry with size, position and docking status. Positive position values (including '0') are related to top (InitialY) and left (InitialX), negative values (including '-0') to bottom (InitialY) and right (InitialX). */
   geometry: PropTypes.shape({
     initialWidth: PropTypes.number,
@@ -527,7 +525,6 @@ _defineProperty(Identify, "defaultProps", {
   resultDisplayMode: 'flat',
   resultGridSize: 200,
   replaceImageUrls: true,
-  featureInfoReturnsLayerName: true,
   geometry: {
     initialWidth: 240,
     initialHeight: 320,

package/plugins/MapExport.js

@@ -169,7 +169,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
         }
       }, /*#__PURE__*/React.createElement("table", {
         className: "options-table"
-      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      }, /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: _this.changeFormat,
         value: _this.state.selectedFormat
       }, _this.state.availableFormats.map(function (format) {
@@ -199,7 +199,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
           key: "size_" + idx,
           value: idx
         }, entry.name);
-      })))) : null, scaleChooser && _this.state.pageSize !== null ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, _this.props.dpis && _this.state.selectedFormat !== "application/dxf" ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.resolution")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      })))) : null, scaleChooser && _this.state.pageSize !== null ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("mapexport.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, _this.props.dpis && _this.state.selectedFormat !== "application/dxf" ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.resolution")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: _this.changeResolution,
         value: _this.state.dpi
       }, _this.props.dpis.map(function (dpi) {
@@ -227,7 +227,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
         type: "submit"
       }, _this.state.exporting ? /*#__PURE__*/React.createElement("span", {
         className: "mapexport-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("mapexport.wait")) : LocaleUtils.tr("mapexport.submit")))));
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("common.wait")) : LocaleUtils.tr("common.export")))));
     });
     _defineProperty(_this, "renderPrintSelection", function () {
       if (_this.state.pageSize !== null) {
@@ -517,7 +517,7 @@ var MapExport = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("print.maximize") : LocaleUtils.tr("print.minimize");
+      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "mapexport-minimize-maximize",
         icon: this.state.minimized ? 'chevron-down' : 'chevron-up',

package/plugins/MapFilter.js

@@ -290,12 +290,12 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       var commitButtons = [{
         key: 'Save',
         icon: 'ok',
-        label: LocaleUtils.tr("mapfilter.save"),
+        label: LocaleUtils.tr("common.save"),
         extraClasses: "button-accept"
       }, {
         key: 'Cancel',
         icon: 'remove',
-        label: LocaleUtils.tr("mapfilter.cancel"),
+        label: LocaleUtils.tr("common.cancel"),
         extraClasses: "button-reject"
       }];
       var sampleFilters = '["field", "=", "val"]\n' + '[["field", ">", "val1"], "and", ["field", "<", "val2"]]';
@@ -389,7 +389,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
             value: _this.state.filters[config.id].values[field.id]
           }, !field.defaultValue ? /*#__PURE__*/React.createElement("option", {
             value: ""
-          }, LocaleUtils.tr("mapfilter.select")) : null, field.inputConfig.options.map(function (entry) {
+          }, LocaleUtils.tr("common.select")) : null, field.inputConfig.options.map(function (entry) {
             var _entry$value, _entry$value2, _entry$label;
             return /*#__PURE__*/React.createElement("option", {
               key: (_entry$value = entry.value) !== null && _entry$value !== void 0 ? _entry$value : entry,
@@ -483,7 +483,7 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
           onChange: function onChange(value) {
             return _this.updateCustomFilter(key, 'layer', value);
           },
-          placeholder: LocaleUtils.tr("mapfilter.selectlayer"),
+          placeholder: LocaleUtils.tr("common.selectlayer"),
           value: entry.layer
         }, layerNames.map(function (layerName) {
           return /*#__PURE__*/React.createElement("div", {
@@ -518,19 +518,19 @@ var MapFilter = /*#__PURE__*/function (_React$Component) {
       var geomFilter = _this.state.geomFilter;
       var filterButtons = [{
         key: "Polygon",
-        tooltip: LocaleUtils.tr("redlining.polygon"),
+        tooltip: LocaleUtils.tr("common.polygon"),
         icon: "polygon",
-        label: LocaleUtils.tr("redlining.polygon")
+        label: LocaleUtils.tr("common.polygon")
       }, {
         key: "Circle",
-        tooltip: LocaleUtils.tr("redlining.circle"),
+        tooltip: LocaleUtils.tr("common.circle"),
         icon: "circle",
-        label: LocaleUtils.tr("redlining.circle")
+        label: LocaleUtils.tr("common.circle")
       }, {
         key: "Pick",
-        tooltip: LocaleUtils.tr("redlining.pick"),
+        tooltip: LocaleUtils.tr("common.pick"),
         icon: "pick",
-        label: LocaleUtils.tr("redlining.pick")
+        label: LocaleUtils.tr("common.pick")
       }];
       var active = geomFilter.picking ? "Pick" : geomFilter.geomType || "";
       return /*#__PURE__*/React.createElement("div", {

package/plugins/NewsPopup.js

@@ -57,7 +57,7 @@ var NewsPopup = /*#__PURE__*/function (_React$Component) {
         className: "newspopup-dialog-popup-buttonbar"
       }, /*#__PURE__*/React.createElement("button", {
         onClick: _this.closeDialog
-      }, LocaleUtils.tr("newspopup.dialogclose")), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("input", {
+      }, LocaleUtils.tr("common.close")), /*#__PURE__*/React.createElement("label", null, /*#__PURE__*/React.createElement("input", {
         onChange: function onChange(ev) {
           return _this.setState({
             dontShowAgain: ev.target.checked

package/plugins/ObliqueView.js

@@ -23,14 +23,17 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { connect } from 'react-redux';
 import axios from 'axios';
+import isEqual from 'lodash.isequal';
 import ol from 'openlayers';
 import PropTypes from 'prop-types';
+import { zoomToExtent } from '../actions/map';
 import { setCurrentTask } from '../actions/task';
 import Icon from '../components/Icon';
 import ResizeableWindow from '../components/ResizeableWindow';
 import LayerRegistry from '../components/map/layers/index';
 import InputContainer from '../components/widgets/InputContainer';
 import ConfigUtils from '../utils/ConfigUtils';
+import CoordinatesUtils from '../utils/CoordinatesUtils';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
@@ -116,17 +119,6 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
       _this.setState({
         currentZoom: zoom
       });
-      _this.map.on('moveend', function () {
-        _this.setState(function (state) {
-          var newZoom = _this.map.getView().getZoom();
-          if (newZoom !== state.currentZoom) {
-            return {
-              currentZoom: newZoom
-            };
-          }
-          return null;
-        });
-      });
       var layers = [];
       var themeConfig = _this.props.theme.obliqueDatasets.find(function (entry) {
         return entry.name === _this.state.selectedDataset;
@@ -198,6 +190,33 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         s: 180
       }[_this.state.currentDirection];
     });
+    _defineProperty(_this, "sync2DExtent", function () {
+      if (!_this.state.datasetConfig) {
+        return;
+      }
+      _this.setState(function (state) {
+        var center = CoordinatesUtils.reproject(_this.props.map.center, _this.props.map.projection, state.datasetConfig.crs);
+        var resolution = MapUtils.computeForZoom(_this.props.map.resolutions, _this.props.map.zoom);
+        _this.map.getView().setCenter(center);
+        _this.map.getView().setResolution(resolution);
+        return {
+          currentCenter: center,
+          currentZoom: _this.map.getView().getZoom()
+        };
+      });
+    });
+    _defineProperty(_this, "trackFocus", function (ev) {
+      var _this$map, _this$map$getTargetEl, _mapEl$contains, _mapObliqueEl$contain;
+      var mapEl = document.getElementById("map");
+      var mapObliqueEl = (_this$map = _this.map) === null || _this$map === void 0 || (_this$map$getTargetEl = _this$map.getTargetElement) === null || _this$map$getTargetEl === void 0 ? void 0 : _this$map$getTargetEl.call(_this$map);
+      if (mapEl !== null && mapEl !== void 0 && (_mapEl$contains = mapEl.contains) !== null && _mapEl$contains !== void 0 && _mapEl$contains.call(mapEl, document.activeElement)) {
+        _this.focusedMap = "map";
+      } else if (mapObliqueEl !== null && mapObliqueEl !== void 0 && (_mapObliqueEl$contain = mapObliqueEl.contains) !== null && _mapObliqueEl$contain !== void 0 && _mapObliqueEl$contain.call(mapObliqueEl, document.activeElement)) {
+        _this.focusedMap = "mapOblique";
+      } else {
+        _this.focusedMap = null;
+      }
+    });
     var controls = ol.control.defaults({
       zoom: false,
       attribution: false,
@@ -210,15 +229,39 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
       controls: controls,
       interactions: interactions
     });
-    _this.map.on('moveend', _this.searchClosestImage);
     _this.map.on('rotateend', _this.searchClosestImage);
+    _this.map.on('moveend', function () {
+      _this.searchClosestImage();
+      _this.setState(function (state) {
+        var newZoom = _this.map.getView().getZoom();
+        var newCenter = _this.map.getView().getCenter();
+        if (newZoom !== state.currentZoom || !isEqual(newCenter, state.currentCenter)) {
+          return {
+            currentZoom: newZoom,
+            currentCenter: newCenter
+          };
+        }
+        return null;
+      });
+    });
     _this.closestImage = null;
     _this.obliqueImageryLayer = null;
     _this.state = ObliqueView.defaultState;
+    _this.focusedMap = null;
     return _this;
   }
   _inherits(ObliqueView, _React$Component);
   return _createClass(ObliqueView, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      window.addEventListener('focus', this.trackFocus, true);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      window.removeEventListener('focus', this.trackFocus);
+    }
+  }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
       if (this.props.active && !prevProps.active) {
@@ -256,6 +299,13 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         var _this$map$getView2, _this$map$getView2$se;
         (_this$map$getView2 = this.map.getView()) === null || _this$map$getView2 === void 0 || (_this$map$getView2$se = _this$map$getView2.setZoom) === null || _this$map$getView2$se === void 0 || _this$map$getView2$se.call(_this$map$getView2, this.state.currentZoom);
       }
+      if (this.state.viewsLocked && this.state.datasetConfig) {
+        if (this.focusedMap === "map" && this.props.map.bbox !== prevProps.map.bbox) {
+          this.sync2DExtent();
+        } else if (this.focusedMap === "mapOblique" && (this.state.currentCenter !== prevState.currentCenter || this.state.currentZoom !== prevState.currentZoom)) {
+          this.props.zoomToExtent(this.map.getView().calculateExtent(), this.state.datasetConfig.crs);
+        }
+      }
     }
   }, {
     key: "render",
@@ -265,8 +315,25 @@ var ObliqueView = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       var rot = this.getRotation();
+      var extraControls = [{
+        icon: "sync",
+        callback: this.sync2DExtent,
+        title: LocaleUtils.tr("common.sync2dview")
+      }, {
+        icon: "lock",
+        callback: function callback() {
+          return _this2.setState(function (state) {
+            return {
+              viewsLocked: !state.viewsLocked
+            };
+          });
+        },
+        title: LocaleUtils.tr("common.lock2dview"),
+        active: this.state.viewsLocked
+      }];
       return /*#__PURE__*/React.createElement(ResizeableWindow, {
         dockable: this.props.geometry.side,
+        extraControls: extraControls,
         icon: "oblique",
         initialHeight: this.props.geometry.initialHeight,
         initialWidth: this.props.geometry.initialWidth,
@@ -371,13 +438,14 @@ _defineProperty(ObliqueView, "propTypes", {
   }),
   /** The initial map scale. */
   initialScale: PropTypes.number,
-  mapBbox: PropTypes.object,
+  map: PropTypes.object,
   projection: PropTypes.string,
   /** A list of allowed map scales, in decreasing order. */
   scales: PropTypes.arrayOf(PropTypes.number),
   setCurrentTask: PropTypes.func,
   theme: PropTypes.object,
-  themes: PropTypes.object
+  themes: PropTypes.object,
+  zoomToExtent: PropTypes.func
 });
 _defineProperty(ObliqueView, "defaultProps", {
   geometry: {
@@ -396,15 +464,18 @@ _defineProperty(ObliqueView, "defaultState", {
   selectedDataset: null,
   datasetConfig: null,
   currentDirection: null,
-  currentZoom: 0
+  currentZoom: 0,
+  currentCenter: null,
+  viewsLocked: false
 });
 export default connect(function (state) {
   return {
     active: state.task.id === "ObliqueView",
-    mapBbox: state.map.bbox,
+    map: state.map,
     theme: state.theme.current,
     themes: state.theme.themes
   };
 }, {
-  setCurrentTask: setCurrentTask
+  setCurrentTask: setCurrentTask,
+  zoomToExtent: zoomToExtent
 })(ObliqueView);

package/plugins/Print.js

@@ -255,7 +255,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
           key: item.name,
           value: item.name
         }, _this.translateLayoutName(item));
-      })))), _this.props.formats.length > 1 ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      })))), _this.props.formats.length > 1 ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.format")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         disabled: _this.state.printSeriesEnabled,
         name: "FORMAT",
         onChange: _this.formatChanged,
@@ -287,7 +287,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         disabled: true,
         placeholder: LocaleUtils.tr("print.pickatlasfeature", _this.state.layout.atlasCoverageLayer),
         type: "text"
-      }))) : null, isEmpty(_this.state.atlasFeatures) ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, resolutionChooser ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.resolution")), /*#__PURE__*/React.createElement("td", null, resolutionChooser)) : null, _this.props.displayRotation ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.rotation")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(NumberInput, {
+      }))) : null, isEmpty(_this.state.atlasFeatures) ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.scale")), /*#__PURE__*/React.createElement("td", null, scaleChooser)) : null, resolutionChooser ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.resolution")), /*#__PURE__*/React.createElement("td", null, resolutionChooser)) : null, _this.props.displayRotation ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.rotation")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(InputContainer, null, /*#__PURE__*/React.createElement(NumberInput, {
         decimals: 1,
         mobile: true,
         name: mapName + ":rotation",
@@ -338,7 +338,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         value: _this.state.printSeriesOverlap
       }), /*#__PURE__*/React.createElement("span", {
         role: "suffix"
-      }, _this.state.printSeriesOverlap, "\xA0%")))) : null, !_this.props.inlinePrintOutput && _this.state.printSeriesEnabled ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("print.download")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
+      }, _this.state.printSeriesOverlap, "\xA0%")))) : null, !_this.props.inlinePrintOutput && _this.state.printSeriesEnabled ? /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, LocaleUtils.tr("common.download")), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("select", {
         onChange: _this.changeDownloadMode,
         role: "input",
         value: _this.state.downloadMode || ""
@@ -426,7 +426,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         type: "submit"
       }, _this.state.printing ? /*#__PURE__*/React.createElement("span", {
         className: "print-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("print.wait")) : LocaleUtils.tr("print.submit")))));
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("common.wait")) : LocaleUtils.tr("print.submit")))));
     });
     _defineProperty(_this, "renderPrintLabelField", function (label, opts) {
       var defaultValue = opts.defaultValue || "";
@@ -562,7 +562,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_this, "renderPrintOutputWindow", function () {
       var extraControls = [{
         icon: 'save',
-        title: LocaleUtils.tr('print.save'),
+        title: LocaleUtils.tr('common.save'),
         callback: _this.savePrintOutput
       }];
       return /*#__PURE__*/React.createElement(ResizeableWindow, {
@@ -585,7 +585,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
         className: "print-output-window-body"
       }, !_this.state.outputLoaded ? /*#__PURE__*/React.createElement("span", {
         className: "print-output-window-wait"
-      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("print.wait")) : null, /*#__PURE__*/React.createElement("iframe", {
+      }, /*#__PURE__*/React.createElement(Spinner, null), " ", LocaleUtils.tr("common.wait")) : null, /*#__PURE__*/React.createElement("iframe", {
         name: "print-output-window",
         src: _this.state.pdfDataUrl
       })));
@@ -844,7 +844,7 @@ var Print = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this3 = this;
-      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("print.maximize") : LocaleUtils.tr("print.minimize");
+      var minMaxTooltip = this.state.minimized ? LocaleUtils.tr("window.maximize") : LocaleUtils.tr("window.minimize");
       var extraTitlebarContent = /*#__PURE__*/React.createElement(Icon, {
         className: "print-minimize-maximize",
         icon: this.state.minimized ? 'chevron-down' : 'chevron-up',