Zoom to bookmark extent

qgis · Feb 28, 2024 · 9a8e558 · 9a8e558
1 parent c7af7f5
commit 9a8e558
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 21 deletions.
diff --git a/plugins/Bookmark.jsx b/plugins/Bookmark.jsx
@@ -18,7 +18,9 @@ import Spinner from '../components/Spinner';
 import {createBookmark, getUserBookmarks, removeBookmark, updateBookmark} from '../utils/PermaLinkUtils';
 import './style/Bookmark.css';
 import isEmpty from 'lodash.isempty';
-
+import { zoomToPoint } from '../actions/map';
+import { resolveBookmark } from '../utils/PermaLinkUtils';
+import MapUtils from '../utils/MapUtils';
 
 /**
  * Allows managing user bookmarks.
@@ -29,10 +31,13 @@ import isEmpty from 'lodash.isempty';
  */
 class Bookmark extends React.Component {
     static propTypes = {
+        mapCrs: PropTypes.string,
+        mapScales: PropTypes.array,
         /** The side of the application on which to display the sidebar. */
         side: PropTypes.string,
         state: PropTypes.object,
-        task: PropTypes.string
+        task: PropTypes.string,
+        zoomToPoint: PropTypes.func
     };
     static defaultProps = {
         side: 'right'
@@ -49,6 +54,7 @@ class Bookmark extends React.Component {
     render() {
         const openTitle = LocaleUtils.tr("bookmark.open");
         const openTabTitle = LocaleUtils.tr("bookmark.openTab");
+        const zoomTitle = LocaleUtils.tr("bookmark.zoomToExtent");
         const username = ConfigUtils.getConfigProp("username");
         const placeholder = LocaleUtils.tr("bookmark.description");
         const addBookmarkTitle = LocaleUtils.tr("bookmark.add");
@@ -77,6 +83,9 @@ class Bookmark extends React.Component {
                                 <button className="button" disabled={!currentBookmark} onClick={() => this.open(currentBookmark.key, true)} title={openTabTitle}>
                                     <Icon icon="open_link" />
                                 </button>
+                                <button className="button" disabled={!currentBookmark} onClick={() => this.zoomToBookmarkExtent(currentBookmark.key)} title={zoomTitle}>
+                                    <Icon icon="zoom" />
+                                </button>
                             </span>
                             <span className="bookmark-actions-spacer" />
                             <span className="bookmark-actions-buttonbox">
@@ -118,6 +127,14 @@ class Bookmark extends React.Component {
             location.href = url;
         }
     };
+    zoomToBookmarkExtent = (bookmarkkey) => {
+        resolveBookmark(bookmarkkey, (params) => {
+            const scale = parseFloat(params.s);
+            const zoom = MapUtils.computeZoom(this.props.mapScales, scale);
+            const center = params.c.split(/[;,]/g).map(x => parseFloat(x));
+            this.props.zoomToPoint(center, zoom, this.props.mapCrs);
+        });
+    };
     toggleCurrentBookmark = (bookmark) => {
         if (this.state.currentBookmark === bookmark.key) {
             this.setState({currentBookmark: null, description: ""});
@@ -163,8 +180,12 @@ class Bookmark extends React.Component {
 }
 
 const selector = state => ({
+    mapCrs: state.map.projection,
+    mapScales: state.map.scales,
     task: state.task.id,
     state
 });
 
-export default connect(selector)(Bookmark);
+export default connect(selector, {
+    zoomToPoint: zoomToPoint
+})(Bookmark);
diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -83,7 +83,8 @@
       "remove": "Esborrar",
       "removefailed": "Error al eliminar",
       "savefailed": "Error al modificar",
-      "update": "Updatejar"
+      "update": "Updatejar",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordenades",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -83,7 +83,8 @@
       "remove": "Smazat",
       "removefailed": "Mazání záložky selhalo",
       "savefailed": "Ukládání záložky selhalo",
-      "update": "Upravit"
+      "update": "Upravit",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Souřadnice",

diff --git a/translations/de-CH.json b/translations/de-CH.json
@@ -83,7 +83,8 @@
       "remove": "Lesezeichen entfernen",
       "removefailed": "Lesezeichen konnte nicht entfernt werden",
       "savefailed": "Lesezeichen konnte nicht aktualisiert werden",
-      "update": "Lesezeichen aktualisieren"
+      "update": "Lesezeichen aktualisieren",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinaten",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -83,7 +83,8 @@
       "remove": "Lesezeichen entfernen",
       "removefailed": "Lesezeichen konnte nicht entfernt werden",
       "savefailed": "Lesezeichen konnte nicht aktualisiert werden",
-      "update": "Lesezeichen aktualisieren"
+      "update": "Lesezeichen aktualisieren",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinaten",

diff --git a/translations/en-US.json b/translations/en-US.json
@@ -83,7 +83,8 @@
       "remove": "Remove bookmark",
       "removefailed": "Failed to remove bookmark",
       "savefailed": "Failed to update bookmark",
-      "update": "Update bookmark"
+      "update": "Update bookmark",
+      "zoomToExtent": "Zoom to extent"
     },
     "bottombar": {
       "mousepos_label": "Coordinates",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -83,7 +83,8 @@
       "remove": "Eliminar",
       "removefailed": "Error al eliminar el marcador",
       "savefailed": "Error al actualizar el marcador",
-      "update": "Actualizar marcador"
+      "update": "Actualizar marcador",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordenadas",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -83,7 +83,8 @@
       "remove": "Poista kirjanmerkki",
       "removefailed": "",
       "savefailed": "",
-      "update": "Päivitä kirjanmerkki"
+      "update": "Päivitä kirjanmerkki",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinaatit",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -83,7 +83,8 @@
       "remove": "Supprimer le marque-page",
       "removefailed": "Echec de suppression du marque-page",
       "savefailed": "Echec d'enregistrement du marque-page",
-      "update": "Sauvegarder le marque-page"
+      "update": "Sauvegarder le marque-page",
+      "zoomToExtent": "Zommer sur l'étendue"
     },
     "bottombar": {
       "mousepos_label": "Coordonnées",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordináták",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -83,7 +83,8 @@
       "remove": "Rimuovi segnalibro",
       "removefailed": "Impossibile rimuovere il segnalibro",
       "savefailed": "Impossibile aggiornare il segnalibro",
-      "update": "Aggiorna segnalibro"
+      "update": "Aggiorna segnalibro",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordinate",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinater",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Współrzędne",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -83,7 +83,8 @@
       "remove": "Remover",
       "removefailed": "Falha ao remover",
       "savefailed": "Falha ao salvar",
-      "update": "Atualizar"
+      "update": "Atualizar",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordenadas",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -83,7 +83,8 @@
       "remove": "Remover",
       "removefailed": "Falha ao Remover",
       "savefailed": "Falha ao Guardar",
-      "update": "Atualizar"
+      "update": "Atualizar",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordenadas",

diff --git a/translations/ro-RO.json b/translations/ro-RO.json
@@ -83,7 +83,8 @@
       "remove": "Elimină semn de carte",
       "removefailed": "Semnul de carte nu a putut fi șters",
       "savefailed": "Semnul de carte nu a putut fi salvat",
-      "update": "Actualizează semnul de carte"
+      "update": "Actualizează semnul de carte",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Coordonate",

diff --git a/translations/ru-RU.json b/translations/ru-RU.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Координаты",

diff --git a/translations/sv-SE.json b/translations/sv-SE.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinater",

diff --git a/translations/tr-TR.json b/translations/tr-TR.json
@@ -83,7 +83,8 @@
       "remove": "",
       "removefailed": "",
       "savefailed": "",
-      "update": ""
+      "update": "",
+      "zoomToExtent": ""
     },
     "bottombar": {
       "mousepos_label": "Koordinatlar",

diff --git a/translations/tsconfig.json b/translations/tsconfig.json
@@ -95,6 +95,7 @@
     "bookmark.removefailed",
     "bookmark.savefailed",
     "bookmark.update",
+    "bookmark.zoomToExtent",
     "bottombar.mousepos_label",
     "bottombar.scale_label",
     "bottombar.terms_label",

diff --git a/utils/PermaLinkUtils.js b/utils/PermaLinkUtils.js
@@ -134,6 +134,17 @@ export function resolvePermaLink(initialParams, callback) {
     }
 }
 
+export function resolveBookmark(bookmarkKey, callback) {
+    axios.get(ConfigUtils.getConfigProp("permalinkServiceUrl").replace(/\/$/, '') + "/bookmarks/" + bookmarkKey)
+        .then(response => {
+            const data = response.data;
+            callback({...(data.query || {})}, (data.state || {}), !!data.query);
+        })
+        .catch(() => {
+            callback(bookmarkKey, {}, false);
+        });
+}
+
 export function getUserBookmarks(user, callback) {
     if (user) {
         axios.get(ConfigUtils.getConfigProp("permalinkServiceUrl").replace(/\/$/, '') + "/bookmarks/")