Changeset 14456 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-11-27T21:40:10+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16995 - de-duplicate storage of timestamp within WayPoint and refactor some methods, added documentation, added some robustness against legacy code (will also log a warning if detected). Patch by cmuelle8, modified

Location:

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

Files:

• OsmDataLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gpx/GpxDrawHelper.java (modified) (3 diffs)
• gpx/ImportAudioAction.java (modified) (7 diffs)
• markerlayer/Marker.java (modified) (1 diff)
• markerlayer/MarkerLayer.java (modified) (1 diff)
• markerlayer/PlayHeadMarker.java (modified) (5 diffs)

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

@@ -801 +801 @@
                 wpt.setTimeInMillis(time);
             } else if (n.hasKey(GpxConstants.PT_TIME)) {
-                wpt.setTime(DateUtils.fromString(n.get(GpxConstants.PT_TIME)));
+                wpt.setTimeInMillis(DateUtils.tsFromString(n.get(GpxConstants.PT_TIME)));
             } else if (!n.isTimestampEmpty()) {
                 wpt.setTime(Integer.toUnsignedLong(n.getRawTimestamp()));

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -1230 +1230 @@
             for (GpxTrackSegment segment : trk.getSegments()) {
                 for (WayPoint curWp : segment.getWayPoints()) {
-                    final Date parsedTime = curWp.setTimeFromAttribute();
-                    if (parsedTime != null) {
-                        firstGPXDate = parsedTime.getTime();
+                    if (curWp.hasDate()) {
+                        firstGPXDate = curWp.getTimeInMillis();
                         break outer;
                     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -509 +509 @@
                             continue;
                         }
-                        if (oldWp != null && trkPnt.time > oldWp.time) {
+                        if (oldWp != null && trkPnt.getTimeInMillis() > oldWp.getTimeInMillis()) {
                             double vel = trkPnt.getCoor().greatCircleDistance(oldWp.getCoor())
-                                    / (trkPnt.time - oldWp.time);
+                                    / (trkPnt.getTime() - oldWp.getTime());
                             velocities.add(vel);
                         }
@@ -587 +587 @@
                     switch (colored) {
                     case VELOCITY:
-                        double dtime = trkPnt.time - oldWp.time;
+                        double dtime = trkPnt.getTime() - oldWp.getTime();
                         if (dtime > 0) {
                             color = velocityScale.getColor(dist / dtime);
@@ -599 +599 @@
                         break;
                     case TIME:
-                        double t = trkPnt.time;
+                        double t = trkPnt.getTime();
                         // skip bad timestamps and very short tracks
                         if (t > 0 && t <= now && maxval - minval > minTrackDurationForTimeColoring) {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -150 +150 @@
                 for (GpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint w : seg.getWayPoints()) {
-                        firstTime = w.time;
+                        firstTime = w.getTime();
                         break;
                     }
@@ -175 +175 @@
         if (hasWaypoints && Config.getPref().getBoolean("marker.audiofromexplicitwaypoints", true)) {
             for (WayPoint w : layer.data.waypoints) {
-                if (w.time > firstTime) {
+                if (w.getTime() > firstTime) {
                     waypoints.add(w);
-                } else if (w.time > 0.0) {
+                } else if (w.getTime() > 0.0) {
                     timedMarkersOmitted = true;
                 }
@@ -192 +192 @@
                 if (wNear != null) {
                     WayPoint wc = new WayPoint(w.getCoor());
-                    wc.time = wNear.time;
+                    wc.setTimeInMillis(wNear.getTimeInMillis());
                     if (w.attr.containsKey(GpxConstants.GPX_NAME)) {
                         wc.put(GpxConstants.GPX_NAME, w.getString(GpxConstants.GPX_NAME));
@@ -230 +230 @@
                 for (GpxTrackSegment seg : track.getSegments()) {
                     for (WayPoint w : seg.getWayPoints()) {
-                        if (startTime < w.time) {
+                        if (startTime < w.getTime()) {
                             w2 = w;
                             break;
@@ -246 +246 @@
             } else {
                 wayPointFromTimeStamp = new WayPoint(w1.getCoor().interpolate(w2.getCoor(),
-                        (startTime - w1.time) / (w2.time - w1.time)));
-                wayPointFromTimeStamp.time = startTime;
+                        (startTime - w1.getTime()) / (w2.getTime() - w1.getTime())));
+                wayPointFromTimeStamp.setTimeInMillis((long) (startTime * 1000));
                 String name = audioFile.getName();
                 int dot = name.lastIndexOf('.');
@@ -268 +268 @@
                         WayPoint wStart = new WayPoint(w.getCoor());
                         wStart.put(GpxConstants.GPX_NAME, "start");
-                        wStart.time = w.time;
+                        wStart.setTimeInMillis(w.getTimeInMillis());
                         waypoints.add(wStart);
                         gotOne = true;
@@ -284 +284 @@
 
         // we must have got at least one waypoint now
-        ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time));
+        ((ArrayList<WayPoint>) waypoints).sort((wp, other) -> wp.compareTo(other));
 
         firstTime = -1.0; // this time of the first waypoint, not first trackpoint
         for (WayPoint w : waypoints) {
             if (firstTime < 0.0) {
-                firstTime = w.time;
-            }
-            double offset = w.time - firstTime;
-            AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.time, offset);
+                firstTime = w.getTime();
+            }
+            double offset = w.getTime() - firstTime;
+            AudioMarker am = new AudioMarker(w.getCoor(), w, url, ml, w.getTime(), offset);
             // timeFromAudio intended for future use to shift markers of this type on synchronization
             if (w == wayPointFromTimeStamp) {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -256 +256 @@
     public WayPoint convertToWayPoint() {
         WayPoint wpt = new WayPoint(getCoor());
-        wpt.setTime((long) (time*1000));
+        wpt.setTimeInMillis((long) (time * 1000));
         if (text != null) {
             wpt.addExtension("text", text);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -97 +97 @@
         for (WayPoint wpt : indata.waypoints) {
             /* calculate time differences in waypoints */
-            double time = wpt.time;
+            double time = wpt.getTime();
             boolean wptHasLink = wpt.attr.containsKey(GpxConstants.META_LINKS);
             if (firstTime < 0 && wptHasLink) {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -167 +167 @@
                 if (m instanceof AudioMarker) {
                     AudioMarker a = (AudioMarker) m;
-                    if (a.time > cw.time) {
+                    if (a.time > cw.getTime()) {
                         break;
                     }
@@ -188 +188 @@
             if (cw != null) {
                 setCoor(cw.getCoor());
-                ca.play(cw.time - ca.time);
+                ca.play(cw.getTime() - ca.time);
             }
             endDrag(false);
@@ -245 +245 @@
                 return;
             }
-            ca = recent.parentLayer.addAudioMarker(cw.time, cw.getCoor());
+            ca = recent.parentLayer.addAudioMarker(cw.getTime(), cw.getCoor());
         }
 
@@ -330 +330 @@
             for (GpxTrackSegment trackseg : track.getSegments()) {
                 for (WayPoint w: trackseg.getWayPoints()) {
-                    if (audioTime < w.time) {
+                    if (audioTime < w.getTime()) {
                         w2 = w;
                         break;
@@ -350 +350 @@
                 w1.getEastNorth(ProjectionRegistry.getProjection()) :
                     w1.getEastNorth(ProjectionRegistry.getProjection()).interpolate(w2.getEastNorth(ProjectionRegistry.getProjection()),
-                            (audioTime - w1.time)/(w2.time - w1.time)));
+                            (audioTime - w1.getTime())/(w2.getTime() - w1.getTime())));
         time = audioTime;
         MapView mapView = MainApplication.getMap().mapView;