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

Timestamp:

2008-02-22T18:31:49+01:00 (17 years ago)

Author:

david

Message:

new "Add Audio Marker At Play Head" facility; and tidy up Audio Preferences; default for displaying audio trace now true.

File:

• trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) (2 diffs)

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

@@ -227 +227 @@
                                 break;
                         case wpt:
-                                if (qName.equals("ele") || qName.equals("time") || qName.equals("desc")
+                                if (qName.equals("ele") || qName.equals("desc")
                                                 || qName.equals("magvar") || qName.equals("geoidheight")
-                                                || qName.equals("name") || qName.equals("time")
-                                                || qName.equals("sym") || qName.equals("cmt") || qName.equals("type")) {
+                                                || qName.equals("name") || qName.equals("sym") 
+                                                || qName.equals("cmt") || qName.equals("type")) {
                                         currentWayPoint.attr.put(qName, accumulator.toString());
+                                } else if (qName.equals("time")) {
+                                        currentWayPoint.attr.put(qName, accumulator.toString());
+                                        currentWayPoint.setTime();                                      
                                 } else if (qName.equals("rtept")) {
                                         currentState = states.pop();
-                                        currentWayPoint.setTime();
                                         currentRoute.routePoints.add(currentWayPoint);
                                 } else if (qName.equals("trkpt")) {
                                         currentState = states.pop();
-                                        currentWayPoint.setTime();
                                         currentTrackSeg.add(currentWayPoint);
                                         if (Main.pref.getBoolean("marker.namedtrackpoints") && 
@@ -248 +249 @@
                                 } else if (qName.equals("wpt")) {
                                         currentState = states.pop();
-                                        currentWayPoint.setTime();
                                         currentData.waypoints.add(currentWayPoint);
                                 }