Changeset 18207 in josm for trunk

Timestamp:

2021-09-11T17:00:13+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21257 - sort tracks chronologically when writing GPX file

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (modified) (1 diff)

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

@@ -19 +19 @@
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -33 +34 @@
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.ListeningCollection;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.Interval;
 
@@ -386 +388 @@
 
     /**
-     * Get all tracks contained in this data set.
+     * Get all tracks contained in this data set, without any guaranteed order.
      * @return The tracks.
      */
     public synchronized Collection<IGpxTrack> getTracks() {
         return Collections.unmodifiableCollection(privateTracks);
+    }
+
+    /**
+     * Get all tracks contained in this data set, ordered chronologically.
+     * @return The tracks in chronological order.
+     * @since 18207
+     */
+    public synchronized List<IGpxTrack> getOrderedTracks() {
+        return privateTracks.stream().sorted((t1, t2) -> {
+            boolean t1empty = Utils.isEmpty(t1.getSegments());
+            boolean t2empty = Utils.isEmpty(t2.getSegments());
+            if (t1empty && t2empty) {
+                return 0;
+            } else if (t1empty && !t2empty) {
+                return -1;
+            } else if (!t1empty && t2empty) {
+                return 1;
+            } else {
+                OptionalLong i1 = getTrackFirstWaypointMin(t1);
+                OptionalLong i2 = getTrackFirstWaypointMin(t2);
+                boolean i1absent = !i1.isPresent();
+                boolean i2absent = !i2.isPresent();
+                if (i1absent && i2absent) {
+                    return 0;
+                } else if (i1absent && !i2absent) {
+                    return 1;
+                } else if (!i1absent && i2absent) {
+                    return -1;
+                } else {
+                    return Long.compare(i1.getAsLong(), i2.getAsLong());
+                }
+            }
+        }).collect(Collectors.toList());
+    }
+
+    private static OptionalLong getTrackFirstWaypointMin(IGpxTrack track) {
+        return track.getSegments().stream().map(IGpxTrackSegment::getWayPoints)
+                .filter(Objects::nonNull).flatMap(Collection::stream)
+                .mapToLong(WayPoint::getTimeInMillis).min();
     }
 

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

@@ -266 +266 @@
 
     private void writeTracks() {
-        for (IGpxTrack trk : data.getTracks()) {
+        for (IGpxTrack trk : data.getOrderedTracks()) {
             openln("trk");
             writeAttr(trk, RTE_TRK_KEYS);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -650 +650 @@
     public static <T> List<T> toUnmodifiableList(Collection<T> collection) {
         // Java 9: use List.of(...)
-        if (collection == null || collection.isEmpty()) {
+        if (isEmpty(collection)) {
             return Collections.emptyList();
         } else if (collection.size() == 1) {
@@ -672 +672 @@
     @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
-        if (map == null || map.isEmpty()) {
+        if (isEmpty(map)) {
             return Collections.emptyMap();
         } else if (map.size() == 1) {
@@ -689 +689 @@
 
     /**
+     * Determines if a collection is null or empty.
+     * @param collection collection
+     * @return {@code true} if collection is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(Collection<?> collection) {
+        return collection == null || collection.isEmpty();
+    }
+
+    /**
+     * Determines if a map is null or empty.
+     * @param map map
+     * @return {@code true} if map is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return map == null || map.isEmpty();
+    }
+
+    /**
+     * Determines if a string is null or empty.
+     * @param string string
+     * @return {@code true} if string is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(String string) {
+        return string == null || string.isEmpty();
+    }
+
+    /**
      * Returns the first not empty string in the given candidates, otherwise the default string.
      * @param defaultString default string returned if all candidates would be empty if stripped
@@ -737 +767 @@
      */
     public static String strip(final String str, final String skipChars) {
-        if (str == null || str.isEmpty()) {
+        if (isEmpty(str)) {
             return str;
         }
@@ -774 +804 @@
      */
     public static String removeWhiteSpaces(String s) {
-        if (s == null || s.isEmpty()) {
+        if (isEmpty(s)) {
             return s;
         }

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -323 +323 @@
         data.addTrack(track2);
         assertEquals(3 * new LatLon(0, 0).greatCircleDistance(new LatLon(1, 1)), data.length(), 1);
-
+    }
+
+    /**
+     * Test method for {@link GpxData#getOrderedTracks()}.
+     */
+    @Test
+    void testGetOrderedTracks() {
+        assertTrue(data.getOrderedTracks().isEmpty());
+
+        WayPoint p1 = new WayPoint(LatLon.NORTH_POLE);
+        WayPoint p2 = new WayPoint(LatLon.NORTH_POLE);
+
+        p1.setInstant(Instant.ofEpochMilli(100020));
+        p2.setInstant(Instant.ofEpochMilli(200020));
+
+        data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p2)), Collections.emptyMap()));
+        data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p1)), Collections.emptyMap()));
+
+        List<IGpxTrack> tracks = data.getOrderedTracks();
+        assertEquals(2, tracks.size());
+
+        assertEquals(p1, tracks.get(0).getSegments().iterator().next().getWayPoints().iterator().next());
+        assertEquals(p2, tracks.get(1).getSegments().iterator().next().getWayPoints().iterator().next());
     }