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

Timestamp:

2009-10-04T00:37:05+02:00 (17 years ago)

Author:

stoecker

Message:

fixed #3649 - show node coordinates in history dialog

File:

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

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

@@ -80 +80 @@
         }
 
+        protected long getAttributeLong(Attributes attr, String name, long defaultValue) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null) {
+                return defaultValue;
+            }
+            Long l = 0l;
+            try {
+                l = Long.parseLong(v);
+            } catch(NumberFormatException e) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+            }
+            if (l < 0) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
+            }
+            return l;
+        }
+
         protected int getMandatoryAttributeInt(Attributes attr, String name) throws SAXException{
             String v = attr.getValue(name);
@@ -97 +114 @@
         }
 
+        protected double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null) {
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
+            }
+            double d = 0.0;
+            try {
+                d = Double.parseDouble(v);
+            } catch(NumberFormatException e) {
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''.", name, v));
+            }
+            return d;
+        }
+
         protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException{
             String v = attr.getValue(name);
@@ -102 +133 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
+            return v;
+        }
+
+        protected String getAttributeString(Attributes attr, String name, String defaultValue) {
+            String v = attr.getValue(name);
+            if (v == null)
+                v = defaultValue;
             return v;
         }
@@ -119 +157 @@
         protected  HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
             long id = getMandatoryAttributeLong(atts,"id");
-            long version = getMandatoryAttributeLong(atts,"version");
-            long changesetId = getMandatoryAttributeLong(atts,"changeset");
-            boolean visible= getMandatoryAttributeBoolean(atts, "visible");
-            long uid = getMandatoryAttributeLong(atts, "uid");
-            String user = getMandatoryAttributeString(atts, "user");
+            long version = getMandatoryAttributeLong(atts, "version");
+            long changesetId = getMandatoryAttributeLong(atts, "changeset");
+            boolean visible = getMandatoryAttributeBoolean(atts, "visible");
+            long uid = getAttributeLong(atts, "uid", -1);
+            String user = getAttributeString(atts, "user", tr("<anonymous>"));
             String v = getMandatoryAttributeString(atts, "timestamp");
             Date timestamp = DateUtils.fromString(v);
             HistoryOsmPrimitive primitive = null;
             if (type.equals(OsmPrimitiveType.NODE)) {
+                double lat = getMandatoryAttributeDouble(atts, "lat");
+                double lon = getMandatoryAttributeDouble(atts, "lon");
                 primitive = new HistoryNode(
-                        id,version,visible,user,uid,changesetId,timestamp
+                        id,version,visible,user,uid,changesetId,timestamp,lat,lon
                 );
             } else if (type.equals(OsmPrimitiveType.WAY)) {