Changeset 34751 in osm for applications/editors/josm/plugins/editgpx/src/org

Timestamp:

2018-11-28T23:04:48+01:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14456

Location:

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data

Files:

• EditGpxTrack.java (modified) (1 diff)
• EditGpxTrackSegment.java (modified) (1 diff)
• EditGpxWayPoint.java (modified) (2 diffs)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java

@@ -52 +52 @@
                         // convert to anonymous time
                         for (WayPoint w : points) {
-                            double t = w.time - minTime;
+                            double t = w.getTime() - minTime;
                             w.setTimeInMillis((long)(t * 1000));
-                            assert w.time == t;
+                            assert w.getTime() == t;
                             if (w.attr.containsKey("name")) {
                                 w.attr.put("name", "anon"); //time information can also be in "name" field. so delete time information

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java

@@ -49 +49 @@
      */
     public double minNonDeletedTime() {
-        return Collections.min(getNonDeletedWaypoints()).time;
+        return Collections.min(getNonDeletedWaypoints()).getTime();
     }
 

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java

@@ -14 +14 @@
 
     public EditGpxWayPoint(WayPoint wayPoint) {
-        this.time = wayPoint.time;
+        this.time = wayPoint.getTime();
         this.coor = new CachedLatLon(wayPoint.getCoor());
         this.attributes = new HashMap<>(wayPoint.attr);
@@ -21 +21 @@
     public WayPoint createWayPoint() {
         WayPoint result = new WayPoint(getCoor());
-        result.time = time;
+        result.setTime((long) time);
         result.attr = attributes;
         return result;