Bump java lib versions in preparation for 1.9.2

[fw/altos] / altoslib / AltosMapPathPoint.java

diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index 757211af5964b239bb45047c7aaa90210fa16a1f..3c28ae12ed51845bbce3248f1a715cdb4fd47db8 100644 (file)
--- a/altoslib/AltosMapPathPoint.java
+++ b/altoslib/AltosMapPathPoint.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.lang.Math;
@@ -23,19 +24,32 @@ 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 boolean equals(AltosMapPathPoint other) {
-               if (other == null)
+       public int hashCode() {
+               return Double.valueOf(gps.lat).hashCode() ^ Double.valueOf(gps.lon).hashCode() ^ state;
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
                        return false;
 
-               return lat_lon.equals(other.lat_lon) && state == other.state;
+               if (!(o instanceof AltosMapPathPoint))
+                       return false;
+
+               AltosMapPathPoint other = (AltosMapPathPoint) o;
+
+               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;
        }
 }