- Timestamp:
- 2015-01-09T21:14:38+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
r7937 r7947 28 28 import org.openstreetmap.josm.tools.Geometry; 29 29 import org.openstreetmap.josm.tools.Pair; 30 import org.openstreetmap.josm.tools.Predicate; 31 import org.openstreetmap.josm.tools.Utils; 30 32 31 33 /** … … 76 78 } 77 79 if (list.size() > 1) { 78 List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list); 79 errorList.add(0, p); 80 errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, errorList, tr("Multiple associatedStreet relations"))); 80 // no warning if several relations have the same name, see #10945 81 final String name = list.get(0).get("name"); 82 if (name == null || Utils.filter(list, new Predicate<Relation>() { 83 @Override 84 public boolean evaluate(Relation r) { 85 return name.equals(r.get("name")); 86 } 87 }).size() < list.size()) { 88 List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(list); 89 errorList.add(0, p); 90 errors.add(new AddressError(MULTIPLE_STREET_RELATIONS, errorList, tr("Multiple associatedStreet relations"))); 91 } 81 92 } 82 93 return list;
Note:
See TracChangeset
for help on using the changeset viewer.