Changeset 18287 in josm for trunk/src/org/openstreetmap/josm/io

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/src/org/openstreetmap/josm/io

Files:

• GpxWriter.java (modified) (1 diff)
• session/GpxTracksSessionExporter.java (modified) (3 diffs)
• session/GpxTracksSessionImporter.java (modified) (1 diff)
• session/MarkerSessionExporter.java (modified) (4 diffs)
• session/MarkerSessionImporter.java (modified) (3 diffs)
• session/SessionReader.java (modified) (3 diffs)
• session/SessionWriter.java (modified) (2 diffs)

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

@@ -149 +149 @@
         validprefixes = namespaces.stream().map(n -> n.getPrefix()).collect(Collectors.toList());
 
+        data.creator = JOSM_CREATOR_NAME;
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
-        out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"");
+
+        out.print("<gpx version=\"1.1\" creator=\"");
+        out.print(JOSM_CREATOR_NAME);
+        out.println("\" xmlns=\"http://www.topografix.com/GPX/1/1\"");
 
         StringBuilder schemaLocations = new StringBuilder("http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd");

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java

@@ -7 +7 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -16 +17 @@
  */
 public class GpxTracksSessionExporter extends GenericSessionExporter<GpxLayer> {
+
+    private Instant metaTime;
 
     /**
@@ -37 +40 @@
         Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
         GpxWriter w = new GpxWriter(new PrintWriter(writer));
+        if (metaTime != null) {
+            w.setMetaTime(metaTime);
+        }
         w.write(layer.data);
         w.flush();
     }
+
+    protected void setMetaTime(Instant metaTime) {
+        this.metaTime = metaTime;
+    }
 }

trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java

@@ -55 +55 @@
                     importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
                 }
+                if (importData.getGpxLayer() != null && importData.getGpxLayer().data != null) {
+                    importData.getGpxLayer().data.fromSession = true;
+                }
 
                 support.addPostLayersTask(importData.getPostLayerTask());

trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java

@@ -10 +10 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Collections;
@@ -32 +33 @@
  */
 public class MarkerSessionExporter extends AbstractSessionExporter<MarkerLayer> {
+
+    private Instant metaTime;
 
     /**
@@ -87 +90 @@
         Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
         MarkerWriter w = new MarkerWriter(new PrintWriter(writer));
+        if (metaTime != null) {
+            w.setMetaTime(metaTime);
+        }
         w.write(layer);
         w.flush();
+    }
+
+    protected void setMetaTime(Instant metaTime) {
+        this.metaTime = metaTime;
     }
 
@@ -110 +120 @@
         public void write(MarkerLayer layer) {
             GpxData data = new GpxData();
+            layer.data.getLayerPrefs().forEach((k, v) -> {
+                if (k != null && k.indexOf("markers.") == 0) {
+                    data.getLayerPrefs().put(k, v);
+                }
+            });
             data.put(GpxData.META_DESC, "exported JOSM marker layer");
             for (Marker m : layer.data) {

trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 
 import javax.xml.xpath.XPath;
@@ -15 +14 @@
 
 import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -51 +49 @@
                 support.addPostLayersTask(importData.getPostLayerTask());
 
-                GpxLayer gpxLayer = null;
-                List<SessionReader.LayerDependency> deps = support.getLayerDependencies();
-                if (!deps.isEmpty()) {
-                    Layer layer = deps.get(0).getLayer();
-                    if (layer instanceof GpxLayer) {
-                        gpxLayer = (GpxLayer) layer;
-                    }
-                }
-
-                MarkerLayer markerLayer = importData.getMarkerLayer();
-                if (markerLayer != null) {
-                    markerLayer.fromLayer = gpxLayer;
-                }
-
-                return markerLayer;
+                return importData.getMarkerLayer();
             }
         } catch (XPathExpressionException e) {

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.GraphicsEnvironment;
 import java.io.BufferedInputStream;
@@ -47 +46 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -620 +618 @@
                 }
             }
-            String colorString = el.getAttribute("color");
-            if (colorString != null) {
-                try {
-                    Color color = ColorHelper.html2color(colorString);
-                    layer.setColor(color);
-                } catch (RuntimeException ex) {
-                    Logging.warn("Cannot parse color " + colorString);
-                }
-            }
             layer.setName(names.get(entry.getKey()));
             layers.add(layer);

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -241 +240 @@
             if (!Utils.equalsEpsilon(layer.getOpacity(), 1.0)) {
                 el.setAttribute("opacity", Double.toString(layer.getOpacity()));
-            }
-            if (layer.getColor() != null) {
-                el.setAttribute("color", ColorHelper.color2html(layer.getColor()));
             }
             Set<Layer> deps = dependencies.get(layer);