Topo2: Fixed a map scaling errors causing nodes to appera like they were incorrectly positioned
Change-Id: I2317526f5be3fe1d60fd244b1c00e9d13cdcb00e
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 525cd07..8f2e3e4 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
@@ -79,7 +79,7 @@
t2sls.hide();
t2ms.show();
- t2ms.setUpMap(data.bgId, data.bgFilePath, scale)
+ t2ms.setUpMap(data.bgId, data.bgFilePath)
.then(function (proj) {
t2mcs.projection(proj);
$log.debug('** We installed the projection:', proj);
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
index 0f559fa..0c8f73e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
@@ -52,7 +52,7 @@
promise = loadMap(this.node(), mapFilePath, mapId, {
countryFilters: cfilter,
- adjustScale: mapScale,
+ adjustScale: mapScale || 1,
shading: ''
});
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js b/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
index d52154c..c37c92b 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
@@ -72,8 +72,8 @@
return zoomer.scale();
}
- function panAndZoom(translate, scale) {
- zoomer.panZoom(translate, scale, 1000);
+ function panAndZoom(translate, scale, transition) {
+ zoomer.panZoom(translate, scale, transition);
}
angular.module('ovTopo2')