GUI -- Further work on MapService and GeoDataService. Still WIP.
Change-Id: I92e826cc15cc1a07238cc4b4eac20583260a3c84
diff --git a/web/gui/src/main/webapp/app/view/topo/topo.js b/web/gui/src/main/webapp/app/view/topo/topo.js
index cca389c..a5bec59 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -32,7 +32,7 @@
var $log, ks, zs, gs, ms;
// DOM elements
- var svg, defs;
+ var svg, defs, zoomLayer, map;
// Internal state
var zoomer;
@@ -91,7 +91,7 @@
}
function setUpZoom() {
- var zoomLayer = svg.append('g').attr('id', 'topo-zoomlayer');
+ zoomLayer = svg.append('g').attr('id', 'topo-zoomlayer');
zoomer = zs.createZoomer({
svg: svg,
zoomLayer: zoomLayer,
@@ -101,6 +101,13 @@
}
+ // --- Background Map ------------------------------------------------
+
+ function setUpMap() {
+ map = zoomLayer.append('g').attr('id', '#topo-map');
+ ms.loadMapInto(map, '*continental_us');
+ }
+
// --- Controller Definition -----------------------------------------
angular.module('ovTopo', moduleDependencies)
@@ -124,6 +131,7 @@
setUpKeys();
setUpDefs();
setUpZoom();
+ setUpMap();
$log.log('OvTopoCtrl has been created');
}]);