Topo2: Reset zoom shortcut is now handled by the Background Service
Change-Id: I8f343bea7bb20863d78dd7b24d80f4319c7534ec
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 c90b06d..9c5eb81 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
@@ -28,8 +28,8 @@
angular.module('ovTopo2')
.factory('Topo2BackgroundService', [
'$log', 'Topo2ViewController', 'Topo2SpriteLayerService', 'Topo2MapService',
- 'Topo2MapConfigService',
- function (_$log_, ViewController, t2sls, t2ms, t2mcs) {
+ 'Topo2MapConfigService', 'Topo2ZoomService',
+ function (_$log_, ViewController, t2sls, t2ms, t2mcs, t2zs) {
$log = _$log_;
@@ -84,6 +84,9 @@
},
getBackgroundType: function () {
return this.bgType;
+ },
+ resetZoom: function () {
+ t2zs.getZoomer().reset();
}
});
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
index 544dca2..b89ea09 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
@@ -22,7 +22,6 @@
// Commmands
var actionMap = {
L: [cycleDeviceLabels, 'Cycle device labels'],
- G: [openMapSelection, 'Select background geo map'],
B: [toggleBackground, 'Toggle background'],
I: [toggleInstancePanel, 'Toggle ONOS Instance Panel'],
O: [toggleSummary, 'Toggle the Summary Panel'],
@@ -98,10 +97,6 @@
flash.flash(deviceLabelFlashMessage(newDeviceLabelIndex));
}
- function openMapSelection() {
- t2ms.openMapSelection();
- }
-
function toggleBackground(x) {
t2bgs.toggle(x);
}
@@ -115,7 +110,7 @@
}
function resetZoom() {
- t2ms.resetZoom();
+ t2bgs.resetZoom();
flash.flash('Pan and zoom reset');
}