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

Timestamp:

2008-04-17T03:03:28+02:00 (15 years ago)

Author:

framm

Message:

• new extrude mode allows creation of rectangular shapes
• new AlignInRectangle function
• additional information in status bar about length, heading, and angle of segment being drawn
• helper line from last node to mouse cursor (disable with edit.helper-line=false)

Location:

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

Files:

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

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

@@ -41 +41 @@
          * 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.
@@ -46 +49 @@
          *              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 (x-other.x)*(x-other.x)+(y-other.y)*(y-other.y);
+                return Math.sqrt(distanceSq(other));
         }
 

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

@@ -58 +58 @@
          * @return distance in metres.
          */
-        public int distance(LatLon other) {
-                return (int) (Math.acos(
+        public double greatCircleDistance(LatLon other) {
+                return (Math.acos(
                         Math.sin(Math.toRadians(lat())) * Math.sin(Math.toRadians(other.lat())) + 
                     Math.cos(Math.toRadians(lat()))*Math.cos(Math.toRadians(other.lat())) *
                                   Math.cos(Math.toRadians(other.lon()-lon()))) * 6378135);
+        }
+        
+        /**
+         * Returns the heading, in radians, that you have to use to get from 
+         * this lat/lon to another.
+         * 
+         * @param other the "destination" position
+         * @return heading 
+         */
+        public double heading(LatLon other) {
+                double rv;
+                if (other.lat() == lat()) {
+                        rv = (other.lon()>lon() ? Math.PI / 2 : Math.PI * 3 / 2);
+                } else {
+                        rv = Math.atan((other.lon()-lon())/(other.lat()-lat()));
+                        if (rv < 0) rv += Math.PI;
+                        if (other.lon() < lon()) rv += Math.PI;
+                }
+                return rv;
         }