commit | 4a1b5531dc598069c130c5dce835a79cd4575823 | [log] [tgz] |
---|---|---|
author | Steven Burrows <sburrows@villa-technologies.com> | Fri Apr 28 11:08:07 2017 -0400 |
committer | Simon Hunt <simon@onlab.us> | Fri Apr 28 16:15:14 2017 +0000 |
tree | 54cbc21614c6435c4b90577f7e0cd0b5a53cd2d0 | |
parent | 2b15ae776c14c7dc9c4e84f311a574c0bfa17fe4 [diff] [blame] |
Topo2: Place peer regions in their configured locations JIRA Tasks; ONOS-6257 Change-Id: Ifd6133c1c9ac7f4f7ea5dee54fd38f1ea3382c8b
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js index 86d1faa..1d71212 100644 --- a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js +++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
@@ -57,7 +57,18 @@ loc = {}; if (t2bgs.getBackgroundType() === 'geo') { + + var loc = node.get('location'), + type = loc.locType || loc.type; + + node.set({ location: { + type: type.toLowerCase(), + lat: loc.latOrY || loc.lat, + lng: loc.longOrX || loc.lng + }}); + setLongLat(node); + return true; } else { loc.gridX = -20;