Changeset 2247 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-10-04T15:57:42+02:00 (15 years ago)

Author:

jttt

Message:

Fixed #2480

Location:

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

Files:

• GpxData.java (modified) (1 diff)
• GpxTrack.java (modified) (2 diffs)
• WayPoint.java (modified) (1 diff)

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

@@ -117 +117 @@
     public double length(){
         double result = 0.0; // in meters
-        WayPoint last = null;
 
-        for (GpxTrack trk : tracks)
-            result += trk.length();
+        for (GpxTrack trk : tracks) {
+            result += trk.length();
+        }
 
         return result;

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

@@ -5 +5 @@
 
 import java.util.Collection;
-import java.util.LinkedList;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class GpxTrack extends WithAttributes {
-    public Collection<Collection<WayPoint>> trackSegs
-        = new LinkedList<Collection<WayPoint>>();
+    public final Collection<Collection<WayPoint>> trackSegs
+    = new ConcurrentLinkedQueue<Collection<WayPoint>>();
 
     /**
@@ -18 +18 @@
         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
-        }
+        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;
     }

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

@@ -41 +41 @@
      */
     public void setTime() {
-        for(String key : new String[]{"time", "cmt", "desc"})
+        if(attr.containsKey("time"))
         {
-            if(attr.containsKey("time"))
-            {
-                double t = DateUtils.fromString(attr.get("time").toString()).getTime();
-                if(t != 0.0)
-                {
-                    time = t / 1000.0; /* ms => seconds */
-                    break;
-                }
+            double t = DateUtils.fromString(attr.get("time").toString()).getTime();
+            if(t != 0.0) {
+                time = t / 1000.0; /* ms => seconds */
             }
         }