Changeset 18287 in josm for trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

Timestamp:

2021-10-19T01:26:15+02:00 (4 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)

File:

• trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (modified) (1 diff)

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))