Changeset 6648 in josm for trunk/src/org

Timestamp:

2014-01-06T18:44:12+01:00 (11 years ago)

Author:

simon04

Message:

fix #9507 - Drop validation test "Crossing natural/landuse"

Location:

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

Files:

• OsmValidator.java (modified) (1 diff)
• tests/CrossingWays.java (modified) (1 diff)

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

@@ -90 +90 @@
         CrossingWays.Ways.class, // ID  601 ..  699
         CrossingWays.Boundaries.class, // ID  601 ..  699
-        CrossingWays.NaturalOrLanduse.class, // ID  601 ..  699
         CrossingWays.Barrier.class, // ID  601 ..  699
         SimilarNamedWays.class, // ID  701 ..  799

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

@@ -114 +114 @@
         String createMessage(Way w1, Way w2) {
             return tr("Crossing boundaries");
-        }
-
-        @Override
-        public void visit(Relation r) {
-            for (Way w : r.getMemberPrimitives(Way.class)) {
-                visit(w);
-            }
-        }
-    }
-
-    public static class NaturalOrLanduse extends CrossingWays {
-
-        @Override
-        public boolean isPrimitiveUsable(OsmPrimitive p) {
-            return super.isPrimitiveUsable(p) && (p.hasKey("natural") || p.hasKey("landuse"))
-                    && (!(p instanceof Relation) || (((Relation) p).isMultipolygon() && !((Relation) p).hasIncompleteMembers()));
-        }
-
-        @Override
-        boolean ignoreWaySegmentCombination(Way w1, Way w2) {
-            return false;
-        }
-
-        @Override
-        String createMessage(Way w1, Way w2) {
-            return tr("Crossing natural/landuse");
         }