commit 448468c39fd18736f87b1810a8821d4fa8df5625
author Steven Burrows <sburrows@villa-technologies.com> Thu Apr 13 16:09:30 2017 -0700
committer Simon Hunt <simon@onlab.us> Fri Apr 14 16:25:04 2017 +0000
tree 65a8d05131a67ec29bb67bb5d657061e6f1e9aa9
parent 07b90201990d2d38d740bcc6f7d6c71f1f7c1a85

Topo2 - Removed old code carried over from clasic topo
	- Removed Map Dialog and Filters

Change-Id: Id8d2791b7e13b0eedf7de1ed484edc7678e2bb77

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

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 c4b7912..002ca69 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
@@ -25,9 +25,6 @@
     // Injected Services
     var $log, $loc, ps, ms, flash, sus, t2zs, countryFilters;
 
-    // Injected Classes
-    var MapSelectionDialog;
-
     // internal state
     var instance, mapG, zoomLayer, zoomer, currentMap;
 
@@ -67,24 +64,6 @@
         return promise;
     }
 
-    // TODO: deprecated - maps are defined per layout on the server side.
-    function setMap(map) {
-        ps.setPrefs('topo2_mapid', map);
-        return setUpMap.bind(this)();
-    }
-
-    // TODO: deprecated - map selection does not make sense in Topo2
-    function openMapSelection() {
-        $log.warn('openMapSelection DISABLED');
-
-        // MapSelectionDialog.prototype.currentMap = currentMap;
-        //
-        // new MapSelectionDialog({
-        //     okHandler: function (preferences) {
-        //         setMap(preferences);
-        //     }
-        // }).open();
-    }
 
     function resetZoom() {
         zoomer.reset();
@@ -102,12 +81,10 @@
     angular.module('ovTopo2')
     .factory('Topo2MapService', [
         '$log', '$location', 'Topo2ViewController', 'PrefsService',
-        'MapService', 'FlashService', 'SvgUtilService', 'Topo2CountryFilters',
-        'Topo2MapDialog', 'Topo2ZoomService',
+        'MapService', 'FlashService', 'SvgUtilService', 'Topo2ZoomService',
 
         function (_$log_, _$loc_, ViewController, _ps_,
-                  _ms_, _flash_, _sus_, _t2cf_,
-                  _t2md_, _t2zs_) {
+                  _ms_, _flash_, _sus_, _t2zs_) {
 
             $log = _$log_;
             $loc = _$loc_;
@@ -115,8 +92,6 @@
             ms = _ms_;
             flash = _flash_;
             sus = _sus_;
-            countryFilters = _t2cf_;
-            MapSelectionDialog = _t2md_;
             t2zs = _t2zs_;
 
             var MapLayer = ViewController.extend({
@@ -125,9 +100,7 @@
                 displayName: 'Map',
 
                 init: init,
-                setMap: setMap,
                 setUpMap: setUpMap,
-                openMapSelection: openMapSelection,
                 resetZoom: resetZoom,
                 zoomCallback: zoomCallback,
                 getCurrentMap: getCurrentMap