Changeset 2919 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2010-02-01T21:06:09+01:00 (14 years ago)

Author:

jttt

Message:

Skip deleted nodes when loading way, deleted members when loading relation

File:

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

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

@@ -258 +258 @@
                     );
                 }
-                list.add(id);
+                if (current.deleted) {
+                    logger.info(tr("Deleted way {0} contains nodes", current.id));
+                } else {
+                    list.add(id);
+                }
 
                 // ---- PARSING RELATIONS ----
@@ -300 +304 @@
                 }
 
-                list.add(emd);
+                if (current.deleted) {
+                    logger.info(tr("Deleted relation {0} contains members", current.id));
+                } else {
+                    list.add(emd);
+                }
 
                 // ---- PARSING TAGS (applicable to all objects) ----
@@ -481 +489 @@
                     }
                 }
-                wayNodes.add(n);
+                if (n.isDeleted()) {
+                    logger.warning(tr("Deleted node {0} was removed from way {1}", id, w.getId()));
+                } else {
+                    wayNodes.add(n);
+                }
             }
             w.setNodes(wayNodes);
@@ -567 +579 @@
                     externalIdMap.put(new SimplePrimitiveId(rm.id, OsmPrimitiveType.fromApiTypeName(rm.type)), primitive);
                 }
-                relationMembers.add(new RelationMember(rm.role, primitive));
+                if (primitive.isDeleted()) {
+                    logger.warning(tr("Deleted member {0} was removed from relation {1}", primitive.getId(), relation.getId()));
+                } else {
+                    relationMembers.add(new RelationMember(rm.role, primitive));
+                }
             }
             relation.setMembers(relationMembers);