Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/io

Timestamp:

2007-09-24T01:36:24+02:00 (18 years ago)

Author:

framm

Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

Location:

branch/0.5/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (1 diff)
• GpxWriter.java (modified) (3 diffs)
• OsmIdReader.java (modified) (1 diff)
• OsmReader.java (modified) (11 diffs)
• OsmServerReader.java (modified) (1 diff)
• OsmServerWriter.java (modified) (4 diffs)
• OsmWriter.java (modified) (5 diffs)
• XmlWriter.java (modified) (1 diff)

branch/0.5/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -103 +103 @@
                 Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
                 final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
-                String origin = Main.pref.get("osm-server.url")+"/"+Main.pref.get("osm-server.version", "0.4");
+                String origin = Main.pref.get("osm-server.url")+"/"+Main.pref.get("osm-server.version", "0.5");
                 Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
                         DataSource src = new DataSource(bounds, origin);

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -32 +31 @@
 
         /**
-         * Export the dataset to gpx. Only the physical segment structure is
-         * exported. To do this, the list of ways is processed. If a way span a 
-         * sequence of segments, this is added as one trkseg.
-         * Then, all remaining segments are added in one extra trk. Finally,
-         * all remaining nodes are added as wpt.
+         * Export the dataset to gpx.  The ways are converted to trksegs, each in
+         * a seperate trk.  Finally, all remaining nodes are added as wpt.
          */
         public static final class All implements XmlWriter.OsmWriterInterface {
@@ -106 +102 @@
                                         continue;
                                 out.println("  <trk>");
-                                Segment oldLs = null;
-                                for (Segment ls : w.segments) {
-                                        if (ls.incomplete)
-                                                continue;
-                                        // end old segemnt, if no longer match a chain
-                                        if (oldLs != null && !oldLs.to.coor.equals(ls.from.coor)) {
-                                                out.println("    </trkseg>");
-                                                writer.outputNode(oldLs.to, false);
-                                                all.remove(oldLs.to);
-                                                oldLs = null;
-                                        }
-                                        // start new segment if necessary
-                                        if (oldLs == null)
                                                 out.println("    <trkseg>");
-                                        writer.outputNode(ls.from, false);
-                                        all.remove(ls.from);
-                                        oldLs = ls;
-                                        all.remove(ls);
-                                }
-                                // write last node if there
-                                if (oldLs != null) {
-                                        writer.outputNode(oldLs.to, false);
-                                        all.remove(oldLs.to);
+                                for (Node n : w.nodes) {
+                                        writer.outputNode(n, false);
+                                        all.remove(n);
+                        }
                                         out.println("    </trkseg>");
-                                }
                                 out.println("  </trk>");
                                 all.remove(w);
-                        }
-
-                        // add remaining segments
-                        Collection<Segment> segments = new LinkedList<Segment>();
-                        for (OsmPrimitive osm : all)
-                                if (osm instanceof Segment && !((Segment)osm).incomplete)
-                                        segments.add((Segment)osm);
-                        if (!segments.isEmpty()) {
-                                out.println("  <trk>");
-                                for (Segment ls : segments) {
-                                        out.println("    <trkseg>");
-                                        writer.outputNode(ls.from, false);
-                                        all.remove(ls.from);
-                                        writer.outputNode(ls.to, false);
-                                        all.remove(ls.to);
-                                        out.println("    </trkseg>");
-                                        all.remove(ls);
-                                }
-                                out.println("  </trk>");
                         }
 

branch/0.5/src/org/openstreetmap/josm/io/OsmIdReader.java

@@ -31 +31 @@
 
         @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
