Changeset 17132 in josm

Timestamp:

2020-10-09T08:02:47+02:00 (4 years ago)

Author:

simon04

Message:

see #16995 - WayPoint.LegacyMap silently ignored put(PT_TIME, null)

Fixes org.openstreetmap.josm.data.gpx.GpxDataTest.testMergeFromFiles

File:

• trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -64 +64 @@
      */
     public WayPoint(WayPoint p) {
-        attr = new HashMap<>();
+        attr = new HashMap<>(0);
         attr.putAll(p.attr);
-        attr.put(PT_TIME, p.getDate());
+        if (p.getDate() != null) {
+            attr.put(PT_TIME, p.getDate());
+        }
         lat = p.lat;
         lon = p.lon;
@@ -82 +84 @@
      */
     public WayPoint(LatLon ll) {
-        attr = new HashMap<>();
+        attr = new HashMap<>(0);
         lat = ll.lat();
         lon = ll.lon();