X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLatLon.java;h=6fcc43feabd591513a466c260be4a9fe040c7f44;hp=f1ecfc9002b49ce28c811716bd042c3b9e39388c;hb=9537a21b6ddb73b9f086858dad9a7b9d05279741;hpb=29edc37a8de56cb6eb028e3bf3f56aa70f109eba diff --git a/altoslib/AltosLatLon.java b/altoslib/AltosLatLon.java index f1ecfc90..6fcc43fe 100644 --- a/altoslib/AltosLatLon.java +++ b/altoslib/AltosLatLon.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,18 +16,30 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_6; +package org.altusmetrum.altoslib_12; public class AltosLatLon { public double lat; public double lon; - public boolean equals(AltosLatLon other) { - if (other == null) + public int hashCode() { + return new Double(lat).hashCode() ^ new Double(lon).hashCode(); + } + + public boolean equals(Object o) { + if (o == null) + return false; + if (!(o instanceof AltosLatLon)) return false; + + AltosLatLon other = (AltosLatLon) o; return lat == other.lat && lon == other.lon; } + public String toString() { + return String.format("%f/%f", lat, lon); + } + public AltosLatLon(double lat, double lon) { this.lat = lat; this.lon = lon;