Changeset 15361 in josm for trunk

Timestamp:

2019-09-19T15:26:23+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18147, see #18006 - sort from/via/to members of restriction-alike relations

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Relation.java (modified) (2 diffs)
• gui/dialogs/relation/sort/RelationSorter.java (modified) (9 diffs)

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

@@ -12 +12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
@@ -540 +541 @@
      */
     public Set<String> getMemberRoles() {
-        Set<String> result = new HashSet<>();
-        for (RelationMember rm : members) {
-            String role = rm.getRole();
-            if (!role.isEmpty()) {
-                result.add(role);
-            }
-        }
-        return result;
+        return Stream.of(members).map(RelationMember::getRole).filter(role -> !role.isEmpty()).collect(Collectors.toSet());
     }
 }

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

@@ -5 +5 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -11 +12 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -26 +28 @@
 
     private interface AdditionalSorter {
-        boolean acceptsMember(RelationMember m);
+        boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m);
 
         List<RelationMember> sortMembers(List<RelationMember> list);
@@ -35 +37 @@
         new AssociatedStreetRoleStreetSorter(),
         new AssociatedStreetRoleAddressHouseSorter(),
-        new PublicTransportRoleStopPlatformSorter()
+        new PublicTransportRoleStopPlatformSorter(),
+        new FromViaToSorter()
     );
 
@@ -45 +48 @@
 
         @Override
-        public boolean acceptsMember(RelationMember m) {
+        public boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m) {
             return "street".equals(m.getRole());
         }
@@ -62 +65 @@
 
         @Override
-        public boolean acceptsMember(RelationMember m) {
+        public boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m) {
             return "address".equals(m.getRole()) || "house".equals(m.getRole());
         }
@@ -90 +93 @@
 
         @Override
-        public boolean acceptsMember(RelationMember m) {
+        public boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m) {
             return m.getRole() != null && (m.getRole().startsWith("platform") || m.getRole().startsWith("stop"));
         }
@@ -133 +136 @@
 
     /**
+     * Class that sorts the {@code from}, {@code via} and {@code to} members of
+     * {@code type=restriction} relations.
+     */
+    private static class FromViaToSorter implements AdditionalSorter {
+
+        private static final List<String> ROLES = Arrays.asList("from", "via", "to");
+
+        @Override
+        public boolean acceptsMember(List<RelationMember> relationMembers, RelationMember m) {
+            return ROLES.contains(m.getRole())
+                    && relationMembers.stream().map(RelationMember::getRole).collect(Collectors.toSet()).containsAll(ROLES);
+        }
+
+        @Override
+        public List<RelationMember> sortMembers(List<RelationMember> list) {
+            list.sort(Comparator.comparingInt(m -> ROLES.indexOf(m.getRole())));
+            return list;
+        }
+    }
+
+    /**
      * Sort a collection of relation members by the way they are linked.
      *
@@ -150 +174 @@
             boolean wasAdded = false;
             for (AdditionalSorter sorter : ADDITIONAL_SORTERS) {
-                if (sorter.acceptsMember(m)) {
+                if (sorter.acceptsMember(relationMembers, m)) {
                     wasAdded = customMap.computeIfAbsent(sorter, k -> new LinkedList<>()).add(m);
                     break;