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

Timestamp:

2005-12-28T01:29:01+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug in UTM
• upload of nodes and segments
• fixed bugs in display the selection

File:

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

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

@@ -104 +104 @@
                 for (Object o : e.getChildren()) {
                         Element child = (Element)o;
-                        if (child.getName().equals("deleted"))
-                                for (Object delObj : child.getChildren())
-                                        data.deleted.add(parseObject((Element)delObj, data));
-                        else {
+                        if (child.getName().equals("deleted")) {
+                                for (Object delObj : child.getChildren()) {
+                                        OsmPrimitive osm = parseObject((Element)delObj, data);
+                                        if (osm != null) {
+                                                osm.visit(visitor);
+                                                osm.setDeleted(true);
+                                        }
+                                }
+                        } else {
                                 OsmPrimitive osm = parseObject(child, data);
                                 if (osm != null)
@@ -200 +205 @@
                 OsmPrimitive osm = findObject(data, id);
                 Key key = Key.get(e.getAttributeValue("key"));
-                String value =e.getAttributeValue("value");
+                String value = e.getAttributeValue("value");
                 if (value != null) {
                         if (osm.keys == null)
@@ -221 +226 @@
                         if (osm.id == id)
                                 return osm;
-                for (OsmPrimitive osm : data.deleted)
-                        if (osm.id == id)
-                                return osm;
                 throw new JDOMException("Unknown object reference: "+id);
         }