Changeset 2151 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-09-16T21:40:57+02:00 (17 years ago)

Author:

Gubaer

Message:

applied #3526: patch by glebius@...: be more verbose about available traces in GPX layer

Location:

trunk/src/org/openstreetmap/josm/data/gpx

Files:

• GpxData.java (modified) (1 diff)
• GpxTrack.java (modified) (1 diff)

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

@@ -119 +119 @@
         WayPoint last = null;
 
-        for (GpxTrack trk : tracks) {
-            for (Collection<WayPoint> trkseg : trk.trackSegs) {
-                for (WayPoint tpt : trkseg) {
-                    if(last != null){
-                        Double d = last.getCoor().greatCircleDistance(tpt.getCoor());
-                        if(!d.isNaN() && !d.isInfinite())
-                          result += d;
-                    }
-                    last = tpt;
-                }
-                last = null; // restart for each track segment
-            }
-        }
+        for (GpxTrack trk : tracks)
+            result += trk.length();
+
         return result;
     }

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

@@ -10 +10 @@
     public Collection<Collection<WayPoint>> trackSegs
         = new LinkedList<Collection<WayPoint>>();
+
+    /**
+     * calculates the length of the track
+     */
+    public double length(){
+        double result = 0.0; // in meters
+        WayPoint last = null;
+
+        for (Collection<WayPoint> trkseg : trackSegs) {
+            for (WayPoint tpt : trkseg) {
+                if(last != null){
+                    Double d = last.getCoor().greatCircleDistance(tpt.getCoor());
+                    if(!d.isNaN() && !d.isInfinite())
+                        result += d;
+                }
+                last = tpt;
+            }
+            last = null; // restart for each track segment
+        }
+        return result;
+    }
 }