X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosMapPathPoint.java;h=88a8bfcf28db86706154f397688f647a4845127b;hb=0072e9741719367a1f6748d242cd6195a1a7c6a5;hp=5182ecfd6b21da1233bd337049a29c5212932ced;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index 5182ecfd..88a8bfcf 100644
--- a/altoslib/AltosMapPathPoint.java
+++ b/altoslib/AltosMapPathPoint.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.lang.Math;
@@ -24,11 +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) {
@@ -40,12 +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, 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;
 	}
 }