ONOS-2470: Implement "Reset Node Locations" function in topology view.
- also cleaned up some Long/Lat code.
- Note also that metadata from client is structured so 'lng/lat' properties
(from repositioned node) are wrapped in 'equivLoc' object.
Change-Id: I5afc53d26ef56fc0932f8650e8f7df79b36c3947
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 49d5155..b700a54 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
@@ -357,18 +357,24 @@
return;
}
- String slat = annotations.value(AnnotationKeys.LATITUDE);
String slng = annotations.value(AnnotationKeys.LONGITUDE);
+ String slat = annotations.value(AnnotationKeys.LATITUDE);
+ boolean haveLng = slng != null && !slng.isEmpty();
+ boolean haveLat = slat != null && !slat.isEmpty();
try {
- if (slat != null && slng != null && !slat.isEmpty() && !slng.isEmpty()) {
- double lat = Double.parseDouble(slat);
+ if (haveLng && haveLat) {
double lng = Double.parseDouble(slng);
+ double lat = Double.parseDouble(slat);
ObjectNode loc = objectNode()
- .put("type", "latlng").put("lat", lat).put("lng", lng);
+ .put("type", "lnglat")
+ .put("lng", lng)
+ .put("lat", lat);
payload.set("location", loc);
+ } else {
+ log.trace("missing Lng/Lat: lng={}, lat={}", slng, slat);
}
} catch (NumberFormatException e) {
- log.warn("Invalid geo data latitude={}; longiture={}", slat, slng);
+ log.warn("Invalid geo data: longitude={}, latitude={}", slng, slat);
}
}