From 2524730217e6972f3d0f04a9954350ba1964a83a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 2 Sep 2019 15:20:14 -0500 Subject: altosui: Add speed and gps height to map display data And generalize the API so that any other GPS data could be added in the future. This feature was proposed by Mike Beattie Signed-off-by: Keith Packard --- altoslib/AltosMapPathPoint.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'altoslib/AltosMapPathPoint.java') diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java index c23d8567..88a8bfcf 100644 --- a/altoslib/AltosMapPathPoint.java +++ b/altoslib/AltosMapPathPoint.java @@ -24,12 +24,13 @@ import java.util.*; import java.util.concurrent.*; public class AltosMapPathPoint { - public AltosLatLon lat_lon; + public AltosGPS gps; public double time; public int state; + public double gps_height; public int hashCode() { - return lat_lon.hashCode() ^ state; + return Double.valueOf(gps.lat).hashCode() ^ Double.valueOf(gps.lon).hashCode() ^ state; } public boolean equals(Object o) { @@ -41,13 +42,14 @@ public class AltosMapPathPoint { AltosMapPathPoint other = (AltosMapPathPoint) o; - return lat_lon.equals(other.lat_lon) && state == other.state; + return gps.lat == other.gps.lat && gps.lon == other.gps.lon && state == other.state; } - public AltosMapPathPoint(AltosLatLon lat_lon, double time, int state) { - this.lat_lon = lat_lon; + public AltosMapPathPoint(AltosGPS gps, double time, int state, double gps_height) { + this.gps = gps; this.time = time; this.state = state; + this.gps_height = gps_height; } } -- cgit v1.2.3