-                if (qName.equals("node") || qName.equals("segment") || qName.equals("way")) {
+                if (qName.equals("node") || qName.equals("way")) {
                         try {
                                 entries.put(Long.valueOf(atts.getValue("id")), qName);

branch/0.5/src/org/openstreetmap/josm/io/OsmReader.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
@@ -44 +45 @@
  * all nodes are read and stored. Other information than nodes are stored in a raw list
  *
- * The second phase reads from the raw list all segments and create Segment objects.
- *
- * The third phase read all ways out of the remaining objects in the raw list.
+ * The second phase read all ways out of the remaining objects in the raw list.
  *
  * @author Imi
@@ -91 +90 @@
 
         /**
-         * Data structure for the remaining segment objects
-         * Maps the raw attributes to key/value pairs.
-         */
-        private Map<OsmPrimitiveData, long[]> segs = new HashMap<OsmPrimitiveData, long[]>();
+         * Used as a temporary storage for relation members, before they
+         * are resolved into pointers to real objects.
+         */
+        private static class RelationMemberData {
+                public String type;
+                public long id;
+                public RelationMember relationMember;
+        }
 
         /**
@@ -100 +103 @@
          */
         private Map<OsmPrimitiveData, Collection<Long>> ways = new HashMap<OsmPrimitiveData, Collection<Long>>();
+
+        /** 
+         * Data structure for relation objects
+         */
+        private Map<OsmPrimitiveData, Collection<RelationMemberData>> relations = new HashMap<OsmPrimitiveData, Collection<RelationMemberData>>();
 
         /** 
@@ -132 +140 @@
                                                 ds.dataSources.add(src);
                                         }
+                                        
+                                // ---- PARSING NODES AND WAYS ----
+                                        
                                 } else if (qName.equals("node")) {
                                         current = new Node(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon")));
                                         readCommon(atts, current);
                                         nodes.put(current.id, (Node)current);
-                                } else if (qName.equals("segment")) {
-                                        current = new OsmPrimitiveData();
-                                        readCommon(atts, current);
-                                        segs.put((OsmPrimitiveData)current, new long[]{getLong(atts, "from"), getLong(atts, "to")});
                                 } else if (qName.equals("way")) {
                                         current = new OsmPrimitiveData();
                                         readCommon(atts, current);
                                         ways.put((OsmPrimitiveData)current, new LinkedList<Long>());
-                                } else if (qName.equals("seg")) {
+                                } else if (qName.equals("nd")) {
                                         Collection<Long> list = ways.get(current);
                                         if (list == null)
-                                                throw new SAXException(tr("Found <seg> tag on non-way."));
-                                        long id = getLong(atts, "id");
+                                                throw new SAXException(tr("Found <nd> element in non-way."));
+                                        long id = getLong(atts, "ref");
                                         if (id == 0)
-                                                throw new SAXException(tr("Incomplete segment with id=0"));
+                                                throw new SAXException(tr("<nd> has zero ref"));
                                         list.add(id);
-                                } else if (qName.equals("tag"))
+
+                                // ---- PARSING RELATIONS ----                  
+
+                                } else if (qName.equals("relation")) {
+                                        current = new OsmPrimitiveData();
+                                        readCommon(atts, current);
+                                        relations.put((OsmPrimitiveData)current, new LinkedList<RelationMemberData>());
+                                } else if (qName.equals("member")) {
+                                        Collection<RelationMemberData> list = relations.get(current);
+                                        if (list == null)
+                                                throw new SAXException(tr("Found <member> tag on non-relation."));
+                                        RelationMemberData emd = new RelationMemberData();
+                                        emd.relationMember = new RelationMember();
+                                        emd.id = getLong(atts, "ref");
+                                        emd.type=atts.getValue("type");
+                                        emd.relationMember.role = atts.getValue("role");
+                                        
+                                        if (emd.id == 0)
+                                                throw new SAXException(tr("Incomplete <member> specification with ref=0"));
+                                        
+                                        list.add(emd);
+                                        
+                                // ---- PARSING TAGS (applicable to all objects) ----
+                                        
+                                } else if (qName.equals("tag")) {
                                         current.put(atts.getValue("k"), atts.getValue("v"));
+                                }
                         } catch (NumberFormatException x) {
                                 x.printStackTrace(); // SAXException does not chain correctly
@@ -173 +205 @@
         public OsmReader() {
                 // first add the main server version
-                allowedVersions.add(Main.pref.get("osm-server.version", "0.4"));
+                allowedVersions.add(Main.pref.get("osm-server.version", "0.5"));
                 // now also add all compatible versions
                 String[] additionalVersions = 
-                        Main.pref.get("osm-server.additional-versions", "0.3").split("/,/");
+                        Main.pref.get("osm-server.additional-versions", "").split("/,/");
+                if (additionalVersions.length == 1 && additionalVersions[0].length() == 0)
+                        additionalVersions = new String[] {};
                 allowedVersions.addAll(Arrays.asList(additionalVersions));      
         }
@@ -224 +258 @@
                         throw new SAXException(tr("Missing required attribute \"{0}\".",value));
                 return Long.parseLong(s);
-        }
-
-        private void createSegments() {
-                for (Entry<OsmPrimitiveData, long[]> e : segs.entrySet()) {
-                        Node from = findNode(e.getValue()[0]);
-                        Node to = findNode(e.getValue()[1]);
-                        if (from == null || to == null)
-                                continue; //TODO: implement support for incomplete nodes.
-                        Segment s = new Segment(from, to);
-                        e.getKey().copyTo(s);
-                        segments.put(s.id, s);
-                        adder.visit(s);
-                }
         }
 
@@ -253 +274 @@
     }
 
-        private Segment findSegment(long id) {
-                Segment s = segments.get(id);
-                if (s != null)
-                        return s;
-                for (Segment seg : references.segments)
-                        if (seg.id == id)
-                                return seg;
-                // TODO: This has to be changed to support multiple layers.
-                for (Segment seg : Main.ds.segments)
-                        if (seg.id == id)
-                                return new Segment(seg);
-                return null;
-        }
-
         private void createWays() {
                 for (Entry<OsmPrimitiveData, Collection<Long>> e : ways.entrySet()) {
                         Way w = new Way();
+                        boolean failed = false;
                         for (long id : e.getValue()) {
-                                Segment s = findSegment(id);
-                                if (s == null) {
-                                        s = new Segment(id); // incomplete line segment
-                                        adder.visit(s);
+                                Node n = findNode(id);
+                                if (n == null) {
+                                        failed = true;
+                                        break;
                                 }
-                                w.segments.add(s);
+                                w.nodes.add(n);
                         }
+                        if (failed) continue;
                         e.getKey().copyTo(w);
                         adder.visit(w);
@@ -284 +293 @@
 
         /**
-         * All read segments after phase 2.
-         */
-        private Map<Long, Segment> segments = new HashMap<Long, Segment>();
+         * Return the Way object with the given id, or null if it doesn't
+         * exist yet. This method only looks at ways stored in the data set.
+         * 
+         * @param id
+         * @return way object or null
+         */
+        private Way findWay(long id) {
+                for (Way wy : ds.ways)
+                        if (wy.id == id)
+                                return wy;
+                for (Way wy : Main.ds.ways)
+                        if (wy.id == id)
+                                return wy;
+                return null;
+        }
+
+        /**
+         * Return the Relation object with the given id, or null if it doesn't
+         * exist yet. This method only looks at relations stored in the data set.
+         * 
+         * @param id
+         * @return relation object or null
+         */
+        private Relation findRelation(long id) {
+                for (Relation e : ds.relations)
+                        if (e.id == id)
+                                return e;
+                for (Relation e : Main.ds.relations)
+                        if (e.id == id)
+                                return e;
+                return null;
+        }
+
+        /**
+         * Create relations. This is slightly different than n/s/w because 
+         * unlike other objects, relations may reference other relations; it
+         * is not guaranteed that a referenced relation will have been created
+         * before it is referenced. So we have to create all relations first,
+         * and populate them later.
+         */
+        private void createRelations() {
+                
+                // pass 1 - create all relations
+                for (Entry<OsmPrimitiveData, Collection<RelationMemberData>> e : relations.entrySet()) {
+                        Relation en = new Relation();
+                        e.getKey().copyTo(en);
+                        adder.visit(en);
+                }
+
+                // pass 2 - sort out members
+                for (Entry<OsmPrimitiveData, Collection<RelationMemberData>> e : relations.entrySet()) {
+                        Relation en = findRelation(e.getKey().id);
+                        if (en == null) throw new Error("Failed to create relation " + e.getKey().id);
+                        
+                        for (RelationMemberData emd : e.getValue()) {
+                                RelationMember em = emd.relationMember;
+                                if (emd.type.equals("node")) {
+                                        em.member = findNode(emd.id);
+                                        if (em.member == null) {
+                                                em.member = new Node(emd.id);
+                                                adder.visit((Node)em.member);
+                                        }
+                                } else if (emd.type.equals("way")) {
+                                        em.member = findWay(emd.id);
+                                        if (em.member == null) {
+                                                em.member = new Way(emd.id);
+                                                adder.visit((Way)em.member);
+                                        }
+                                } else if (emd.type.equals("relation")) {
+                                        em.member = findRelation(emd.id);
+                                        if (em.member == null) {
+                                                em.member = new Relation(emd.id);
+                                                adder.visit((Relation)em.member);
+                                        }
+                                } else {
+                                        // this is an error.
+                                }
+                                en.members.add(em);
+                        }
+                }
+        }
 
         /**
@@ -298 +385 @@
                 osm.references = ref == null ? new DataSet() : ref;
 
-                // phase 1: Parse nodes and read in raw segments and ways
+                // phase 1: Parse nodes and read in raw ways
                 InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
                 try {
@@ -314 +401 @@
 
                 try {
-                        osm.createSegments();
                         osm.createWays();
+                        osm.createRelations();
                 } catch (NumberFormatException e) {
                         e.printStackTrace();

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

@@ -30 +30 @@
          */
         protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
-                String version = Main.pref.get("osm-server.version", "0.4");
+                String version = Main.pref.get("osm-server.version", "0.5");
                 urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
                 System.out.println("download: "+urlStr);

branch/0.5/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
@@ -96 +96 @@
 
         /**
-         * Upload a segment (without the nodes).
-         */
-        public void visit(Segment ls) {
-                if (ls.id == 0 && !ls.deleted && ls.get("created_by") == null) {
-                        ls.put("created_by", "JOSM");
-                        sendRequest("PUT", "segment", ls, true);
-                } else if (ls.deleted) {
-                        sendRequest("DELETE", "segment", ls, false);
-                } else {
-                        sendRequest("PUT", "segment", ls, true);
-                }
-                processed.add(ls);
-        }
-
-        /**
-         * Upload a whole way with the complete segment id list.
+         * Upload a whole way with the complete node id list.
          */
         public void visit(Way w) {
@@ -125 +110 @@
         }
 
+        /**
+         * Upload an relation with all members.
+         */
+        public void visit(Relation e) {
+                if (e.id == 0 && !e.deleted && e.get("created_by") == null) {
+                        e.put("created_by", "JOSM");
+                        sendRequest("PUT", "relation", e, true);
+                } else if (e.deleted) {
+                        sendRequest("DELETE", "relation", e, false);
+                } else {
+                        sendRequest("PUT", "relation", e, true);
+                }
+                processed.add(e);
+        }
         /**
          * Read a long from the input stream and return it.
@@ -154 +153 @@
                         OsmPrimitive osm, boolean addBody) {
                 try {
-                        String version = Main.pref.get("osm-server.version", "0.4");
+                        String version = Main.pref.get("osm-server.version", "0.5");
                         URL url = new URL(
                                         Main.pref.get("osm-server.url") +
                                         "/" + version +
                                         "/" + urlSuffix + 
-                                        "/" + ((version.equals("0.4") && osm.id==0) ? "create":osm.id));
+                                        "/" + (osm.id==0 ? "create" : osm.id));
                         System.out.println("upload to: "+url);
                         activeConnection = (HttpURLConnection)url.openConnection();

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -37 +38 @@
                 public void header(PrintWriter out) {
                         out.print("<osm version='");
-                        out.print(Main.pref.get("osm-server.version", "0.4"));
+                        out.print(Main.pref.get("osm-server.version", "0.5"));
                         out.println("' generator='JOSM'>");
                 }
@@ -44 +45 @@
                 }
         }
+        
+        // simple helper to write the object's class to the out stream
+        private Visitor typeWriteVisitor = new Visitor() {
+                public void visit(Node n) { out.print("node"); }
+                public void visit(Way w) { out.print("way"); }
+                public void visit(Relation e) { out.print("relation"); }
+        };
         
         /**
@@ -69 +77 @@
                                 if (shouldWrite(n))
                                         writer.visit(n);
-                        for (Segment ls : ds.segments)
-                                if (shouldWrite(ls))
-                                        writer.visit(ls);
                         for (Way w : ds.ways)
                                 if (shouldWrite(w))
                                         writer.visit(w);
+                        for (Relation e : ds.relations)
+                                if (shouldWrite(e))
+                                        writer.visit(e);
         }
 
@@ -123 +131 @@
         }
 
-        public void visit(Segment ls) {
-                if (ls.incomplete)
-                        return; // Do not write an incomplete segment
-                addCommon(ls, "segment");
-                out.print(" from='"+getUsedId(ls.from)+"' to='"+getUsedId(ls.to)+"'");
-                addTags(ls, "segment", true);
-        }
-
         public void visit(Way w) {
                 addCommon(w, "way");
                 out.println(">");
-                for (Segment ls : w.segments)
-                        out.println("    <seg id='"+getUsedId(ls)+"' />");
+                for (Node n : w.nodes)
+                        out.println("    <nd ref='"+getUsedId(n)+"' />");
                 addTags(w, "way", false);
         }
+
+        public void visit(Relation e) {
+                addCommon(e, "relation");
+                out.println(">");
+                for (RelationMember em : e.members) {
+                        out.print("    <member type='");
+                        em.member.visit(typeWriteVisitor);
+                        out.println("' ref='"+getUsedId(em.member)+"' role='" + 
+                                XmlWriter.encode(em.role) + "' />");
+                }
+                addTags(e, "relation", false);
+        }
+        
 
         /**

branch/0.5/src/org/openstreetmap/josm/io/XmlWriter.java

@@ -67 +67 @@
         }
 
-
-
         /**
          * The output writer to save the values to.