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

Timestamp:

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

Author:

bastiK

Message:

fix element ordering when writing gpx (see #7927)

File:

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

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());
             }
         }