Mercurial > gemma

changeset 1052:e3f3e645792b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 25 Oct 2018 11:31:59 +0200
parents 137a8144e581 (current diff) e3df77b8074f (diff)
children 82ae9cb56982 1ff8c072df18
files
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/application/Topbar.vue	Thu Oct 25 11:31:37 2018 +0200
+++ b/client/src/application/Topbar.vue	Thu Oct 25 11:31:59 2018 +0200
@@ -212,9 +212,14 @@
       // DEBUG console.log("Moving to", resultEntry);
       if (resultEntry.geom.type == "Point") {
         let view = this.openLayersMap.getView();
+        const currentZoom = view.getZoom();
+        const newZoom =
+          resultEntry.type === "bottleneck"
+            ? Math.max(17, currentZoom)
+            : Math.max(15, currentZoom);
         view.animate(
           {
-            zoom: resultEntry.type === "bottleneck" ? 17 : 15,
+            zoom: newZoom,
             center: fromLonLat(
               resultEntry.geom.coordinates,
               view.getProjection()
--- a/client/src/linetool/Linetool.vue	Thu Oct 25 11:31:37 2018 +0200
+++ b/client/src/linetool/Linetool.vue	Thu Oct 25 11:31:59 2018 +0200
@@ -58,8 +58,8 @@
         fa: true,
         "fa-pencil": !this.selectedMorph,
         "fa-pencil inverted": !this.selectedMorph && this.drawMode,
-        "fa-cut": this.selectedMorph,
-        "fa-cut inverted": this.selectedMorph && this.drawMode
+        "fa-area-chart": this.selectedMorph,
+        "fa-area-chart inverted": this.selectedMorph && this.drawMode
       };
     }
   }