Changeset 19681 in osm for applications/editors/josm/plugins/dataimport/src/org

Timestamp:

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

Author:

jttt

Message:

Adapted for JOSM r2907

Location:

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io

Files:

• TangoGPS.java (modified) (4 diffs)
• Tcx.java (modified) (6 diffs)

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -13 +13 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -20 +22 @@
 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.ImmutableGpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.SingleSegmentGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -46 +49 @@
         public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
                 // create the data tree
-                GpxData data = new GpxData();
-                GpxTrack currentTrack = new GpxTrack();
-                data.tracks.add(currentTrack);
-                ArrayList<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
+                List<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
 
                 int imported = 0;
@@ -79 +79 @@
                         failure = failure - imported;
                         if(imported > 0) {
-                                currentTrack.trackSegs.add(currentTrackSeg);
+                                GpxData data = new GpxData();
+                                data.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(currentTrackSeg), Collections.<String, Object>emptyMap()));
                                 data.recalculateBounds();
                                 data.storageFile = file;

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 import javax.xml.bind.JAXBContext;
@@ -19 +20 @@
 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.gui.layer.GpxLayer;
@@ -159 +160 @@
                             XMLGregorianCalendar startTime = activityLap
                                     .getStartTime();
-                            GpxTrack currentTrack = new GpxTrack();
-                            gpxData.tracks.add(currentTrack);
+                            Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
                             for (TrackT track : activityLap.getTrack()) {
                                 if (track.getTrackpoint() != null) {
                                     Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
-                                    currentTrack.trackSegs.add(currentTrackSeg);
+                                    currentTrack.add(currentTrackSeg);
                                     for (TrackpointT tp :
                                            track.getTrackpoint()) {
@@ -182 +182 @@
                                 }
                             }
+                            gpxData.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
                         }
                     }
@@ -197 +198 @@
             for (CourseT course : tcd.getCourses().getCourse()) {
                 if (course.getTrack() != null) {
-                    GpxTrack currentTrack = new GpxTrack();
-                    gpxData.tracks.add(currentTrack);
+                    Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
                     for (TrackT track : course.getTrack()) {
                         if (track.getTrackpoint() != null) {
                             Collection<WayPoint> currentTrackSeg = new ArrayList<WayPoint>();
-                            currentTrack.trackSegs.add(currentTrackSeg);
+                            currentTrack.add(currentTrackSeg);
                             for (TrackpointT tp : track.getTrackpoint()) {
                                 WayPoint waypt = convertPoint(tp);
@@ -212 +212 @@
                         }
                     }
+                    gpxData.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
                 }
             }