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

Timestamp:

2016-03-23T21:52:44+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12632 - Use WGS84 Ellipsoid constant instead of fixed value for R

File:

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

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

@@ -9 +9 @@
 import static java.lang.Math.sqrt;
 import static java.lang.Math.toRadians;
+import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
 import static org.openstreetmap.josm.tools.I18n.trc;
 
@@ -325 +326 @@
      */
     public double greatCircleDistance(LatLon other) {
-        double R = 6378135;
         double sinHalfLat = sin(toRadians(other.lat() - this.lat()) / 2);
         double sinHalfLon = sin(toRadians(other.lon() - this.lon()) / 2);
-        double d = 2 * R * asin(
+        double d = 2 * WGS84.a * asin(
                 sqrt(sinHalfLat*sinHalfLat +
                         cos(toRadians(this.lat()))*cos(toRadians(other.lat()))*sinHalfLon*sinHalfLon));
@@ -336 +336 @@
         if (java.lang.Double.isNaN(d)) {
             Main.error("NaN in greatCircleDistance");
-            d = PI * R;
+            d = PI * WGS84.a;
         }
         return d;