Changeset 6826 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-02-08T00:20:41+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9685 - validator: Incomplete test for "house number without street"

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (modified) (4 diffs)

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

@@ -83 +83 @@
     }
 
-    @Override
-    public void visit(Node n) {
-        List<Relation> associatedStreets = getAndCheckAssociatedStreets(n);
+    protected void checkHouseNumbersWithoutStreet(OsmPrimitive p) {
+        List<Relation> associatedStreets = getAndCheckAssociatedStreets(p);
         // Find house number without proper location (neither addr:street, associatedStreet, addr:place or addr:interpolation)
-        if (n.hasKey(ADDR_HOUSE_NUMBER) && !n.hasKey(ADDR_STREET) && !n.hasKey(ADDR_PLACE)) {
+        if (p.hasKey(ADDR_HOUSE_NUMBER) && !p.hasKey(ADDR_STREET) && !p.hasKey(ADDR_PLACE)) {
             for (Relation r : associatedStreets) {
                 if (r.hasTag("type", ASSOCIATED_STREET)) {
@@ -93 +92 @@
                 }
             }
-            for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+            for (Way w : OsmPrimitive.getFilteredList(p.getReferrers(), Way.class)) {
                 if (w.hasKey(ADDR_INTERPOLATION) && w.hasKey(ADDR_STREET)) {
                     return;
@@ -99 +98 @@
             }
             // No street found
-            errors.add(new AddressError(HOUSE_NUMBER_WITHOUT_STREET, n, tr("House number without street")));
-        }
+            errors.add(new AddressError(HOUSE_NUMBER_WITHOUT_STREET, p, tr("House number without street")));
+        }
+    }
+
+    @Override
+    public void visit(Node n) {
+        checkHouseNumbersWithoutStreet(n);
     }
 
     @Override
     public void visit(Way w) {
-        getAndCheckAssociatedStreets(w);
+        checkHouseNumbersWithoutStreet(w);
     }
 
     @Override
     public void visit(Relation r) {
-        getAndCheckAssociatedStreets(r);
+        checkHouseNumbersWithoutStreet(r);
         if (r.hasTag("type", ASSOCIATED_STREET)) {
             // Used to count occurences of each house number in order to find duplicates
@@ -202 +206 @@
                     }
                 } else {
-                    Main.warn("Addresses test skipped chunck "+chunk+" for street part "+streetPart+" because p1 or p2 is null"); 
+                    Main.warn("Addresses test skipped chunck "+chunk+" for street part "+streetPart+" because p1 or p2 is null");
                 }
             }