Changeset 18287 in josm for trunk/test

Timestamp:

2021-10-19T01:26:15+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20913 - fix handling of GPX files in sessions (patch by Bjoeni)

• revert r17659 (except for unit tests) - see #20233
  • don't save GPX track and marker colors in session file anymore, but in the GPX files as extensions (like before)
  • don't ask to save unmodified GPX file
  • don't override global color settings when individual track doesn't have a color
• ask user to save changes to GPX file when any drawing settings or marker colors have changed (currently only happens for track colors)
• save marker color values to session even when corresponding GPX layer has already been deleted
• save alpha values for GPX marker colors
• added explanation to the "overwrite GPX file" dialog
• inform user if not all files referenced by the session file are saved yet
• allow user to save all files that are not included in the *.jos/*.joz but are only referenced in the session file
• display * next to GPX layers that need to be saved (move isDirty() logic from OsmDataLayer to AbstractModifiableLayer)

Location:

trunk/test

Files:

• data/sessions/data_export.gpx (added)
• data/sessions/gpx_markers.jos (modified) (1 diff)
• data/sessions/gpx_markers.joz (modified) ( previous)
• data/sessions/markers.gpx (added)
• unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (modified) (1 diff)
• unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (8 diffs)

trunk/test/data/sessions/gpx_markers.jos

@@ -16 +16 @@
             <file>layers/01/data.gpx</file>
         </layer>
-        <layer color="#34567812" index="2" name="Marker layer name" opacity="0.5" type="markers" version="0.1" visible="true">
+        <layer index="2" name="Marker layer name" opacity="0.5" type="markers" version="0.1" visible="true">
             <file>layers/02/data.gpx</file>
         </layer>

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

@@ -504 +504 @@
         EqualsVerifier.forClass(GpxData.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
-            .withIgnoredFields("creator", "fromServer", "storageFile", "initializing", "updating",
+            .withIgnoredFields("creator", "fromServer", "fromSession", "storageFile", "initializing", "updating",
                     "suppressedInvalidate", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans", "modified")
             .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))

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

@@ -9 +9 @@
 import java.util.HashMap;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -32 +32 @@
 
     /**
-     * Tests weather the track can read and write colors.
+     * Tests whether the track can read and write colors.
      */
     @Test

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.session;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
@@ -15 +18 @@
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -43 +48 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Unit tests for Session writing.
@@ -109 +112 @@
     }
 
-    private byte[] testWrite(List<Layer> layers, final boolean zip) throws IOException {
+    private Map<String, byte[]> testWrite(List<Layer> layers, final boolean zip) throws IOException {
         Map<Layer, SessionLayerExporter> exporters = new HashMap<>();
         if (zip) {
@@ -119 +122 @@
         }
         for (final Layer l : layers) {
-            exporters.put(l, SessionWriter.getSessionLayerExporter(l));
+            SessionLayerExporter s = SessionWriter.getSessionLayerExporter(l);
+            exporters.put(l, s);
+            if (s instanceof GpxTracksSessionExporter) {
+                ((GpxTracksSessionExporter) s).setMetaTime(Instant.parse("2021-10-16T18:27:12.351Z"));
+            } else if (s instanceof MarkerSessionExporter) {
+                ((MarkerSessionExporter) s).setMetaTime(Instant.parse("2021-10-16T18:27:12.351Z"));
+            }
         }
         SessionWriter sw = new SessionWriter(layers, -1, exporters, new MultiMap<Layer, Layer>(), zip);
@@ -128 +137 @@
                 return null;
             }
-            try (ZipFile zipFile = new ZipFile(file);
-                 InputStream input = zipFile.getInputStream(zipFile.getEntry("session.jos"))) {
-                return Utils.readBytesFromStream(input);
+            try (ZipFile zipFile = new ZipFile(file)) {
+                return Collections.list(zipFile.entries()).stream().collect(Collectors.toMap(ZipEntry::getName, e -> {
+                    try {
+                        return Utils.readBytesFromStream(zipFile.getInputStream(e));
+                    } catch (IOException ex) {
+                        fail(ex);
+                    }
+                    return null;
+                }));
             }
         } finally {
@@ -147 +162 @@
     private GpxLayer createGpxLayer() {
         GpxData data = new GpxData();
-        data.waypoints.add(new WayPoint(new LatLon(42.72665, -0.00747)));
+        WayPoint wp = new WayPoint(new LatLon(42.72665, -0.00747));
+        wp.setInstant(Instant.parse("2021-01-01T10:15:30.00Z"));
+        data.waypoints.add(wp);
         data.waypoints.add(new WayPoint(new LatLon(42.72659, -0.00749)));
         GpxLayer layer = new GpxLayer(data, "GPX layer name");
@@ -233 +250 @@
     void testWriteGpxAndMarkerJoz() throws IOException {
         GpxLayer gpx = createGpxLayer();
-        byte[] bytes = testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
+        Map<String, byte[]> bytes = testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true);
+
         Path path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/gpx_markers.jos");
         String expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
-        String actual = new String(bytes, StandardCharsets.UTF_8).replace("\r", "");
+        String actual = new String(bytes.get("session.jos"), StandardCharsets.UTF_8).replace("\r", "");
+        assertEquals(expected, actual);
+
+        path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/data_export.gpx");
+        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        actual = new String(bytes.get("layers/01/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
+        assertEquals(expected, actual);
+
+        path = Paths.get(TestUtils.getTestDataRoot() + "/sessions/markers.gpx");
+        expected = new String(Files.readAllBytes(path), StandardCharsets.UTF_8).replace("\r", "");
+        actual = new String(bytes.get("layers/02/data.gpx"), StandardCharsets.UTF_8).replace("\r", "");
         assertEquals(expected, actual);
     }