Changeset 9397 in josm for trunk/src/org

Timestamp:

2016-01-10T20:43:16+01:00 (8 years ago)

Author:

simon04

Message:

see #12325 - Do not exclude the test for non-downloaded datasets, fix unit test

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (2 diffs)
• data/validation/Test.java (modified) (2 diffs)

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

@@ -1468 +1468 @@
         @Override
         protected Collection<Bounds> getBounds() {
-            return Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
+            return Main.main == null || Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
                     ? null : Main.main.getCurrentDataSet().getDataSourceBounds();
         }
@@ -1475 +1475 @@
         public String toString() {
             return all ? "allindownloadedarea" : "indownloadedarea";
+        }
+    }
+
+    /**
+     * Matches objects which are not outside the source area ("downloaded area").
+     * Unlink {@link InDataSourceArea} this matches also if no source area is set (e.g., for new layers).
+     */
+    public static class NotOutsideDataSourceArea extends InDataSourceArea {
+
+        /**
+         * Constructs a new {@code NotOutsideDataSourceArea}.
+         */
+        public NotOutsideDataSourceArea() {
+            super(false);
+        }
+
+        @Override
+        protected Collection<Bounds> getBounds() {
+            final Collection<Bounds> bounds = super.getBounds();
+            return bounds == null || bounds.isEmpty() ? Collections.singleton(Main.getProjection().getWorldBoundsLatLon()) : bounds;
+        }
+
+        @Override
+        public String toString() {
+            return "NotOutsideDataSourceArea";
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.search.SearchCompiler.InDataSourceArea;
+import org.openstreetmap.josm.actions.search.SearchCompiler.NotOutsideDataSourceArea;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -39 +39 @@
 public class Test extends AbstractVisitor {
 
-    protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new InDataSourceArea(false);
+    protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new NotOutsideDataSourceArea();
 
     /** Name of the test */