Changeset 8495 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2015-06-19T19:20:50+02:00 (9 years ago)

Author:

simon04

Message:

fix #11150 - False validator warning on ford if node is outside the downloaded area and highway or waterway is not loaded

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (2 diffs)

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

@@ -1302 +1302 @@
      * Matches objects within source area ("downloaded area").
      */
-    private static class InDataSourceArea extends InArea {
+    public static class InDataSourceArea extends InArea {
 
         public InDataSourceArea(boolean all) {
@@ -1310 +1310 @@
         @Override
         protected Bounds getBounds() {
-            return new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D());
+            return Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
+                    ? null : new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D());
         }
     }