ONOS-6372: Topo2 - Refactor "location" data to be consistent
- consistently labeled fields "locType", "latOrY", "longOrX"
- simplified code in topo2NodePosition.js
Change-Id: I73e8daadcc3e6ca3ff45f7f60e7b372ccfd8b045
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
index 2f813d0..82fbfa9 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyResource.java
@@ -93,8 +93,8 @@
// TODO: add handling of gridY/gridX if locType is "grid" (not "geo")
try {
- annot.put("latitude", memento.get("lat").asDouble())
- .put("longitude", memento.get("lng").asDouble());
+ annot.put("latitude", memento.get("latOrY").asDouble())
+ .put("longitude", memento.get("longOrX").asDouble());
array.add(node);
} catch (Exception e) {
log.debug("Skipping geo entry");
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 24b1773..e3b4f76 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -319,21 +319,21 @@
return;
}
- String slng = annotations.value(AnnotationKeys.LONGITUDE);
String slat = annotations.value(AnnotationKeys.LATITUDE);
- boolean validLng = slng != null && !slng.equals(NO_GEO_VALUE);
+ String slng = annotations.value(AnnotationKeys.LONGITUDE);
boolean validLat = slat != null && !slat.equals(NO_GEO_VALUE);
+ boolean validLng = slng != null && !slng.equals(NO_GEO_VALUE);
if (validLat && validLng) {
try {
- double lng = Double.parseDouble(slng);
double lat = Double.parseDouble(slat);
+ double lng = Double.parseDouble(slng);
ObjectNode loc = objectNode()
- .put("type", "geo")
- .put("lng", lng)
- .put("lat", lat);
+ .put("locType", "geo")
+ .put("latOrY", lat)
+ .put("longOrX", lng);
payload.set("location", loc);
} catch (NumberFormatException e) {
- log.warn("Invalid geo data: longitude={}, latitude={}", slng, slat);
+ log.warn("Invalid geo data: latitude={}, longitude={}", slat, slng);
}
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
index 5c9b608..c7a223f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/Topo2Jsonifier.java
@@ -102,6 +102,10 @@
private static final String GEO = "geo";
private static final String GRID = "grid";
private static final String PEER_LOCATIONS = "peerLocations";
+ private static final String LOCATION = "location";
+ private static final String LOC_TYPE = "locType";
+ private static final String LAT_OR_Y = "latOrY";
+ private static final String LONG_OR_X = "longOrX";
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -478,29 +482,29 @@
}
private void addGeoGridLocation(ObjectNode node, Annotated a) {
- List<String> lngLat = getAnnotValues(a, LONGITUDE, LATITUDE);
- List<String> gridYX = getAnnotValues(a, GRID_Y, GRID_X);
+ List<String> latLongData = getAnnotValues(a, LATITUDE, LONGITUDE);
+ List<String> gridYXdata = getAnnotValues(a, GRID_Y, GRID_X);
- if (lngLat != null) {
- attachLocation(node, "geo", "lng", "lat", lngLat);
- } else if (gridYX != null) {
- attachLocation(node, "grid", "gridY", "gridX", gridYX);
+ if (latLongData != null) {
+ attachLocation(node, GEO, latLongData);
+ } else if (gridYXdata != null) {
+ attachLocation(node, GRID, gridYXdata);
}
}
private void attachLocation(ObjectNode node, String locType,
- String keyA, String keyB, List<String> values) {
+ List<String> values) {
try {
- double valA = Double.parseDouble(values.get(0));
- double valB = Double.parseDouble(values.get(1));
+ double latOrY = Double.parseDouble(values.get(0));
+ double longOrX = Double.parseDouble(values.get(1));
ObjectNode loc = objectNode()
- .put("type", locType)
- .put(keyA, valA)
- .put(keyB, valB);
- node.set("location", loc);
+ .put(LOC_TYPE, locType)
+ .put(LAT_OR_Y, latOrY)
+ .put(LONG_OR_X, longOrX);
+ node.set(LOCATION, loc);
} catch (NumberFormatException e) {
- log.warn("Invalid {} data: long/Y={}, lat/X={}",
+ log.warn("Invalid {} data: lat/Y={}, long/X={}",
locType, values.get(0), values.get(1));
}
}
@@ -513,9 +517,9 @@
ObjectNode o = objectNode();
for (LayoutLocation ll : locs) {
ObjectNode lnode = objectNode()
- .put("locType", ll.locType().toString())
- .put("latOrY", ll.latOrY())
- .put("longOrX", ll.longOrX());
+ .put(LOC_TYPE, ll.locType().toString())
+ .put(LAT_OR_Y, ll.latOrY())
+ .put(LONG_OR_X, ll.longOrX());
o.set(ll.id(), lnode);
}