Changeset 33500 in osm for applications/editors/josm/plugins/pt_assistant

Timestamp:

2017-08-15T23:51:45+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm15100

File:

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

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

@@ -142 +142 @@
         });
 
-        Way prev = null;
-        for (RelationMember wm : wayMembers) {
+        for (int i = 0; i < wayMembers.size(); i++) {
+            RelationMember wm = wayMembers.get(i);
+            Way prev = null;
+            Way next = null;
+            if (i > 0) {
+                RelationMember wmp = wayMembers.get(i-1);
+                if (wmp.getType() == OsmPrimitiveType.WAY)
+                    prev = wmp.getWay();
+            }
+            if (i < wayMembers.size() - 1) {
+                RelationMember wmn = wayMembers.get(i+1);
+                if (wmn.getType() == OsmPrimitiveType.WAY)
+                    next = wmn.getWay();
+            }
+
             if (wm.getType() == OsmPrimitiveType.WAY) {
                 Way curr = wm.getWay();
@@ -149 +162 @@
                 if (stps != null) {
                     if (stps.size() > 1)
-                        stps = sortSameWayStops(stps, curr, prev);
+                        stps = sortSameWayStops(stps, curr, prev, next);
                     stps.forEach(stop -> {
                         if (stop != null) {
@@ -159 +172 @@
                     });
                 }
-                prev = curr;
             }
         }
@@ -166 +178 @@
     }
 
-    private List<PTStop> sortSameWayStops(List<PTStop> stps, Way way, Way prev) {
+    private List<PTStop> sortSameWayStops(List<PTStop> stps, Way way, Way prev, Way next) {
         Map<Node, List<PTStop>> closeNodes = new HashMap<>();
         List<PTStop> noLocationStops = new ArrayList<>();
@@ -182 +194 @@
         }
 
-        boolean reverse = prev != null &&
-                (prev.firstNode().equals(way.lastNode())
-                        || prev.lastNode().equals(way.lastNode()));
+        boolean reverse = false;
+
+        if (prev != null) {
+            reverse = prev.firstNode().equals(way.lastNode())
+                        || prev.lastNode().equals(way.lastNode());
+        } else if (next != null) {
+            reverse = next.firstNode().equals(way.firstNode())
+                    || next.lastNode().equals(way.firstNode());
+        }
 
         if (reverse)