Changeset 15418 in josm

Timestamp:

2019-10-05T15:51:53+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #14253 - Highlight affected relation members in role validation warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/SplitWayCommand.java (modified) (3 diffs)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/DataSetMerger.java (modified) (1 diff)
• data/osm/IRelation.java (modified) (2 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (2 diffs)
• data/validation/tests/RelationChecker.java (modified) (3 diffs)
• gui/datatransfer/RelationMemberTransferable.java (modified) (2 diffs)
• gui/dialogs/relation/sort/RelationSorter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -19 +19 @@
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -468 +467 @@
     }
 
-    static List<OsmPrimitive> findVias(Relation r, String type) {
+    static List<? extends OsmPrimitive> findVias(Relation r, String type) {
         if (type != null) {
             switch (type) {
             case "connectivity":
             case "restriction":
-                return findRelationMembers(r, "via");
+                return r.findRelationMembers("via");
             case "destination_sign":
                 // Prefer intersection over sign, see #12347
-                List<OsmPrimitive> intersections = findRelationMembers(r, "intersection");
-                return intersections.isEmpty() ? findRelationMembers(r, "sign") : intersections;
+                List<? extends OsmPrimitive> intersections = r.findRelationMembers("intersection");
+                return intersections.isEmpty() ? r.findRelationMembers("sign") : intersections;
             default:
                 break;
@@ -483 +482 @@
         }
         return Collections.emptyList();
-    }
-
-    static List<OsmPrimitive> findRelationMembers(Relation r, String role) {
-        return r.getMembers().stream().filter(rmv -> role.equals(rmv.getRole()))
-                .map(RelationMember::getMember).collect(Collectors.toList());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -23 +23 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -214 +215 @@
             for (Relation r : relations) {
                 Relation newRelation = (Relation) primMap.get(r);
-                List<RelationMember> newMembers = new ArrayList<>();
-                for (RelationMember rm : r.getMembers()) {
-                    newMembers.add(new RelationMember(rm.getRole(), primMap.get(rm.getMember())));
-                }
-                newRelation.setMembers(newMembers);
+                newRelation.setMembers(r.getMembers().stream()
+                        .map(rm -> new RelationMember(rm.getRole(), primMap.get(rm.getMember())))
+                        .collect(Collectors.toList()));
             }
             for (DataSource source : copyFrom.dataSources) {

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -274 +274 @@
                 throw new IllegalStateException(tr("Missing merge target of type {0} with id {1}",
                         sourceMember.getType(), sourceMember.getUniqueId()));
-            RelationMember newMember = new RelationMember(sourceMember.getRole(), targetMember);
-            newMembers.add(newMember);
+            newMembers.add(new RelationMember(sourceMember.getRole(), targetMember));
             if (targetMember.isDeleted() && !conflicts.hasConflictForMy(targetMember)) {
                 addConflict(new Conflict<>(targetMember, sourceMember.getMember(), true));

trunk/src/org/openstreetmap/josm/data/osm/IRelation.java

@@ -6 +6 @@
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.tools.Utils;
@@ -124 +125 @@
         return ret;
     }
+
+    /**
+     * Returns a list of relation members having the specified role.
+     * @param role role
+     * @return a list of relation members having the specified role
+     * @since 15418
+     */
+    default List<? extends IPrimitive> findRelationMembers(String role) {
+        return getMembers().stream().filter(rmv -> role.equals(rmv.getRole()))
+                .map(IRelationMember::getMember).collect(Collectors.toList());
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -543 +543 @@
         return Stream.of(members).map(RelationMember::getRole).filter(role -> !role.isEmpty()).collect(Collectors.toSet());
     }
+
+    @Override
+    public List<? extends OsmPrimitive> findRelationMembers(String role) {
+        return IRelation.super.findRelationMembers(role).stream()
+                .filter(m -> m instanceof OsmPrimitive)
+                .map(m -> (OsmPrimitive) m).collect(Collectors.toList());
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -6 +6 @@
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -100 +101 @@
         }
 
-        List<RelationMemberData> newMembers = new ArrayList<>();
-        for (RelationMember member: r.getMembers()) {
-            newMembers.add(new RelationMemberData(member.getRole(), mappedPrimitives.get(member.getMember())));
-
-        }
-        clone.setMembers(newMembers);
+        clone.setMembers(r.getMembers().stream()
+                .map(m -> new RelationMemberData(m.getRole(), mappedPrimitives.get(m.getMember())))
+                .collect(Collectors.toList()));
     }
 

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -10 +11 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -317 +319 @@
         // verify unwanted members
         for (String key : map.keySet()) {
-            boolean found = false;
-            for (Role r: allroles.keySet()) {
-                if (r.isRole(key)) {
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
+            if (allroles.keySet().stream().noneMatch(role -> role.isRole(key))) {
                 String templates = allroles.keySet().stream().map(r -> r.key).collect(Collectors.joining("/"));
+                List<OsmPrimitive> primitives = new ArrayList<>(n.findRelationMembers(key));
+                primitives.add(0, n);
 
                 if (!key.isEmpty()) {
                     errors.add(TestError.builder(this, Severity.WARNING, ROLE_UNKNOWN)
                             .message(ROLE_VERIF_PROBLEM_MSG, marktr("Role ''{0}'' is not in templates ''{1}''"), key, templates)
-                            .primitives(n)
+                            .primitives(primitives)
                             .build());
                 } else {
                     errors.add(TestError.builder(this, Severity.WARNING, ROLE_EMPTY)
                             .message(ROLE_VERIF_PROBLEM_MSG, marktr("Empty role found when expecting one of ''{0}''"), templates)
-                            .primitives(n)
+                            .primitives(primitives)
                             .build());
                 }

trunk/src/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferable.java

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -51 +52 @@
          */
         public static Data getData(Collection<RelationMember> members) {
-            final Collection<RelationMemberData> r = new ArrayList<>(members.size());
-            for (RelationMember member : members) {
-                r.add(new RelationMemberData(member.getRole(), member.getType(), member.getUniqueId()));
-            }
-            return new Data(r);
+            return new Data(members.stream()
+                    .map(m -> new RelationMemberData(m.getRole(), m.getType(), m.getUniqueId()))
+                    .collect(Collectors.toList()));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java

@@ -66 +66 @@
         @Override
         public boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m) {
-            return "address".equals(m.getRole()) || "house".equals(m.getRole());
+            return m.hasRole("address", "house");
         }