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

Timestamp:

2006-03-14T17:41:14+01:00 (18 years ago)

Author:

imi

Message:

• fixed load of action attribute (preserve changes)
• fixed exception when merging ways with different number of segments

File:

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

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

@@ -80 +80 @@
                                 n.coor = new GeoPoint(getDouble(atts, "lat"), getDouble(atts, "lon"));
                                 current = n;
+                                readCommon(atts);
                                 current.id = getLong(atts, "id");
                                 nodes.put(n.id, n);
@@ -86 +87 @@
                                                 nodes.get(getLong(atts, "from")), 
                                                 nodes.get(getLong(atts, "to")));
-                                current.id = getLong(atts, "id");
+                                readCommon(atts);
                                 lineSegments.put(current.id, (LineSegment)current);
                         } else if (qName.equals("way")) {
                                 current = new Track();
-                                current.id = getLong(atts, "id");
+                                readCommon(atts);
                         } else if (qName.equals("seg")) {
                                 if (current instanceof Track)
@@ -102 +103 @@
                         throw new SAXException("NullPointerException. Possible some missing tags.", x);
                 }
+        }
+
+        /**
+         * Read out the common attributes from atts and put them into this.current.
+         */
+        private void readCommon(Attributes atts) {
+                current.id = getLong(atts, "id");
+                String action = atts.getValue("action");
+                if ("delete".equals(action))
+                        current.setDeleted(true);
+                else if ("modify".equals(action)) {
+                        current.modified = true;
+                        current.modifiedProperties = true;
+                } else if ("modify/object".equals(action))
+                        current.modified = true;
+                else if ("modify/property".equals(action))
+                        current.modifiedProperties = true;
         }