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

Timestamp:

2009-07-03T22:19:22+02:00 (16 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

Location:

trunk/src/org/openstreetmap/josm/io

Files:

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

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

@@ -262 +262 @@
                 } else if (qName.equals("cmt") || qName.equals("desc")) {
                     currentWayPoint.attr.put(qName, accumulator.toString());
-                    currentWayPoint.setGarminCommentTime(qName);
+                    currentWayPoint.setTime();
                 } else if (qName.equals("rtept")) {
                     currentState = states.pop();

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxLink;
@@ -237 +238 @@
         }
         if (pnt != null) {
-            openAtt(type, "lat=\"" + pnt.latlon.lat() + "\" lon=\"" + pnt.latlon.lon() + "\"");
+            LatLon c =pnt.getCoor();
+            openAtt(type, "lat=\"" + c.lat() + "\" lon=\"" + c.lon() + "\"");
             writeAttr(pnt.attr);
             closeln(type);

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.DateUtils;
 
 /**
@@ -285 +286 @@
                     // As this sentence has no complete time only use it
                     // if there is no time so far
-                    String gpxdate = WayPoint.GPXTIMEFMT.format(d);
-                    currentwp.attr.put("time", gpxdate);
+                    currentwp.attr.put("time", DateUtils.fromDate(d));
                 }
                 // elevation
@@ -390 +390 @@
                 }
                 // time: this sentence has complete time so always use it.
-                String gpxdate = WayPoint.GPXTIMEFMT.format(d);
-                currentwp.attr.put("time", gpxdate);
+                currentwp.attr.put("time", DateUtils.fromDate(d));
                 // speed
                 accu = e[GPRMC.SPEED.position];