Changeset 33512 in osm for applications/editors/josm/plugins/pt_assistant/src

Timestamp:

2017-08-22T11:11:28+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm15176 - same name stops handled + comments on the code

File:

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

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

@@ -105 +105 @@
         }
 
+        //first loop trough all the members and remove the roles
         List<RelationMember> members = new ArrayList<>();
         List<RelationMember> oldMembers = rel.getMembers();
@@ -115 +116 @@
             rel.removeMember(0);
         }
+
+        //sort the members with the built in sorting function in order to get
+        //the continuity of the ways
         members = new RelationSorter().sortMembers(members);
 
+        //divide stops and ways
         List<RelationMember> stops = new ArrayList<>();
         List<RelationMember> wayMembers = new ArrayList<>();
@@ -131 +136 @@
         }
 
-        Map<String, PTStop> stopsByName = new HashMap<>();
+        //couple together stop positions and platforms that are part of the same
+        //stop. the only way used to determine whether they are part of the same
+        //stop or not is the name. this should be improved by using also the
+        //distance
+        Map<String, List<PTStop>> stopsByName = new HashMap<>();
         List<PTStop> unnamed = new ArrayList<>();
         stops.forEach(rm -> {
@@ -137 +146 @@
             if (name != null) {
                 if (!stopsByName.containsKey(name))
-                    stopsByName.put(name, new PTStop(rm));
-                else
-                    stopsByName.get(name).addStopElement(rm);
+                    stopsByName.put(name, new ArrayList<>());
+                List<PTStop> ls = stopsByName.get(name);
+                if (ls.isEmpty()) {
+                    ls.add(new PTStop(rm));
+                } else {
+                    PTStop stp = ls.get(ls.size() - 1);
+                    if (!stp.addStopElement(rm)) {
+                        ls.add(new PTStop(rm));
+                    }
+                }
             } else {
                 unnamed.add(new PTStop(rm));
@@ -145 +161 @@
         });
 
+        //assign to each stop the corresponding way. if none is found add already
+        //the stop to the relation since it is not possible to reason on the order
         StopToWayAssigner assigner = new StopToWayAssigner(ways);
-        List<PTStop> ptstops = new ArrayList<>(stopsByName.values());
+        List<PTStop> ptstops = new ArrayList<>();
+        stopsByName.values().forEach(ptstops::addAll);
         Map<Way, List<PTStop>> wayStop = new HashMap<>();
         ptstops.forEach(stop -> {
@@ -168 +187 @@
         });
 
+        //based on the order of the ways, add the stops to the relation
         for (int i = 0; i < wayMembers.size(); i++) {
             RelationMember wm = wayMembers.get(i);
@@ -187 +207 @@
                 List<PTStop> stps = wayStop.get(curr);
                 if (stps != null) {
+                    //if for one way there are more than one stop assigned to it,
+                    //another sorting step is needed
                     if (stps.size() > 1)
                         stps = sortSameWayStops(stps, curr, prev, next);
@@ -208 +230 @@
     }
 
+    //sorts the stops that are assigned to the same way. this is done based on
+    //the distance from the previous way.
     private static List<PTStop> sortSameWayStops(List<PTStop> stps, Way way, Way prev, Way next) {
         Map<Node, List<PTStop>> closeNodes = new HashMap<>();