Changeset 941 in josm for trunk/src

Timestamp:

2008-09-10T00:30:56+02:00 (16 years ago)

Author:

framm

Message:

+ fixed Osm->GPX conversion to retain timestamps.

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (4 diffs)
• OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -307 +307 @@
                                 }
                         }
-                        if(earliest != null && latest != null){
+                        if (earliest != null && latest != null) {
                                 DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT);
                                 info.append(tr("Timespan: ") + df.format(new Date((long)(earliest.time * 1000))) + " - "
@@ -362 +362 @@
                  ********** STEP 1 - GET CONFIG VALUES **************************
                  ****************************************************************/
-                Long startTime = System.currentTimeMillis();
+                // Long startTime = System.currentTimeMillis();
                 Color neutralColor = Main.pref.getColor(marktr("gps point"), "layer "+name, Color.GRAY);
                 boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");                     // also draw lines between points belonging to different segments
@@ -397 +397 @@
                  ****************************************************************/
                 if (!computeCacheInSync) { // don't compute if the cache is good
-                WayPoint oldWp = null;
-                for (GpxTrack trk : data.tracks) {
+                        WayPoint oldWp = null;
+                        for (GpxTrack trk : data.tracks) {
                                 if (!forceLines) { // don't draw lines between segments, unless forced to
                                         oldWp = null;
-                        }
-                        for (Collection<WayPoint> segment : trk.trackSegs) {
-                                for (WayPoint trkPnt : segment) {
+                                }
+                                for (Collection<WayPoint> segment : trk.trackSegs) {
+                                        for (WayPoint trkPnt : segment) {
                                                 if (Double.isNaN(trkPnt.latlon.lat()) || Double.isNaN(trkPnt.latlon.lon())) {
-                                                continue;
+                                                        continue;
                                                 }
                                                 if (oldWp != null) {
-                                                double dist = trkPnt.latlon.greatCircleDistance(oldWp.latlon);
-                                                double dtime = trkPnt.time - oldWp.time;
-                                                double vel = dist/dtime;
+                                                        double dist = trkPnt.latlon.greatCircleDistance(oldWp.latlon);
+                                                        double dtime = trkPnt.time - oldWp.time;
+                                                        double vel = dist/dtime;
 
                                                         if (!colored) {
@@ -424 +424 @@
                                                         } else {
                                                                 trkPnt.drawLine = false;
-                                                }
+                                                        }
                                                 } else { // make sure we reset outdated data
                                                         trkPnt.speedLineColor = colors[255];

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -371 +371 @@
                                 }
                                 WayPoint wpt = new WayPoint(n.coor);
-                                if(n.timestamp != null)
+                                if (n.timestamp != null)
+                                {
                                         wpt.attr.put("time", n.timestamp);
+                                        wpt.setTime();
+                                }
                                 trkseg.add(wpt);
                         }
                 }
+                
+                // what is this loop meant to do? it creates waypoints but never 
+                // records them?
                 for (Node n : data.nodes) {
                         if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
                         WayPoint wpt = new WayPoint(n.coor);
-                        if(n.timestamp != null)
+                        if (n.timestamp != null) {
                                 wpt.attr.put("time", n.timestamp);
+                                wpt.setTime();
+                        }
                         if (n.keys != null && n.keys.containsKey("name")) {
                                 wpt.attr.put("name", n.keys.get("name"));