Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

Timestamp:

2009-07-03T22:19:22+02:00 (15 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -84 +84 @@
         for (WayPoint wpt : waypoints) {
             if (bounds == null) {
-                bounds = new Bounds(wpt.latlon, wpt.latlon);
+                bounds = new Bounds(wpt.getCoor());
             } else {
-                bounds.extend(wpt.latlon);
+                bounds.extend(wpt.getCoor());
             }
         }
@@ -92 +92 @@
             for (WayPoint wpt : rte.routePoints) {
                 if (bounds == null) {
-                    bounds = new Bounds(wpt.latlon, wpt.latlon);
+                    bounds = new Bounds(wpt.getCoor());
                 } else {
-                    bounds.extend(wpt.latlon);
+                    bounds.extend(wpt.getCoor());
                 }
             }
@@ -102 +102 @@
                 for (WayPoint wpt : trkseg) {
                     if (bounds == null) {
-                        bounds = new Bounds(wpt.latlon, wpt.latlon);
+                        bounds = new Bounds(wpt.getCoor());
                     } else {
-                        bounds.extend(wpt.latlon);
+                        bounds.extend(wpt.getCoor());
                     }
                 }
@@ -123 +123 @@
                 for (WayPoint tpt : trkseg) {
                     if(last != null){
-                        result += calcDistance(last.latlon, tpt.latlon);
+                        result += last.getCoor().greatCircleDistance(tpt.getCoor());
                     }
                     last = tpt;
@@ -132 +132 @@
         return result;
     }
-
-    /**
-     * returns the distance in meters between two LatLons
-     */
-    public static double calcDistance(LatLon p1, LatLon p2){
-        double lat1, lon1, lat2, lon2;
-        double dlon, dlat;
-
-        lat1 = p1.lat() * Math.PI / 180.0;
-        lon1 = p1.lon() * Math.PI / 180.0;
-        lat2 = p2.lat() * Math.PI / 180.0;
-        lon2 = p2.lon() * Math.PI / 180.0;
-
-        dlon = lon2 - lon1;
-        dlat = lat2 - lat1;
-
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
-        return 6367000 * c;
-    }
-
 }