Changeset 2457 in josm

Timestamp:

2009-11-15T11:43:04+01:00 (14 years ago)

Author:

Gubaer

Message:

Added hashCode() and equals() on LatLon

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -28 +28 @@
      * Replies true if lat is in the range [-90,90]
      * 
-     * @param lat the latitude 
+     * @param lat the latitude
      * @return true if lat is in the range [-90,90]
      */
@@ -38 +38 @@
      * Replies true if lon is in the range [-180,180]
      * 
-     * @param lon the longitude 
+     * @param lon the longitude
      * @return true if lon is in the range [-180,180]
      */
@@ -44 +44 @@
         return lon >= -180d && lon <= 180d;
     }
-    
+
     public static String dms(double pCoordinate) {
 
@@ -73 +73 @@
         case DECIMAL_DEGREES: return cDdFormatter.format(y);
         case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ?
-            /* short symbol for South */ tr("S") :
-            /* short symbol for North */ tr("N"));
+                /* short symbol for South */ tr("S") :
+                    /* short symbol for North */ tr("N"));
         default: return "ERR";
         }
@@ -87 +87 @@
         case DECIMAL_DEGREES: return cDdFormatter.format(x);
         case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ?
-            /* short symbol for West */ tr("W") :
-            /* short symbol for East */ tr("E"));
+                /* short symbol for West */ tr("W") :
+                    /* short symbol for East */ tr("E"));
         default: return "ERR";
         }
@@ -179 +179 @@
         return "LatLon[lat="+lat()+",lon="+lon()+"]";
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        long temp;
+        temp = java.lang.Double.doubleToLongBits(x);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        temp = java.lang.Double.doubleToLongBits(y);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Coordinate other = (Coordinate) obj;
+        if (java.lang.Double.doubleToLongBits(x) != java.lang.Double.doubleToLongBits(other.x))
+            return false;
+        if (java.lang.Double.doubleToLongBits(y) != java.lang.Double.doubleToLongBits(other.y))
+            return false;
+        return true;
+    }
 }