Changeset 53 in josm for src/org

Timestamp:

2006-02-14T21:07:29+01:00 (20 years ago)

Author:

imi

Message:

fixed bug in osm writer/reader: they did not saved the modified state of an object.

Location:

src/org/openstreetmap/josm/io

Files:

• OsmReader.java (modified) (2 diffs)
• OsmWriter.java (modified) (2 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()) {
-                                        OsmPrimitive osm = parseObject((Element)delObj, data);
-                                        if (osm != null) {
-                                                osm.visit(visitor);
-                                                osm.setDeleted(true);
-                                        }
-                                }
-                        } else {
-                                OsmPrimitive osm = parseObject(child, data);
-                                if (osm != null)
-                                        osm.visit(visitor);
-                        }
+                        OsmPrimitive osm = parseObject(child, data);
+                        if (osm != null)
+                                osm.visit(visitor);
                 }
                 
@@ -201 +191 @@
                         }
                 }
+                
+                String action = e.getAttributeValue("action");
+                if ("delete".equals(action))
+                        data.setDeleted(true);
+                else if ("modify".equals(action))
+                        data.modified = data.modifiedProperties = true;
+                else if ("modify/property".equals(action))
+                        data.modifiedProperties = true;
+                else if ("modify/object".equals(action))
+                        data.modified = true;
         }
 

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

@@ -69 +69 @@
                 List<Element> list = root.getChildren();
                 properties = new LinkedList<Element>();
-                for (OsmPrimitive osm : ds.allNonDeletedPrimitives()) {
+                for (OsmPrimitive osm : ds.allPrimitives()) {
                         osm.visit(this);
                         list.add(element);
                 }
                 list.addAll(properties);
-                properties = new LinkedList<Element>();
-                Element deleted = new Element("deleted");
-                Collection<Element> allDeleted = deleted.getChildren();
-                for (OsmPrimitive osm : ds.allPrimitives()) {
-                        if (osm.isDeleted() && osm.id != 0) {
-                                osm.visit(this);
-                                allDeleted.add(element);
-                        }
-                }
-                allDeleted.addAll(properties);
-                if (!allDeleted.isEmpty())
-                        list.add(deleted);
 
                 Document d = new Document(root);
@@ -117 +105 @@
                         for (Entry<Key, String> entry : osm.keys.entrySet())
                                 properties.add(parseProperty(osm, entry));
+                if (osm.isDeleted())
+                        e.setAttribute("action", "delete");
+                else if (osm.modified && osm.modifiedProperties)
+                        e.setAttribute("action", "modify");
+                else if (osm.modified && !osm.modifiedProperties)
+                        e.setAttribute("action", "modify/object");
+                else if (!osm.modified && osm.modifiedProperties)
+                        e.setAttribute("action", "modify/property");
         }