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

Timestamp:

2006-03-16T19:35:44+01:00 (20 years ago)

Author:

imi

Message:

• renamed track to way
• refactored Key to be a simple String
• fixed PropertyDialog which displayed <different> for doubled values

File:

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

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

@@ -16 +16 @@
 import org.jdom.output.XMLOutputter;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Key;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.data.osm.Way;
 
 /**
@@ -27 +26 @@
  * <code>&lt;extensions&gt;</code> instead.
  * 
- * GPX-Track segments are stored as 2-node-pairs, so no &lt;trkseg&gt; with more
+ * GPX-Way segments are stored as 2-node-pairs, so no &lt;trkseg&gt; with more
  * or less than 2 &lt;trkpt&gt; are exported.
  * 
@@ -107 +106 @@
                 LinkedList<LineSegment> unrefLs = new LinkedList<LineSegment>(ds.lineSegments);
 
-                // tracks
-                for (Track t : ds.tracks) {
+                // waies
+                for (Way t : ds.waies) {
                         if (t.isDeleted() && t.id == 0)
                                 continue;
                         Element tElem = new Element("trk", GPX);
-                        HashMap<Key, String> keys = null;
+                        HashMap<String, String> keys = null;
                         if (t.keys != null) {
-                                keys = new HashMap<Key, String>(t.keys);
+                                keys = new HashMap<String, String>(t.keys);
                                 addAndRemovePropertyTag("name", tElem, keys);
                                 addAndRemovePropertyTag("cmt", tElem, keys);
@@ -136 +135 @@
                 }
                 
-                // encode pending line segments as tracks
+                // encode pending line segments as waies
                 for (LineSegment ls : unrefLs) {
                         if (ls.isDeleted() && ls.id == 0)
@@ -198 +197 @@
                 e.setAttribute("lat", Double.toString(n.coor.lat));
                 e.setAttribute("lon", Double.toString(n.coor.lon));
-                HashMap<Key, String> keys = null;
+                HashMap<String, String> keys = null;
                 if (n.keys != null) {
-                        keys = new HashMap<Key, String>(n.keys);
+                        keys = new HashMap<String, String>(n.keys);
                         addAndRemovePropertyTag("ele", e, keys);
                         addAndRemovePropertyTag("time", e, keys);
@@ -234 +233 @@
          */
         @SuppressWarnings("unchecked")
-        private void addAndRemovePropertyLinkTag(Element e, Map<Key, String> keys) {
-                Key key = Key.get("link");
-                String value = keys.get(key);
+        private void addAndRemovePropertyLinkTag(Element e, Map<String, String> keys) {
+                String value = keys.get("link");
                 if (value != null) {
                         StringTokenizer st = new StringTokenizer(value, ";");
@@ -245 +243 @@
                         link.getChildren().add(0,new Element("text", GPX).setText(st.nextToken()));
                         e.getChildren().add(link);
-                        keys.remove(key);
+                        keys.remove("link");
                 }
         }
@@ -263 +261 @@
          */
         @SuppressWarnings("unchecked")
-        private void addAndRemovePropertyTag(String name, Element e, Map<Key, String> keys) {
-                Key key = Key.get(name);
-                String value = keys.get(key);
+        private void addAndRemovePropertyTag(String name, Element e, Map<String, String> keys) {
+                String value = keys.get(name);
                 if (value != null) {
                         e.getChildren().add(new Element(name, GPX).setText(value));
-                        keys.remove(key);
+                        keys.remove(name);
                 }
         }
@@ -278 +275 @@
          */
         @SuppressWarnings("unchecked")
-        private void addPropertyExtensions(Element e, Map<Key, String> keys, OsmPrimitive osm) {
+        private void addPropertyExtensions(Element e, Map<String, String> keys, OsmPrimitive osm) {
                 LinkedList<Element> extensions = new LinkedList<Element>();
                 if (keys != null && !keys.isEmpty()) {
-                        for (Entry<Key, String> prop : keys.entrySet()) {
+                        for (Entry<String, String> prop : keys.entrySet()) {
                                 Element propElement = new Element("property", OSM);
-                                propElement.setAttribute("key", prop.getKey().name);
+                                propElement.setAttribute("key", prop.getKey());
                                 propElement.setAttribute("value", prop.getValue());
                                 extensions.add(propElement);