Changeset 2907 in josm for trunk/src/org/openstreetmap/josm/io/GpxReader.java
- Timestamp:
- 2010-01-30T20:04:10+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r2801 r2907 11 11 import java.util.ArrayList; 12 12 import java.util.Collection; 13 import java.util.HashMap; 13 14 import java.util.LinkedList; 14 15 import java.util.List; … … 23 24 import org.openstreetmap.josm.data.gpx.GpxLink; 24 25 import org.openstreetmap.josm.data.gpx.GpxRoute; 25 import org.openstreetmap.josm.data.gpx. GpxTrack;26 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack; 26 27 import org.openstreetmap.josm.data.gpx.WayPoint; 27 28 import org.xml.sax.Attributes; … … 47 48 48 49 private GpxData currentData; 49 private GpxTrack currentTrack; 50 private Collection<Collection<WayPoint>> currentTrack; 51 private Map<String, Object> currentTrackAttr; 50 52 private Collection<WayPoint> currentTrackSeg; 51 53 private GpxRoute currentRoute; … … 100 102 states.push(currentState); 101 103 currentState = State.trk; 102 currentTrack = new GpxTrack(); 104 currentTrack = new ArrayList<Collection<WayPoint>>(); 105 currentTrackAttr = new HashMap<String, Object>(); 103 106 } else if (qName.equals("extensions")) { 104 107 states.push(currentState); … … 207 210 case metadata: return currentData.attr; 208 211 case wpt: return currentWayPoint.attr; 209 case trk: return currentTrack .attr;212 case trk: return currentTrackAttr; 210 213 default: return null; 211 214 } … … 303 306 if (qName.equals("trkseg")) { 304 307 currentState = states.pop(); 305 currentTrack. trackSegs.add(currentTrackSeg);308 currentTrack.add(currentTrackSeg); 306 309 } 307 310 break; … … 309 312 if (qName.equals("trk")) { 310 313 currentState = states.pop(); 311 currentData.tracks.add( currentTrack);314 currentData.tracks.add(new ImmutableGpxTrack(currentTrack, currentTrackAttr)); 312 315 } else if (qName.equals("name") || qName.equals("cmt") 313 316 || qName.equals("desc") || qName.equals("src") 314 317 || qName.equals("type") || qName.equals("number") 315 318 || qName.equals("url")) { 316 currentTrack .attr.put(qName, accumulator.toString());319 currentTrackAttr.put(qName, accumulator.toString()); 317 320 } 318 321 break;
Note:
See TracChangeset
for help on using the changeset viewer.