X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMapPathPoint.java;h=9a1edd421c62c0bba375f2b51b45023ab8c2c31e;hp=757211af5964b239bb45047c7aaa90210fa16a1f;hb=a8f4af38d7abbb1da922b5e4d84af218475f1752;hpb=00aca369c4070901e0400f291d5f269b5fb8015c diff --git a/altoslib/AltosMapPathPoint.java b/altoslib/AltosMapPathPoint.java index 757211af..9a1edd42 100644 --- 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_13; import java.io.*; import java.lang.Math; @@ -26,10 +27,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; }