Changeset 33455 in osm for applications

Timestamp:

2017-07-18T13:34:16+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm14904 - sort edge ways by connectivity

File:

• applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java (modified) (5 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.dialogs.relation.sort.RelationSorter;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -30 +33 @@
 public class EdgeSelectionAction extends MapMode {
 
-    private static final String mapModeName = "Edge Selection";
+    private static final String MAP_MODE_NAME = "Edge Selection";
     private static final long serialVersionUID = 2414977774504904238L;
 
@@ -39 +42 @@
 
     public EdgeSelectionAction() {
-        super(tr(mapModeName), "edgeSelection", tr(mapModeName),
+        super(tr(MAP_MODE_NAME), "edgeSelection", tr(MAP_MODE_NAME),
                 Shortcut.registerShortcut("mapmode:edge_selection",
-                        tr("Mode: {0}", tr(mapModeName)),
+                        tr("Mode: {0}", tr(MAP_MODE_NAME)),
                         KeyEvent.VK_K, Shortcut.CTRL),
                 ImageProvider.getCursor("normal", "selection"));
@@ -80 +83 @@
 
         edge.add(initial);
+        edge = sortEdgeWays(edge);
         return edge;
+    }
+
+    private List<Way> sortEdgeWays(List<Way> edge) {
+        List<RelationMember> members =
+                edge.stream()
+                    .map(w -> new RelationMember("", w))
+                    .collect(Collectors.toList());
+        List<RelationMember> sorted = new RelationSorter().sortMembers(members);
+        return sorted.stream()
+                .map(RelationMember::getWay)
+                .collect(Collectors.toList());
     }