Changeset 5346 in josm

Timestamp:

Jul 17, 2012 9:34:34 AM (10 months ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/HistoryNode.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (2 diffs)
• gui/history/CoordinateInfoViewer.java (modified) (3 diffs)
• io/OsmChangesetContentParser.java (modified) (4 diffs)
• io/OsmHistoryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -15 +15 @@
  */
 public class HistoryNode extends HistoryOsmPrimitive {
-    /** the coordinates */
+    /** the coordinates. May be null for deleted nodes */
 
     private LatLon coords;

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -556 +557 @@
             sb.append(name);
         }
-        sb.append(" (")
-        .append(node.getCoords().latToString(CoordinateFormat.getDefaultFormat()))
-        .append(", ")
-        .append(node.getCoords().lonToString(CoordinateFormat.getDefaultFormat()))
-        .append(")");
+        LatLon coord = node.getCoords();
+        if (coord != null) {
+            sb.append(" (")
+            .append(coord.latToString(CoordinateFormat.getDefaultFormat()))
+            .append(", ")
+            .append(coord.lonToString(CoordinateFormat.getDefaultFormat()))
+            .append(")");
+        }
         decorateNameWithId(sb, node);
         return sb.toString();

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -256 +257 @@
             HistoryNode oppositeNode = (HistoryNode) opposite;
 
+            LatLon coord = node.getCoords();
+            LatLon oppositeCoord = oppositeNode.getCoords();
+            
             // display the coordinates
             //
-            lblLat.setText(node.getCoords().latToString(CoordinateFormat.DECIMAL_DEGREES));
-            lblLon.setText(node.getCoords().lonToString(CoordinateFormat.DECIMAL_DEGREES));
+            lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
+            lblLon.setText(coord != null ? coord.lonToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
 
             // update background color to reflect differences in the coordinates
             //
-            if (node.getCoords().lat() == oppositeNode.getCoords().lat()) {
+            if (coord == oppositeCoord || 
+                    (coord != null && oppositeCoord != null && coord.lat() == oppositeCoord.lat())) {
                 lblLat.setBackground(Color.WHITE);
             } else {
                 lblLat.setBackground(BGCOLOR_DIFFERENCE);
             }
-            if (node.getCoords().lon() == oppositeNode.getCoords().lon()) {
+            if (coord == oppositeCoord || 
+                    (coord != null && oppositeCoord != null && coord.lon() == oppositeCoord.lon())) {
                 lblLon.setBackground(Color.WHITE);
             } else {
                 lblLon.setBackground(BGCOLOR_DIFFERENCE);
             }
-
         }
 
@@ -322 +327 @@
             HistoryNode oppositeNode = (HistoryNode) opposite;
 
+            LatLon coord = node.getCoords();
+            LatLon oppositeCoord = oppositeNode.getCoords();
+            
             // update distance
             //
-            double distance = node.getCoords().greatCircleDistance(oppositeNode.getCoords());
-            if (distance > 0) {
-                lblDistance.setBackground(BGCOLOR_DIFFERENCE);
+            if (coord != null && oppositeCoord != null) {
+                double distance = coord.greatCircleDistance(oppositeCoord);
+                if (distance > 0) {
+                    lblDistance.setBackground(BGCOLOR_DIFFERENCE);
+                } else {
+                    lblDistance.setBackground(Color.WHITE);
+                }
+                lblDistance.setText(NavigatableComponent.getDistText(distance));
             } else {
-                lblDistance.setBackground(Color.WHITE);
+                lblDistance.setBackground(coord != oppositeCoord ? BGCOLOR_DIFFERENCE : Color.WHITE);
+                lblDistance.setText(tr("Deleted"));
             }
-            lblDistance.setText(NavigatableComponent.getDistText(distance));
         }
     }

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
                 );
 

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

@@ -42 +42 @@
     private final HistoryDataSet data;
 
+    // FIXME: this class has many similarities with OsmChangesetContentParser.Parser and should be merged 
     private class Parser extends DefaultHandler {
 
@@ -99 +100 @@
         }
 
-        protected Double getMandatoryAttributeDouble(Attributes attr, String name) throws SAXException{
-            String v = attr.getValue(name);
-            if (v == null) {
-                throwException(tr("Missing mandatory attribute ''{0}''.", name));
+        protected Double getAttributeDouble(Attributes attr, String name) throws SAXException{
+            String v = attr.getValue(name);
+            if (v == null) {
+                return null;
             }
             double d = 0.0;
@@ -108 +109 @@
                 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;
@@ -154 +155 @@
             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 coord = (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,coord
                 );