Changeset 2382 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-11-02T09:40:17+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) (5 diffs)

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

@@ -169 +169 @@
         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 {
@@ -227 +215 @@
                 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);
@@ -233 +220 @@
                 current = new OsmPrimitiveData();
                 readCommon(atts, current);
-                fixLegacyVersion(atts);
                 Way w = current.createWay();
                 externalIdMap.put("w"+current.id, w);
@@ -262 +248 @@
                 current = new OsmPrimitiveData();
                 readCommon(atts, current);
-                fixLegacyVersion(atts);
                 Relation r = current.createRelation();
                 externalIdMap.put("r"+current.id, r );
@@ -387 +372 @@
                 if (current.id > 0 && ds.version != null && ds.version.equals("0.6")) {
                     throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.id)));
+                } else if (current.id > 0 && ds.version != null && ds.version.equals("0.5")) {
+                    // default version in 0.5 files for existing primitives
+                    System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5"));
+                    current.version= 1;
+                } else if (current.id <= 0 && ds.version != null && ds.version.equals("0.5")) {
+                    // default version in 0.5 files for new primitives
+                    System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.5"));
+                    current.version= 0;
                 }
             }