Changeset 16865 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2020-08-10T23:19:07+02:00 (4 years ago)

Author:

simon04

Message:

see #15441 - Support GpxRouteLayer in session import/export

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• GpxRoutesSessionExporter.java (added)
• GpxRoutesSessionImporter.java (added)
• GpxTracksSessionExporter.java (modified) (1 diff)
• GpxTracksSessionImporter.java (modified) (2 diffs)
• SessionReader.java (modified) (1 diff)
• SessionWriter.java (modified) (2 diffs)

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

@@ -22 +22 @@
      */
     public GpxTracksSessionExporter(GpxLayer layer) { // NO_UCD (test only)
-        super(layer, "tracks", "0.1", "gpx");
+        this(layer, "tracks");
+    }
+
+    protected GpxTracksSessionExporter(GpxLayer layer, String type) {
+        super(layer, type, "0.1", "gpx");
     }
 

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

@@ -56 +56 @@
 
                 support.addPostLayersTask(importData.getPostLayerTask());
-                return importData.getGpxLayer();
+                return getLayer(importData);
             }
 
@@ -63 +63 @@
         }
     }
+
+    protected Layer getLayer(GpxImporter.GpxImporterData importData) {
+        return importData.getGpxLayer();
+    }
 }

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

@@ -166 +166 @@
         registerSessionLayerImporter("imagery", ImagerySessionImporter.class);
         registerSessionLayerImporter("tracks", GpxTracksSessionImporter.class);
+        registerSessionLayerImporter("routes", GpxRoutesSessionImporter.class);
         registerSessionLayerImporter("geoimage", GeoImageSessionImporter.class);
         registerSessionLayerImporter("markers", MarkerSessionImporter.class);

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

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.GpxRouteLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.NoteLayer;
@@ -73 +74 @@
         registerSessionLayerExporter(WMTSLayer.class, ImagerySessionExporter.class);
         registerSessionLayerExporter(GpxLayer.class, GpxTracksSessionExporter.class);
+        registerSessionLayerExporter(GpxRouteLayer.class, GpxRoutesSessionExporter.class);
         registerSessionLayerExporter(GeoImageLayer.class, GeoImageSessionExporter.class);
         registerSessionLayerExporter(MarkerLayer.class, MarkerSessionExporter.class);