altosui: Add speed and gps height to map display data

[fw/altos] / altoslib / AltosMapPathPoint.java

diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index c23d8567bda162428833cdbdb6c4c3b2f81ea758..88a8bfcf28db86706154f397688f647a4845127b 100644 (file)
--- 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;
        }
 }