Changeset 5356 in josm

Timestamp:

2012-07-22T22:36:44+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7847, see #7884 - Fix 2 NPE when dealing with nodes without coordinates + display "(none)" in history when coordinates are missing to distinguish this fact from the deleted state (and be homogenous with conflict dialog)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DatasetConsistencyTest.java (modified) (1 diff)
• data/validation/tests/DuplicateNode.java (modified) (3 diffs)
• gui/history/CoordinateInfoViewer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

@@ -80 +80 @@
             if (!n.isIncomplete() && !n.isDeleted()) {
                 LatLon c = n.getCoor();
-                BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
-                if (!dataSet.searchNodes(box).contains(n)) {
-                    printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);
+                if (c != null) {
+                    BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
+                    if (!dataSet.searchNodes(box).contains(n)) {
+                        printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);
+                    }
                 }
             }

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -44 +44 @@
         double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);
 
-        private LatLon RoundCoord(Node o) {
+        private LatLon roundCoord(LatLon coor) {
             return new LatLon(
-                    Math.round(o.getCoor().lat() / precision) * precision,
-                    Math.round(o.getCoor().lon() / precision) * precision
+                    Math.round(coor.lat() / precision) * precision,
+                    Math.round(coor.lon() / precision) * precision
                     );
         }
@@ -54 +54 @@
         private LatLon getLatLon(Object o) {
             if (o instanceof Node) {
+                LatLon coor = ((Node) o).getCoor();
+                if (coor == null)
+                    return null;
                 if (precision==0)
-                    return ((Node) o).getCoor().getRoundedToOsmPrecision();
-                return RoundCoord((Node) o);
+                    return coor.getRoundedToOsmPrecision();
+                return roundCoord(coor);
             } else if (o instanceof List<?>) {
+                LatLon coor = ((List<Node>) o).get(0).getCoor();
+                if (coor == null)
+                    return null;
                 if (precision==0)
-                    return ((List<Node>) o).get(0).getCoor().getRoundedToOsmPrecision();
-                return RoundCoord(((List<Node>) o).get(0));
+                    return coor.getRoundedToOsmPrecision();
+                return roundCoord(coor);
             } else
                 throw new AssertionError();
@@ -67 +73 @@
         @Override
         public boolean equals(Object k, Object t) {
-            return getLatLon(k).equals(getLatLon(t));
+            LatLon coorK = getLatLon(k);
+            LatLon coorT = getLatLon(t);
+            return coorK == coorT || (coorK != null && coorT != null && coorK.equals(coorT));
         }
 
         @Override
         public int getHashCode(Object k) {
-            return getLatLon(k).hashCode();
+            LatLon coorK = getLatLon(k);
+            return coorK == null ? 0 : coorK.hashCode();
         }
     }

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

@@ -262 +262 @@
             // display the coordinates
             //
-            lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
-            lblLon.setText(coord != null ? coord.lonToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
+            lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("(none)"));
+            lblLon.setText(coord != null ? coord.lonToString(CoordinateFormat.DECIMAL_DEGREES) : tr("(none)"));
 
             // update background color to reflect differences in the coordinates
@@ -342 +342 @@
             } else {
                 lblDistance.setBackground(coord != oppositeCoord ? BGCOLOR_DIFFERENCE : Color.WHITE);
-                lblDistance.setText(tr("Deleted"));
+                lblDistance.setText(tr("(none)"));
             }
         }