Changeset 1004 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

2008-09-22T03:53:47+02:00 (15 years ago)

Author:

framm

Message:

• display a confirmation request if user tries to delete data outside downloaded area (can be don't-show-again'd). Note this feature is not a hard measure but needs to be actively requested by the component making the deletion, so it is possible that plugins deleting data do not honour this. Also, this currently only affects deleting, not otherwise modifying stuff outside of the box.

File:

• trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.coor;
 
-import java.io.Serializable;
+import java.awt.geom.Point2D;
 
 /**
@@ -15 +15 @@
  * @author imi
  */ 
-abstract class Coordinate implements Serializable {
+abstract class Coordinate extends Point2D {
 
-        /**
-         * Either easting or latitude
-         */
-        final double x;
-        /**
-         * Either northing or longitude
-         */
-        final double y;
-
+    protected double x;
+    protected double y;
+    
         /**
          * Construct the point with latitude / longitude values.
-         * The x/y values are left uninitialized.
          * 
          * @param x X coordinate of the point.
@@ -34 +27 @@
          */
         Coordinate(double x, double y) {
-                this.x = x;
-                this.y = y;
+        this.x = x; this.y = y;
         }
+    
+    public double getX() {
+        return x;
+    }
+    
+    public double getY() {
+        return y; 
+    }
+    
+    public void setLocation (double x, double y) {
+        this.x = x; 
+        this.y = y;
+    }
 
-        /**
-         * Return the squared distance of the northing/easting values between 
-         * this and the argument.
-         * 
-         * This method does NOT compute a great circle distance between two 
-         * locations!
-         *
-         * @param other The other point to calculate the distance to.
-         * @return The square of the distance between this and the other point,
-         *              regarding to the x/y values.
-         */
-        public double distanceSq(Coordinate other) {
-                return (x-other.x)*(x-other.x)+(y-other.y)*(y-other.y);
-        }
-        
-        /** 
-         * Return the distance of the northing/easting values between this and
-         * the argument.
-         * 
-         * This method does NOT compute a great circle distance between two 
-         * locations!
-         * 
-         * @param other The other point to calculate the distance to.
-         * @return The square of the distance between this and the other point,
-         *              regarding to the x/y values.
-         */
-        public double distance(Coordinate other) {
-                return Math.sqrt(distanceSq(other));
-        }
-
-        @Override public boolean equals(Object obj) {
-                return obj instanceof Coordinate ? x == ((Coordinate)obj).x && ((Coordinate)obj).y == y : false;
-        }
-
-        @Override public int hashCode() {
-                return (int)(x*65536+y*4096);
-        }
 }