Changeset 2907 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2010-01-30T20:04:10+01:00 (14 years ago)

Author:

jttt

Message:

Gpx refactoring - GpxTrack and GpxTrackSegment is now interface, implementations for specific use can be provided (currently JOSM supports immutable gpx track, livegps plugin supports append only track).

• track length and bounds are precalculated
• GpxLayer paints only currently visible segments

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (7 diffs)
• GpxWriter.java (modified) (2 diffs)
• NmeaReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -11 +11 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -23 +24 @@
 import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.GpxRoute;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.xml.sax.Attributes;
@@ -47 +48 @@
 
         private GpxData currentData;
-        private GpxTrack currentTrack;
+        private Collection<Collection<WayPoint>> currentTrack;
+        private Map<String, Object> currentTrackAttr;
         private Collection<WayPoint> currentTrackSeg;
         private GpxRoute currentRoute;
@@ -100 +102 @@
                     states.push(currentState);
                     currentState = State.trk;
-                    currentTrack = new GpxTrack();
+                    currentTrack = new ArrayList<Collection<WayPoint>>();
+                    currentTrackAttr = new HashMap<String, Object>();
                 } else if (qName.equals("extensions")) {
                     states.push(currentState);
@@ -207 +210 @@
             case metadata: return currentData.attr;
             case wpt: return currentWayPoint.attr;
-            case trk: return currentTrack.attr;
+            case trk: return currentTrackAttr;
             default: return null;
             }
@@ -303 +306 @@
                 if (qName.equals("trkseg")) {
                     currentState = states.pop();
-                    currentTrack.trackSegs.add(currentTrackSeg);
+                    currentTrack.add(currentTrackSeg);
                 }
                 break;
@@ -309 +312 @@
                 if (qName.equals("trk")) {
                     currentState = states.pop();
-                    currentData.tracks.add(currentTrack);
+                    currentData.tracks.add(new ImmutableGpxTrack(currentTrack, currentTrackAttr));
                 } else if (qName.equals("name") || qName.equals("cmt")
                         || qName.equals("desc") || qName.equals("src")
                         || qName.equals("type") || qName.equals("number")
                         || qName.equals("url")) {
-                    currentTrack.attr.put(qName, accumulator.toString());
+                    currentTrackAttr.put(qName, accumulator.toString());
                 }
                 break;

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -161 +162 @@
         for (GpxTrack trk : data.tracks) {
             open("trk");
-            writeAttr(trk.attr);
-            for (Collection<WayPoint> seg : trk.trackSegs) {
+            writeAttr(trk.getAttributes());
+            for (GpxTrackSegment seg : trk.getSegments()) {
                 openln("trkseg");
-                for (WayPoint pnt : seg) {
+                for (WayPoint pnt : seg.getWayPoints()) {
                     wayPoint(pnt, TRACK_POINT);
                 }

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.tools.DateUtils;
@@ -173 +174 @@
         // create the data tree
         data = new GpxData();
-        GpxTrack currentTrack = new GpxTrack();
-        data.tracks.add(currentTrack);
+        Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
 
         try {
@@ -207 +207 @@
             }
             rd.close();
-            currentTrack.trackSegs.add(ps.waypoints);
+            currentTrack.add(ps.waypoints);
+            data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
             data.recalculateBounds();