Changeset 12864 in josm for trunk

Timestamp:

2017-09-15T00:06:10+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15256 - limit roundabout validation test to waynodes all in downloaded area

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (2 diffs)
• tests/Highways.java (modified) (1 diff)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.InDataSourceArea;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.NotOutsideDataSourceArea;
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
@@ -41 +42 @@
 
     protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new NotOutsideDataSourceArea();
+    protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA_STRICT = new InDataSourceArea(true);
 
     /** Name of the test */

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

@@ -95 +95 @@
     public void visit(Way w) {
         if (w.isUsable()) {
-            if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
+            if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")
+                    && IN_DOWNLOADED_AREA_STRICT.test(w)) {
                 // TODO: find out how to handle splitted roundabouts (see #12841)
                 testWrongRoundabout(w);