commit e9e457137c25b6c45ee549c3cff2eee6f44ce20d
author Steven Burrows <sburrows@villa-technologies.com> Fri Mar 24 12:39:14 2017 +0000
committer Steven Burrows <sburrows@villa-technologies.com> Sat Mar 25 02:15:34 2017 +0000
tree 5b59cd227afbf1afbddb5e0f794db4842d987484
parent 7d1efef73b1d5c8514ce21c49854620d740485f4

Topo2: Reset Pan and zoom to user defined or configured location

Change-Id: Ic11d400f4f0b8c68e89fe14bb66f19a8065e66fc

web/gui/src/main/webapp/app/view/topo2/topo2Background.js

diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
index 8f2e3e4..f83d921 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
@@ -25,21 +25,21 @@
 
     var instance;
 
-    function getZoom(z) {
+    function getZoom(z, useCfg) {
         var u = z.usr,
             c = z.cfg;
-        return (u && !u.useCfg) ? u : c;
+        return (u && !u.useCfg && !useCfg) ? u : c;
     }
 
     // returns the pan (offset) values as an array [x, y]
-    function zoomPan(z) {
-        var zoom = getZoom(z);
+    function zoomPan(z, useCfg) {
+        var zoom = getZoom(z, useCfg);
         return [zoom.offsetX, zoom.offsetY];
     }
 
     // returns the scale value
-    function zoomScale(z) {
-        var zoom = getZoom(z);
+    function zoomScale(z, useCfg) {
+        var zoom = getZoom(z, useCfg);
         return zoom.scale;
     }
 
@@ -109,7 +109,8 @@
                         return this.bgType;
                     },
                     resetZoom: function () {
-                        t2zs.getZoomer().reset();
+                        var pan = zoomPan(this.zoomData, true);
+                        t2zs.panAndZoom(pan, zoomScale(this.zoomData, true), 1000);
                     }
                 });