ONOS-6259: Topo2 - Implement server-side highlighting model (WIP)
- added locType parameter to region-add command
- created RegionABC sample topology
- fixed possible NPE in Topo2Jsonifier.jsonClosedRegion()
- added "plain" sprite layout
- check for undefined sprite layout and log a warning
- updated logger.sh script
- fixed Topo2Model to have a reference to colleciton before initialization
Change-Id: Ie6af28516338f5d64576bf465373cb5df3dff52c
diff --git a/tools/test/topos/regions-europe.sh b/tools/test/topos/regions-europe.sh
index 58f2944..44e64fc 100755
--- a/tools/test/topos/regions-europe.sh
+++ b/tools/test/topos/regions-europe.sh
@@ -28,17 +28,18 @@
### Start by adding Country regions
# Note that Long/Lat places region icon nicely in the country center
-# region-add <region-id> <region-name> <region-type> <lat/Y> <long/X> <region-master>
+# region-add <region-id> <region-name> <region-type> \
+# <lat/Y> <long/X> <locType> <region-master>
onos ${host} <<-EOF
-region-add rUK "United Kingdom" COUNTRY 52.206035 -1.310384 ${host}
-region-add rIT "Italy" COUNTRY 44.447951 11.093161 ${host}
-region-add rFR "France" COUNTRY 47.066264 2.711458 ${host}
-region-add rDE "Germany" COUNTRY 50.863152 9.761971 ${host}
-region-add rES "Spain" COUNTRY 40.416704 -3.7035824 ${host}
+region-add rUK "United Kingdom" COUNTRY 52.206035 -1.310384 geo ${host}
+region-add rIT "Italy" COUNTRY 44.447951 11.093161 geo ${host}
+region-add rFR "France" COUNTRY 47.066264 2.711458 geo ${host}
+region-add rDE "Germany" COUNTRY 50.863152 9.761971 geo ${host}
+region-add rES "Spain" COUNTRY 40.416704 -3.7035824 geo ${host}
-region-add rMilan "Milan" METRO 45.4654 9.1859 ${host}
+region-add rMilan "Milan" METRO 45.4654 9.1859 geo ${host}
EOF