Changeset 33726 in osm for applications/editors/josm

Timestamp:

2017-10-22T16:03:32+02:00 (7 years ago)

Author:

polyglot

Message:

Prepare for adding treatment of bicycle, foot and routes that are not PT v2

File:

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

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

@@ -49 +49 @@
  * point to the exit point of the roundabout.
  *
- * @author giacomo
+ * @author giacomo, polyglot
  */
 public class SplitRoundaboutAction extends JosmAction {
@@ -108 +108 @@
         MainApplication.undoRedo.add(getRemoveRoundaboutFromRelationsCommand(roundabout));
 
-        //split the roundabout on the designed nodes
+        //split the roundabout on the designated nodes
         List<Node> splitNodes = getSplitNodes(roundabout);
         SplitWayCommand result = SplitWayCommand.split(
@@ -254 +254 @@
     private Pair<Way, Way> getEntryExitWays(Relation r, Integer position) {
 
-        //the ways returned are the one exactly before and after the roundabout
+        //the ways returned are the ones exactly before and after the roundabout
         Pair<Way, Way> ret = new Pair<>(null, null);
 
@@ -268 +268 @@
     }
 
-    //split only on the nodes which might be the
-    //entry or exit point for some public transport route
+    //split on all nodes which are the
+    //entry or exit point for route relations
     public List<Node> getSplitNodes(Way roundabout) {
         Set<Node> noDuplicateSplitNodes = new HashSet<>(roundabout.getNodes());
@@ -277 +277 @@
             List<Way> parents = n.getParentWays();
             if (parents.size() == 1)
-                return true;
+                return true; // return value for removeIf, not of the method
             parents.remove(roundabout);
             for (Way parent: parents) {
                 if (!getRouteParents(parent).isEmpty()) {
-                        return false;
+                        return false; // return value for removeIf
                 }
             }
-
-            return true;
-        });
+            return true; // return value for removeIf
+            });
         return splitNodes;
     }