Changeset 5346 in josm for trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java

Timestamp:

2012-07-17T09:34:34+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7867, see #7505, see #7847 - Handle deleted nodes without coordinates in history

File:

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

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

@@ -44 +44 @@
     private ChangesetDataSet data;
 
+    // FIXME: this class has many similarities with OsmHistoryReader.Parser and should be merged 
     private class Parser extends DefaultHandler {
 
@@ -103 +104 @@
         }
 
-        protected Double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
+        protected Double getAttributeDouble(Attributes attr, String name) throws SAXException{
             String v = attr.getValue(name);
             if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
+                return null;
             }
             double d = 0.0;
@@ -112 +113 @@
                 d = Double.parseDouble(v);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''.", name, v));
+                throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
             }
             return d;
@@ -160 +161 @@
             HistoryOsmPrimitive primitive = null;
             if (type.equals(OsmPrimitiveType.NODE)) {
-                double lat = getMandatoryAttributeDouble(atts, "lat");
-                double lon = getMandatoryAttributeDouble(atts, "lon");
+                Double lat = getAttributeDouble(atts, "lat");
+                Double lon = getAttributeDouble(atts, "lon");
+                LatLon coor = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
                 primitive = new HistoryNode(
-                        id,version,visible,user,changesetId,timestamp, new LatLon(lat,lon)
+                        id,version,visible,user,changesetId,timestamp,coor
                 );