Changeset 33509 in osm for applications/editors/josm/plugins/pt_assistant/src/org

Timestamp:

2017-08-21T10:53:02+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] stop sorter renamed into relation sorter and used for fixing sorting errors

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• PTAssistantPlugin.java (modified) (2 diffs)
• actions/SortPTRouteMembersAction.java (moved) (moved from applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java ) (6 diffs)
• validation/RouteChecker.java (modified) (2 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.pt_assistant.actions.EditHighlightedRelationsAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
-import org.openstreetmap.josm.plugins.pt_assistant.actions.SortPTStopsAction;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.SortPTRouteMembersAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.SplitRoundaboutAction;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -74 +74 @@
         editHighlightedRelationsMenu = MainMenu.add(Main.main.menu.toolsMenu, editHighlightedRelationsAction);
         MainMenu.add(Main.main.menu.toolsMenu, new SplitRoundaboutAction());
-        MainMenu.add(Main.main.menu.toolsMenu, new SortPTStopsAction());
+        MainMenu.add(Main.main.menu.toolsMenu, new SortPTRouteMembersAction());
         MainMenu.add(Main.main.menu.toolsMenu, new CreatePlatformNodeAction());
     }

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

@@ -36 +36 @@
 
 /**
- * Sorts the stop positions in a PT route according to the assigned ways
+ * Sorts the members of a PT route. It orders first the ways, then the stops
+ * according to the assigned ways
  *
  * @author giacomo
  *
  */
-public class SortPTStopsAction extends JosmAction {
-
-    private static final String ACTION_NAME = "Sort PT Stops";
+public class SortPTRouteMembersAction extends JosmAction {
+
+    private static final String ACTION_NAME = "Sort PT Route Members";
 
     /**
-     * Creates a new SortPTStopsAction
+     * Creates a new SortPTRouteMembersAction
      */
-    public SortPTStopsAction() {
-        super(ACTION_NAME, "icons/sortptstops", ACTION_NAME, null, true);
+    public SortPTRouteMembersAction() {
+        super(ACTION_NAME, "icons/sortptroutemembers", ACTION_NAME, null, true);
     }
 
@@ -86 +87 @@
     private void continueAfterDownload(Relation rel) {
         Relation newRel = new Relation(rel);
-        sortPTStops(newRel);
+        sortPTRouteMembers(newRel);
         Main.main.undoRedo.add(new ChangeCommand(rel, newRel));
     }
 
-    public void sortPTStops(Relation rel) {
+    /***
+     * Sort the members of the PT route.
+     *
+     * @param rel route to be sorted
+     */
+    public static void sortPTRouteMembers(Relation rel) {
+        if (!RouteUtils.isVersionTwoPTRoute(rel)) {
+            return;
+        }
+
         List<RelationMember> members = new ArrayList<>();
         List<RelationMember> oldMembers = rel.getMembers();
@@ -184 +194 @@
     }
 
-    private List<PTStop> sortSameWayStops(List<PTStop> stps, Way way, Way prev, Way next) {
+    private static List<PTStop> sortSameWayStops(List<PTStop> stps, Way way, Way prev, Way next) {
         Map<Node, List<PTStop>> closeNodes = new HashMap<>();
         List<PTStop> noLocationStops = new ArrayList<>();
@@ -218 +228 @@
     }
 
-    private List<PTStop> getSortedStops(List<Node> nodes,
+    private static List<PTStop> getSortedStops(List<Node> nodes,
             Map<Node, List<PTStop>> closeNodes) {
 
@@ -241 +251 @@
     }
 
-    private Node findClosestNode(PTStop stop, List<Node> nodes) {
+    private static Node findClosestNode(PTStop stop, List<Node> nodes) {
         EastNorth stopEN = stopEastNorth(stop);
         if (stopEN == null)
@@ -257 +267 @@
     }
 
-    private EastNorth stopEastNorth(PTStop stop) {
+    private static EastNorth stopEastNorth(PTStop stop) {
         if (stop.getStopPosition() != null)
             return stop.getStopPosition().getEastNorth();

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/RouteChecker.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionTypeCalculator;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.SortPTRouteMembersAction;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteDataManager;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTStop;
@@ -328 +329 @@
         Relation originalRelation = (Relation) primitives.iterator().next();
 
-        // separate ways from stops (because otherwise the order of
-        // stops/platforms can be messed up by the sorter:
-        List<RelationMember> members = originalRelation.getMembers();
-        final List<RelationMember> stops = new ArrayList<>();
-        final List<RelationMember> ways = new ArrayList<>();
-        for (RelationMember member : members) {
-            if (RouteUtils.isPTWay(member)) {
-                if ("".equals(member.getRole())) {
-                    ways.add(member);
-                } else {
-                    RelationMember modifiedMember = new RelationMember("", member.getWay());
-                    ways.add(modifiedMember);
-                }
-            } else { // stops:
-                if ("stop_positon".equals(member.getRole())) {
-                    // it is not expected that stop_positions could
-                    // be relations
-                    if (member.getType().equals(OsmPrimitiveType.NODE)) {
-                        RelationMember modifiedMember = new RelationMember("stop", member.getNode());
-                        stops.add(modifiedMember);
-                    } else { // if it is a primitive of type way:
-                        RelationMember modifiedMember = new RelationMember("stop", member.getWay());
-                        stops.add(modifiedMember);
-                    }
-                } else { // if it is not a stop_position:
-                    stops.add(member);
-                }
-            }
-        }
-
-        // sort the ways:
-        RelationSorter sorter = new RelationSorter();
-        List<RelationMember> sortedWays = sorter.sortMembers(ways);
-
         // create a new relation to pass to the command:
         Relation sortedRelation = new Relation(originalRelation);
-        List<RelationMember> sortedRelationMembers = new ArrayList<>(members.size());
-        for (RelationMember rm : stops) {
-            sortedRelationMembers.add(rm);
-        }
-        for (RelationMember rm : sortedWays) {
-            sortedRelationMembers.add(rm);
-        }
-        sortedRelation.setMembers(sortedRelationMembers);
-
+        SortPTRouteMembersAction.sortPTRouteMembers(sortedRelation);
         return new ChangeCommand(originalRelation, sortedRelation);
     }