Changeset 27 in josm

Timestamp:

2005-11-29T21:05:18+01:00 (18 years ago)

Author:

imi

Message:

Fixed osm reader to import the 0.2 api data.

Location:

src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (2 diffs)
• io/OsmReader.java (added)
• io/OsmServerReader.java (modified) (1 diff)
• io/OsmWriter.java (modified) (4 diffs)

src/org/openstreetmap/josm/actions/AboutAction.java

@@ -5 +5 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
@@ -22 +21 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
-import javax.swing.KeyStroke;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;

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

@@ -83 +83 @@
                 if (r == null)
                         return null;
-                return new GpxReader(r).parse();
+                return new OsmReader(r).parse();
         }
 

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

@@ -87 +87 @@
                 addProperties(e, t, properties);
                 for (LineSegment ls : t.segments)
-                        e.getChildren().add(new Element("segment").setAttribute("id", ""+ls.id));
+                        e.getChildren().add(new Element("segment").setAttribute("uid", ""+ls.id));
                 return e;
         }
@@ -110 +110 @@
                 Element e = new Element("segment");
                 addProperties(e, ls, properties);
-                e.setAttribute("start", ""+ls.start.id);
-                e.setAttribute("end", ""+ls.end.id);
+                e.setAttribute("from", ""+ls.start.id);
+                e.setAttribute("to", ""+ls.end.id);
                 return e;
         }
@@ -123 +123 @@
                 if (key.id == 0)
                         key.id = generateId();
-                e.setAttribute("id", ""+key.id);
+                e.setAttribute("uid", ""+key.id);
                 e.setAttribute("object", ""+osm.id);
                 e.setAttribute("key", key.name);
@@ -136 +136 @@
                 if (osm.id == 0)
                         osm.id = generateId();
-                e.setAttribute("id", ""+osm.id);
+                e.setAttribute("uid", ""+osm.id);
                 if (osm.keys != null)
                         for (Entry<Key, String> entry : osm.keys.entrySet())