Changeset 5684 in josm for trunk/src/org/openstreetmap/josm/io/GpxWriter.java

Timestamp:

2013-01-28T14:06:52+01:00 (11 years ago)

Author:

bastiK

Message:

add session support for marker layers (see #4029)

The data is exported to a separate GPX file that contains one waypoint for each marker.
This is not very elegant, because most of the time, all the info is already contained in the original GPX File.
However, when dealing with audio markers, they can be synchronized, or additional markers are added
at certain playback positions. This info must be retained.
Another complication is, that two or more MarkerLayers can be merged to one.

All these problems are avoided by explicitly exporting the markers to a separate file (as done in this commit).

File:

• trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) (8 diffs)

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.Extensions;
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -20 +22 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IWithAttributes;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -42 +45 @@
     private GpxData data;
     private String indent = "";
+    public String creator = "JOSM GPX export";
 
     private final static int WAY_POINT = 0;
@@ -49 +53 @@
     public void write(GpxData data) {
         this.data = data;
+        // We write JOSM specific meta information into gpx 'extensions' elements.
+        // In particular it is noted whether the gpx data is from the OSM server
+        // (so the rendering of clouds of anonymous TrackPoints can be improved)
+        // and some extra synchronization info for export of AudioMarkers.
+        // It is checked in advance, if any extensions are used, so we know whether
+        // a namespace declaration is necessary.
+        boolean hasExtensions = data.fromServer;
+        if (!hasExtensions) {
+            for (WayPoint wpt : data.waypoints) {
+                Extensions extensions = (Extensions) wpt.get(META_EXTENSIONS);
+                if (extensions != null && !extensions.isEmpty()) {
+                    hasExtensions = true;
+                    break;
+                }
+            }
+        }
+        
         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\"\n" +
-                (data.fromServer ? String.format("    xmlns:josm=\"%s\"\n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
+                (hasExtensions ? String.format("    xmlns:josm=\"%s\"\n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
                 "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
                 "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
@@ -63 +84 @@
     }
 
-    @SuppressWarnings("unchecked")
-    private void writeAttr(Map<String, Object> attr) {
+    private void writeAttr(IWithAttributes obj) {
         for (String key : WPT_KEYS) {
-            Object value = attr.get(key);
-            if (value != null) {
-                if (key.equals(META_LINKS)) {
-                    for (GpxLink link : (Collection<GpxLink>) value) {
+            if (key.equals(META_LINKS)) {
+                @SuppressWarnings("unchecked")
+                Collection<GpxLink> lValue = obj.getCollection(key);
+                if (lValue != null) {
+                    for (GpxLink link : lValue) {
                         gpxLink(link);
                     }
-                } else {
-                    simpleTag(key, value.toString());
+                }
+            } else if (key.equals(META_EXTENSIONS)) {
+                Extensions extensions = (Extensions) obj.get(key);
+                if (extensions != null) {
+                    gpxExtensions(extensions);
+                }
+            } else {
+                String value = obj.getString(key);
+                if (value != null) {
+                    simpleTag(key, value);
                 }
             }
@@ -157 +186 @@
         for (GpxRoute rte : data.routes) {
             openln("rte");
-            writeAttr(rte.attr);
+            writeAttr(rte);
             for (WayPoint pnt : rte.routePoints) {
                 wayPoint(pnt, ROUTE_POINT);
@@ -168 +197 @@
         for (GpxTrack trk : data.tracks) {
             openln("trk");
-            writeAttr(trk.getAttributes());
+            writeAttr(trk);
             for (GpxTrackSegment seg : trk.getSegments()) {
                 openln("trkseg");
@@ -259 +288 @@
             } else {
                 openAtt(type, coordAttr);
-                writeAttr(pnt.attr);
+                writeAttr(pnt);
                 closeln(type);
             }
         }
     }
+
+    private void gpxExtensions(Extensions extensions) {
+        if (extensions != null && !extensions.isEmpty()) {
+            openln("extensions");
+            for (Entry<String, String> e : extensions.entrySet()) {
+                simpleTag("josm:" + e.getKey(), e.getValue());
+            }
+            closeln("extensions");
+        }
+    }
 }