Changeset 33442 in osm for applications/editors/josm/plugins

Timestamp:

2017-07-14T11:24:46+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm14977 - handle case with way conflict on the first way

File:

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

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

@@ -185 +185 @@
         }
 
-        boolean reverse = prev.firstNode().equals(way.lastNode())
-                || prev.lastNode().equals(way.lastNode());
+        boolean reverse = prev != null &&
+                (prev.firstNode().equals(way.lastNode())
+                        || prev.lastNode().equals(way.lastNode()));
 
         if (reverse)
             Collections.reverse(nodes);
+
+        List<PTStop> ret = getSortedStops(nodes, closeNodes);
+        ret.addAll(noLocationStops);
+        return ret;
+    }
+
+    private List<PTStop> getSortedStops(List<Node> nodes,
+            Map<Node, List<PTStop>> closeNodes) {
 
         List<PTStop> ret = new ArrayList<>();
@@ -208 +217 @@
         }
 
-        ret.addAll(noLocationStops);
         return ret;
     }