Changeset 9693 in josm

Timestamp:

2016-01-31T11:28:22+01:00 (8 years ago)

Author:

simon04

Message:

fix #12464 see #12464 - Regression: Validator did not longer warn about nodes without tags

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (6 diffs)
• src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (modified) (1 diff)
• test/data/regress/12464 (added)
• test/data/regress/12464/example.osm (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/UntaggedNodeTest.java (modified) (2 diffs)

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

@@ -1425 +1425 @@
         }
 
-        protected abstract Collection<Bounds> getBounds();
+        protected abstract Collection<Bounds> getBounds(OsmPrimitive primitive);
 
         @Override
@@ -1432 +1432 @@
                 return false;
             else if (osm instanceof Node) {
-                Collection<Bounds> allBounds = getBounds();
+                Collection<Bounds> allBounds = getBounds(osm);
                 if (allBounds != null) {
                     LatLon coor = ((Node) osm).getCoor();
@@ -1467 +1467 @@
 
         @Override
-        protected Collection<Bounds> getBounds() {
-            return Main.main == null || Main.main.getCurrentDataSet() == null || Main.main.getCurrentDataSet().getDataSourceArea() == null
-                    ? null : Main.main.getCurrentDataSet().getDataSourceBounds();
+        protected Collection<Bounds> getBounds(OsmPrimitive primitive) {
+            return primitive.getDataSet() != null ? primitive.getDataSet().getDataSourceBounds() : null;
         }
 
@@ -1480 +1479 @@
     /**
      * 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).
+     * Unlike {@link InDataSourceArea} this matches also if no source area is set (e.g., for new layers).
      */
     public static class NotOutsideDataSourceArea extends InDataSourceArea {
@@ -1492 +1491 @@
 
         @Override
-        protected Collection<Bounds> getBounds() {
-            final Collection<Bounds> bounds = super.getBounds();
+        protected Collection<Bounds> getBounds(OsmPrimitive primitive) {
+            final Collection<Bounds> bounds = super.getBounds(primitive);
             return bounds == null || bounds.isEmpty() ? Collections.singleton(Main.getProjection().getWorldBoundsLatLon()) : bounds;
         }
@@ -1513 +1512 @@
 
         @Override
-        protected Collection<Bounds> getBounds() {
+        protected Collection<Bounds> getBounds(OsmPrimitive primitive) {
             if (!Main.isDisplayingMapView()) {
                 return null;

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

@@ -41 +41 @@
         if (n.isUsable() && !n.isTagged() && n.getReferrers().isEmpty()) {
 
-            if (!n.hasKeys() && !IN_DOWNLOADED_AREA.evaluate(n)) {
+            if (!n.hasKeys() && IN_DOWNLOADED_AREA.evaluate(n)) {
                 String msg = marktr("No tags");
                 errors.add(new TestError(this, Severity.WARNING, ERROR_MESSAGE, tr(msg), msg, UNTAGGED_NODE_BLANK, n));

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UntaggedNodeTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.CustomMatchers.hasSize;
 import static org.CustomMatchers.isEmpty;
 import static org.junit.Assert.assertThat;
@@ -46 +47 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12464">Bug #12464</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testTicket12464() throws Exception {
+        test.initialize();
+        test.startTest(null);
+        try (InputStream fis = TestUtils.getRegressionDataStream(12464, "example.osm")) {
+            final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+            test.visit(ds.allPrimitives());
+            test.endTest();
+            assertThat(test.getErrors(), hasSize(1));
+        }
+    }
 }