Changeset 2377 in josm for trunk/src/org

Timestamp:

2009-11-01T19:34:42+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3443: Illegal value for attribute 'version' when loading OSM file

File:

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

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

@@ -168 +168 @@
         private OsmPrimitiveData current;
         private String generator;
+
+        protected void fixLegacyVersion(Attributes atts) throws SAXException {
+            if (ds.version.equals("0.6") && atts.getValue("version") == null) {
+                throwException(
+                        tr("Mandatory attribute ''version'' missing for object with id {0}.", current.id)
+                );
+            } else if (ds.version.equals("0.5") && atts.getValue("version") == null) {
+                // legacy mode. 0.5 data might not have version attribute. Init with
+                // default value 1
+                //
+                current.version = 1;
+            }
+        }
 
         @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
@@ -214 +227 @@
                 current.latlon = new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon"));
                 readCommon(atts, current);
+                fixLegacyVersion(atts);
                 Node n = current.createNode();
                 externalIdMap.put("n"+current.id, n);
@@ -219 +233 @@
                 current = new OsmPrimitiveData();
                 readCommon(atts, current);
+                fixLegacyVersion(atts);
                 Way w = current.createWay();
                 externalIdMap.put("w"+current.id, w);
@@ -247 +262 @@
                 current = new OsmPrimitiveData();
                 readCommon(atts, current);
+                fixLegacyVersion(atts);
                 Relation r = current.createRelation();
                 externalIdMap.put("r"+current.id, r );