Changeset 7947 in josm for trunk/src

Timestamp:

2015-01-09T21:14:38+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10945 - allow several associatedStreet relations if they share the same name

File:

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

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

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -76 +78 @@
         }
         if (list.size() > 1) {
-            List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list);
-            errorList.add(0, p);
-            errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, errorList, tr("Multiple associatedStreet relations")));
+            // no warning if several relations have the same name, see #10945
+            final String name = list.get(0).get("name");
+            if (name == null || Utils.filter(list, new Predicate<Relation>() {
+                @Override
+                public boolean evaluate(Relation r) {
+                    return name.equals(r.get("name"));
+                }
+            }).size() < list.size()) {
+                List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list);
+                errorList.add(0, p);
+                errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, errorList, tr("Multiple associatedStreet relations")));
+            }
         }
         return list;