Changeset 5397 in josm

Timestamp:

2012-08-05T22:40:52+02:00 (12 years ago)

Author:

bastiK

Message:

fix element ordering when writing gpx (see #7927)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxExporter.java (modified) (1 diff)
• GpxReader.java (modified) (4 diffs)
• GpxWriter.java (modified) (2 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;

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

@@ -93 +93 @@
                 currentData.creator = atts.getValue("creator");
                 version = atts.getValue("version");
-                if (!equal(version, "1.0") && !equal(version, "1.1")) {
+                if (version != null && version.startsWith("1.0")) {
+                    version = "1.0";
+                } else if (!"1.1".equals(version)) {
+                    // unknown version, assume 1.1
                     version = "1.1";
                 }
-                System.err.println("Version: "+version);
+                break;
             case gpx:
                 if (qName.equals("metadata")) {
@@ -229 +232 @@
             elements.pop();
             switch (currentState) {
-            case metadata:
+            case gpx:       // GPX 1.0
+            case metadata:  // GPX 1.1
                 if (qName.equals("name")) {
                     currentData.attr.put(GpxData.META_NAME, accumulator.toString());
@@ -238 +242 @@
                 } else if (qName.equals("keywords")) {
                     currentData.attr.put(GpxData.META_KEYWORDS, accumulator.toString());
-                } else if (qName.equals("metadata")) {
+                } else if (version.equals("1.0") && qName.equals("author")) {
+                    // author is a string in 1.0, but complex element in 1.1
+                    currentData.attr.put(GpxData.META_AUTHOR_NAME, accumulator.toString());
+                } else if (version.equals("1.0") && qName.equals("email")) {
+                    currentData.attr.put(GpxData.META_AUTHOR_EMAIL, accumulator.toString());
+                } else if ((currentState == State.metadata && qName.equals("metadata")) ||
+                        (currentState == State.gpx && qName.equals("gpx"))) {
                     currentState = states.pop();
                 }
@@ -334 +344 @@
                     currentState = states.pop();
                 }
-                break;
-            case gpx:
-                currentState = states.pop();
                 break;
             default:

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

@@ -9 +9 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
@@ -61 +63 @@
     }
 
+    public static List<String> WPT_KEYS = Arrays.asList("ele", "time", "magvar", "geoidheight",
+            "name", "cmt", "desc", "src", GpxData.META_LINKS, "sym", "number", "type",
+            "fix", "sat", "hdop", "vdop", "pdop", "ageofdgpsdata", "dgpsid");
     @SuppressWarnings("unchecked")
     private void writeAttr(Map<String, Object> attr) {
-        // FIXME this loop is evil, because it does not assure the
-        // correct element order specified by the xml schema.
-        // for now it works, but future extension could get very complex and unmaintainable
-        for (Map.Entry<String, Object> ent : attr.entrySet()) {
-            String k = ent.getKey();
-            if (k.equals(GpxData.META_LINKS)) {
-                for (GpxLink link : (Collection<GpxLink>) ent.getValue()) {
-                    gpxLink(link);
+        for (String key : WPT_KEYS) {
+            Object value = attr.get(key);
+            if (value != null) {
+                if (key.equals(GpxData.META_LINKS)) {
+                    for (GpxLink link : (Collection<GpxLink>) value) {
+                        gpxLink(link);
+                    }
+                } else {
+                    simpleTag(key, value.toString());
                 }
-            } else {
-                simpleTag(k, ent.getValue().toString());
             }
         }