Changeset 66 in josm for src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2006-03-22T19:13:05+01:00 (20 years ago)

Author:

imi

Message:

fixed "segment completly out of map" - problem

File:

• src/org/openstreetmap/josm/io/OsmReader.java (modified) (3 diffs)

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

@@ -15 +15 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 import uk.co.wilson.xml.MinML2;
@@ -77 +76 @@
                                         throw new SAXException("Unknown version: "+atts.getValue("version"));
                         } else if (qName.equals("node")) {
-                                Node n = new Node();
-                                n.coor = new GeoPoint(getDouble(atts, "lat"), getDouble(atts, "lon"));
+                                Node n = new Node(new GeoPoint(getDouble(atts, "lat"), getDouble(atts, "lon")));
                                 current = n;
                                 readCommon(atts);
@@ -94 +92 @@
                         } else if (qName.equals("seg")) {
                                 if (current instanceof Way) {
-                                        LineSegment ls = lineSegments.get(getLong(atts, "id"));
-                                        if (ls == null)
-                                                fatalError(new SAXParseException("Line segment "+getLong(atts, "id")+" has not been transfered before.", null));
+                                        long id = getLong(atts, "id");
+                                        LineSegment ls = lineSegments.get(id);
+                                        if (ls == null) {
+                                                ls = new LineSegment(id); // incomplete line segment
+                                                lineSegments.put(id, ls);
+                                                adder.visit(ls);
+                                        }
                                         ((Way)current).segments.add(ls);
                                 }