projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions to 13
[fw/altos]
/
altoslib
/
AltosLatLon.java
diff --git
a/altoslib/AltosLatLon.java
b/altoslib/AltosLatLon.java
index f1ecfc9002b49ce28c811716bd042c3b9e39388c..cd7015e3cb363f93cad745a19251803a4afbc0f6 100644
(file)
--- 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
*
* 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
*
* 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.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
6
;
+package org.altusmetrum.altoslib_
13
;
public class AltosLatLon {
public double lat;
public double lon;
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;
return false;
+
+ AltosLatLon other = (AltosLatLon) o;
return lat == other.lat && lon == other.lon;
}
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;
public AltosLatLon(double lat, double lon) {
this.lat = lat;
this.lon = lon;