Topo2: Cleaned the European map
- Updated the demo
Change-Id: Ifd70f9ebb796390fbea5b0ce42a1729e550965e0
diff --git a/tools/test/topos/regions-europe.sh b/tools/test/topos/regions-europe.sh
index a0fcfbd..8f4790a 100755
--- a/tools/test/topos/regions-europe.sh
+++ b/tools/test/topos/regions-europe.sh
@@ -52,14 +52,14 @@
onos ${host} <<-EOF
# -- root layout
-layout-add root @europe . . 6.664 -2992.552 -2473.084
+layout-add root @europe . . 4.66 -2562.93 -412.56
# -- layouts for top level regions
-layout-add lUK @europe rUK root 31.43 -14979.6 -12644.8
-layout-add lIT @europe rIT root 14.72 -7793.2 -6623.8
-layout-add lFR @europe rFR root 16.91 -8225.7 -7198.1
-layout-add lDE @europe rDE root 17.63 -9119.6 -7044.9
-layout-add lES @europe rES root 21.41 -9994.5 -10135.6
+layout-add lUK @europe rUK root 11.63 -6652.54 -938.04
+layout-add lIT @europe rIT root 7.15 -4818.73 -1330.36
+layout-add lFR @europe rFR root 8.98 -5378.99 -1334.77
+layout-add lDE @europe rDE root 10.06 -6739.05 -1002.4
+layout-add lES @europe rES root 10.34 -5804.84 -2464.81
# -- layouts for country sub-regions
layout-add lMilan +segmentRoutingTwo rMilan lIT 0.86 68.58 54.71
diff --git a/web/gui/src/main/webapp/data/map/europe.topojson b/web/gui/src/main/webapp/data/map/europe.topojson
index 276502f..a2f01cb 100644
--- a/web/gui/src/main/webapp/data/map/europe.topojson
+++ b/web/gui/src/main/webapp/data/map/europe.topojson
@@ -327,45 +327,6 @@
},
"arcs": [
[
- [154]
- ],
- [
- [155]
- ],
- [
- [156]
- ],
- [
- [157]
- ],
- [
- [158]
- ],
- [
- [159]
- ],
- [
- [160]
- ],
- [
- [161]
- ],
- [
- [162]
- ],
- [
- [163]
- ],
- [
- [164]
- ],
- [
- [165]
- ],
- [
- [166]
- ],
- [
[167, -85, -64, 168, -62, 169, 170, 171, 172, -120, -24, -119, 173, -37],
[-118]
]
@@ -962,7 +923,8 @@
[351]
]
]
- }, {
+ },
+ {
"type": "MultiPolygon",
"properties": {
"name": "Norway"
@@ -1210,51 +1172,6 @@
],
[
[432, -154, 433, 434]
- ],
- [
- [435]
- ],
- [
- [436]
- ],
- [
- [437]
- ],
- [
- [438]
- ],
- [
- [439]
- ],
- [
- [440]
- ],
- [
- [441]
- ],
- [
- [442]
- ],
- [
- [443]
- ],
- [
- [444]
- ],
- [
- [445]
- ],
- [
- [446]
- ],
- [
- [447]
- ],
- [
- [448]
- ],
- [
- [449]
]
]
}, {
@@ -1316,515 +1233,8 @@
"arcs": [
[469, 470, -46, 471, -296, 472, -330]
]
- }, {
- "type": "MultiPolygon",
- "properties": {
- "name": "Russia"
- },
- "arcs": [
- [
- [473]
- ],
- [
- [474]
- ],
- [
- [475]
- ],
- [
- [476]
- ],
- [
- [477]
- ],
- [
- [478]
- ],
- [
- [479]
- ],
- [
- [480]
- ],
- [
- [481]
- ],
- [
- [482]
- ],
- [
- [483]
- ],
- [
- [484]
- ],
- [
- [485]
- ],
- [
- [486]
- ],
- [
- [487]
- ],
- [
- [488]
- ],
- [
- [489]
- ],
- [
- [490]
- ],
- [
- [491]
- ],
- [
- [492]
- ],
- [
- [493]
- ],
- [
- [494]
- ],
- [
- [495]
- ],
- [
- [496]
- ],
- [
- [497]
- ],
- [
- [498]
- ],
- [
- [-453, 499, -451, 500, -321, 501, -324]
- ],
- [
- [502]
- ],
- [
- [503]
- ],
- [
- [504]
- ],
- [
- [505, -132]
- ],
- [
- [506]
- ],
- [
- [507]
- ],
- [
- [508]
- ],
- [
- [509]
- ],
- [
- [510]
- ],
- [
- [511]
- ],
- [
- [512]
- ],
- [
- [513]
- ],
- [
- [514]
- ],
- [
- [515]
- ],
- [
- [516]
- ],
- [
- [517]
- ],
- [
- [518]
- ],
- [
- [519]
- ],
- [
- [520]
- ],
- [
- [521]
- ],
- [
- [522]
- ],
- [
- [523]
- ],
- [
- [524]
- ],
- [
- [525]
- ],
- [
- [526]
- ],
- [
- [527]
- ],
- [
- [528]
- ],
- [
- [529]
- ],
- [
- [530]
- ],
- [
- [531]
- ],
- [
- [532]
- ],
- [
- [533]
- ],
- [
- [534]
- ],
- [
- [535]
- ],
- [
- [536]
- ],
- [
- [537]
- ],
- [
- [538]
- ],
- [
- [539]
- ],
- [
- [540]
- ],
- [
- [541]
- ],
- [
- [542]
- ],
- [
- [543]
- ],
- [
- [544]
- ],
- [
- [545]
- ],
- [
- [546]
- ],
- [
- [547]
- ],
- [
- [548]
- ],
- [
- [549]
- ],
- [
- [550]
- ],
- [
- [551]
- ],
- [
- [552]
- ],
- [
- [553]
- ],
- [
- [554]
- ],
- [
- [555]
- ],
- [
- [556]
- ],
- [
- [557]
- ],
- [
- [558]
- ],
- [
- [559]
- ],
- [
- [560]
- ],
- [
- [561]
- ],
- [
- [562]
- ],
- [
- [563]
- ],
- [
- [564]
- ],
- [
- [565]
- ],
- [
- [566]
- ],
- [
- [567]
- ],
- [
- [568]
- ],
- [
- [569]
- ],
- [
- [570]
- ],
- [
- [571]
- ],
- [
- [572]
- ],
- [
- [573]
- ],
- [
- [574]
- ],
- [
- [575]
- ],
- [
- [576]
- ],
- [
- [577]
- ],
- [
- [578]
- ],
- [
- [579]
- ],
- [
- [580]
- ],
- [
- [581]
- ],
- [
- [582]
- ],
- [
- [583]
- ],
- [
- [584]
- ],
- [
- [585]
- ],
- [
- [586]
- ],
- [
- [587]
- ],
- [
- [588]
- ],
- [
- [589]
- ],
- [
- [590]
- ],
- [
- [591]
- ],
- [
- [592]
- ],
- [
- [593]
- ],
- [
- [594]
- ],
- [
- [595]
- ],
- [
- [596, -52, -327, -136, 597, -134, 598, -130, 599, -151, -433, 600]
- ],
- [
- [601]
- ],
- [
- [602]
- ],
- [
- [603]
- ],
- [
- [604]
- ],
- [
- [605]
- ],
- [
- [606]
- ],
- [
- [607]
- ],
- [
- [608]
- ],
- [
- [609]
- ],
- [
- [610]
- ],
- [
- [611]
- ],
- [
- [612]
- ],
- [
- [613]
- ],
- [
- [614]
- ],
- [
- [615]
- ],
- [
- [616]
- ],
- [
- [617]
- ],
- [
- [618]
- ],
- [
- [619]
- ],
- [
- [620]
- ],
- [
- [621]
- ],
- [
- [622]
- ],
- [
- [623]
- ],
- [
- [624]
- ],
- [
- [625]
- ],
- [
- [626]
- ],
- [
- [627]
- ],
- [
- [628]
- ],
- [
- [629]
- ],
- [
- [630]
- ],
- [
- [631]
- ],
- [
- [632]
- ],
- [
- [633]
- ],
- [
- [634]
- ],
- [
- [635]
- ],
- [
- [636]
- ],
- [
- [637]
- ],
- [
- [638]
- ],
- [
- [639]
- ],
- [
- [640]
- ],
- [
- [641]
- ],
- [
- [642]
- ],
- [
- [643]
- ],
- [
- [644]
- ],
- [
- [645]
- ]
- ]
- }, {
+ },
+ {
"type": "Polygon",
"properties": {
"name": "San Marino"
diff --git a/web/gui/src/main/webapp/index.html b/web/gui/src/main/webapp/index.html
index 5a903af..b73dcb2 100644
--- a/web/gui/src/main/webapp/index.html
+++ b/web/gui/src/main/webapp/index.html
@@ -97,7 +97,6 @@
<script src="app/fw/layer/loading.js"></script>
<!-- Framework and library stylesheets included here -->
-
<!-- TODO: use a single catenated-minified file here -->
<link rel="stylesheet" href="app/onos.css">
<link rel="stylesheet" href="app/onos-theme.css">
@@ -177,7 +176,6 @@
<link rel="stylesheet" href="app/view/topo2/topo2-theme.css">
-->
-
<!-- Builtin views javascript. -->
<script src="app/view/topo/topo.js"></script>
<script src="app/view/topo/topoD3.js"></script>