Changeset 4532 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmChangeReader.java (modified) (3 diffs)
• OsmReader.java (modified) (5 diffs)

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -61 +62 @@
 
     private void parseDelete() throws XMLStreamException {
-        // Do nothing. If the object has been deleted, do not load it to avoid consistency errors.
+        parseCommon(true);
+    }
+
+    private void parseModify() throws XMLStreamException {
         parseCommon(false);
     }
 
-    private void parseModify() throws XMLStreamException {
-        parseCommon(true);
+    private void parseCreate() throws XMLStreamException {
+        parseCommon(false);
     }
 
-    private void parseCreate() throws XMLStreamException {
-        parseCommon(true);
-    }
-
-    private void parseCommon(boolean keepPrimitive) throws XMLStreamException {
+    private void parseCommon(boolean deletePrimitive) throws XMLStreamException {
         while (parser.hasNext()) {
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
+                OsmPrimitive p = null;
                 if (parser.getLocalName().equals("node")) {
-                    if (keepPrimitive) parseNode(); else doNothing();
+                    p = parseNode();
                 } else if (parser.getLocalName().equals("way")) {
-                    if (keepPrimitive) parseWay(); else doNothing();
+                    p = parseWay();
                 } else if (parser.getLocalName().equals("relation")) {
-                    if (keepPrimitive) parseRelation(); else doNothing();
+                    p = parseRelation();
                 } else {
                     parseUnknown();
+                }
+                if (p != null && deletePrimitive) {
+                    p.setDeleted(true);
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -90 +94 @@
             }
         }
-    }
-    
-    private void doNothing() throws XMLStreamException {
-        while (parser.hasNext() && parser.next() != XMLStreamConstants.END_ELEMENT);
     }
     

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;
     }