Changeset 6165 in josm

Timestamp:

2013-08-21T01:32:39+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8987 - Move distanceSq() from EastNorth to Coordinate to fix broken plugins (comes from old Point2D)

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• Coordinate.java (modified) (2 diffs)
• EastNorth.java (modified) (1 diff)

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

@@ -14 +14 @@
  * EastNorth.
  *
- * @author imi
+ * @since 6162
  */
 abstract class Coordinate implements Serializable {
@@ -37 +37 @@
     public double getY() {
         return y;
+    }
+
+    /**
+     * Returns the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}.
+     * 
+     * @param coor the specified coordinate to be measured against this {@code Coordinate}
+     * @return the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}
+     */
+    public double distanceSq(final Coordinate coor) {
+        final double dx = this.x-coor.x;
+        final double dy = this.y-coor.y;
+        return dx*dx + dy*dy;
     }
 

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

@@ -54 +54 @@
         final double dy = this.y-en2.y;
         return Math.sqrt(dx*dx + dy*dy);
-    }
-
-    /**
-     * Counts square of euclidean distance between this and other EastNorth.
-     * 
-     * @param en2 other EastNorth
-     * @return square of distance between this and other EastNorth
-     */
-    public double distanceSq(final EastNorth en2) {
-        final double dx = this.x-en2.x;
-        final double dy = this.y-en2.y;
-        return dx*dx + dy*dy;
     }