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

Timestamp:

2017-08-22T10:48:30+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm15176 - null assigned way handled

File:

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

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

@@ -150 +150 @@
         ptstops.forEach(stop -> {
             Way way = assigner.get(stop);
+            if (way == null) {
+                addStopToRelation(rel, stop);
+            }
             if (!wayStop.containsKey(way))
                 wayStop.put(way, new ArrayList<PTStop>());
@@ -157 +160 @@
         unnamed.forEach(stop -> {
             Way way = assigner.get(stop);
+            if (way == null) {
+                addStopToRelation(rel, stop);
+            }
             if (!wayStop.containsKey(way))
                 wayStop.put(way, new ArrayList<PTStop>());
@@ -185 +191 @@
                     stps.forEach(stop -> {
                         if (stop != null) {
-                            if (stop.getStopPositionRM() != null)
-                                rel.addMember(stop.getStopPositionRM());
-                            if (stop.getPlatformRM() != null)
-                                rel.addMember(stop.getPlatformRM());
+                            addStopToRelation(rel, stop);
                         }
                     });
@@ -196 +199 @@
 
         wayMembers.forEach(rel::addMember);
+    }
+
+    private static void addStopToRelation(Relation rel, PTStop stop) {
+        if (stop.getStopPositionRM() != null)
+            rel.addMember(stop.getStopPositionRM());
+        if (stop.getPlatformRM() != null)
+            rel.addMember(stop.getPlatformRM());
     }