Changeset 5655 in josm for trunk/src/org

Timestamp:

2013-01-01T19:50:14+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8314 - Validator: handle of incomplete relation members in recent changes (relation checker and addresses)

Location:

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

Files:

• Addresses.java (modified) (2 diffs)
• RelationChecker.java (modified) (1 diff)

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

@@ -176 +176 @@
         if (centroid == null) return; // fix #8305
         double maxDistance = Main.pref.getDouble("validator.addresses.max_street_distance", 200.0);
+        boolean hasIncompleteWays = false;
         for (Way streetPart : street) {
             for (Pair<Node, Node> chunk : streetPart.getNodePairs(false)) {
@@ -184 +185 @@
                 }
             }
+            if (!hasIncompleteWays && streetPart.isIncomplete()) {
+                hasIncompleteWays = true;
+            }
         }
-        // No street segment found near this house, report error
+        // No street segment found near this house, report error on if the relation does not contain incomplete street ways (fix #8314)
+        if (hasIncompleteWays) return;
         List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(street);
         errorList.add(0, house);

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

@@ -179 +179 @@
                             for (Collection<OsmPrimitive> c : Arrays.asList(new Collection[]{ri.nodes, ri.ways, ri.relations})) {
                                 for (OsmPrimitive p : c) {
-                                    if (!r.memberExpression.match(p)) {
+                                    if (p.isUsable() && !r.memberExpression.match(p)) {
                                         wrongTypes.add(p);
                                     }