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

Timestamp:

2011-10-20T14:32:44+02:00 (14 years ago)

Author:

Don-vip

Message:

see #6653 - Import <delete> primitives as deleted primitives

File:

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

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

@@ -156 +156 @@
     }
 
-    protected void parseNode() throws XMLStreamException {
+    protected Node parseNode() throws XMLStreamException {
         NodeData nd = new NodeData();
         nd.setCoor(new LatLon(Double.parseDouble(parser.getAttributeValue(null, "lat")), Double.parseDouble(parser.getAttributeValue(null, "lon"))));
@@ -173 +173 @@
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
-                return;
-            }
-        }
-    }
-
-    protected void parseWay() throws XMLStreamException {
+                return n;
+            }
+        }
+    }
+
+    protected Way parseWay() throws XMLStreamException {
         WayData wd = new WayData();
         readCommon(wd);
@@ -206 +206 @@
         }
         ways.put(wd.getUniqueId(), nodeIds);
+        return w;
     }
 
@@ -224 +225 @@
     }
 
-    protected void parseRelation() throws XMLStreamException {
+    protected Relation parseRelation() throws XMLStreamException {
         RelationData rd = new RelationData();
         readCommon(rd);
@@ -252 +253 @@
         }
         relations.put(rd.getUniqueId(), members);
+        return r;
     }