Changeset 16315 in osm for applications

Timestamp:

2009-07-05T10:41:52+02:00 (16 years ago)

Author:

stoecker

Message:

minor cleanups reusing JOSM code

Location:

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj

Files:

• AgpifojLayer.java (modified) (1 diff)
• CorrelateGpxWithImages.java (modified) (2 diffs)

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java

@@ -366 +366 @@
     public void visitBoundingBox(BoundingXYVisitor v) {
         for (ImageEntry e : data)
-            v.visit(e.pos.getEastNorth());
+            v.visit(e.pos);
     }
 

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java

@@ -979 +979 @@
 
         if (prevWp != null) {
-            double distance = getDistance(prevWp, curWp);
+            double distance = prevWp.getCoor().greatCircleDistance(curWp.getCoor());
             // This is in km/h, 3.6 * m/s
             if (curDateWp > prevDateWp)
@@ -1154 +1154 @@
         }
     }
-
-    /** Return the distance in meters between 2 points
-     * Formula and earth radius from : http://en.wikipedia.org/wiki/Great-circle_distance */
-    public double getDistance(WayPoint p1, WayPoint p2) {
-        double p1Lat = p1.getCoor().lat() * Math.PI / 180;
-        double p1Lon = p1.getCoor().lon() * Math.PI / 180;
-        double p2Lat = p2.getCoor().lat() * Math.PI / 180;
-        double p2Lon = p2.getCoor().lon() * Math.PI / 180;
-        double ret = Math.atan2(Math.sqrt(Math.pow(Math.cos(p2Lat) * Math.sin(p2Lon - p1Lon), 2)
-                                          + Math.pow(Math.cos(p1Lat) * Math.sin(p2Lat)
-                                                     - Math.sin(p1Lat) * Math.cos(p2Lat) * Math.cos(p2Lon - p1Lon), 2)),
-                                Math.sin(p1Lat) * Math.sin(p2Lat)
-                                + Math.cos(p1Lat) * Math.cos(p2Lat) * Math.cos(p2Lon - p1Lon))
-                     * 6372795; // Earth radius, in meters
-        return ret;
-    }
 }