Changeset 10919 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-08-31T16:12:28+02:00 (8 years ago)

Author:

simon04

Message:

fix #11852 - NPE in SearchCompiler

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (1 diff)
• data/osm/Node.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1452 +1452 @@
                 LatLon coordinate = ((Node) osm).getCoor();
                 Collection<Bounds> allBounds = getBounds(osm);
-                return allBounds != null && allBounds.stream().anyMatch(bounds -> bounds.contains(coordinate));
+                return coordinate != null && allBounds != null && allBounds.stream().anyMatch(bounds -> bounds.contains(coordinate));
             } else if (osm instanceof Way) {
                 Collection<Node> nodes = ((Way) osm).getNodes();

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

@@ -73 +73 @@
     }
 
+    /**
+     * Returns lat/lon coordinates of this node, or {@code null} unless {@link #isLatLonKnown()}
+     * @return lat/lon coordinates of this node, or {@code null} unless {@link #isLatLonKnown()}
+     */
     @Override
     public LatLon getCoor() {