Changeset 5356 in josm for trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

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)

File:

• trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) (1 diff)

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