Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosMapPathPoint.java

diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java
index 9f82f02acd42d5c3a49f0bda80213a99fdc50437..0af989978a0061e7d4356c91fa082e6f2d290d37 100644 (file)
--- a/altoslib/AltosMapPathPoint.java
+++ b/altoslib/AltosMapPathPoint.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 import java.lang.Math;
@@ -26,10 +26,19 @@ public class AltosMapPathPoint {
        public AltosLatLon      lat_lon;
        public int              state;
 
-       public boolean equals(AltosMapPathPoint other) {
-               if (other == null)
+       public int hashCode() {
+               return lat_lon.hashCode() ^ state;
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
                        return false;
 
+               if (!(o instanceof AltosMapPathPoint))
+                       return false;
+
+               AltosMapPathPoint other = (AltosMapPathPoint) o;
+
                return lat_lon.equals(other.lat_lon) && state == other.state;
        }