Changeset 33427 in osm for applications/editors/josm

Timestamp:

2017-07-06T13:01:55+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] roundabout splitter splits on any type of route relation

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• actions/SplitRoundaboutAction.java (modified) (3 diffs)
• utils/RouteUtils.java (modified) (1 diff)

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

@@ -123 +123 @@
         List<Relation> parents = getPTRouteParents(roundabout);
         parents.removeIf(r -> !r.hasIncompleteMembers());
-        if(parents.isEmpty())
+        if(parents.isEmpty()) {
             continueAfterDownload(roundabout);
+            return;
+        }
 
         Future <?>future = Main.worker.submit(new DownloadRelationMemberTask(
@@ -247 +249 @@
             parents.remove(roundabout);
             for(Way parent: parents) {
-                if(!getPTRouteParents(parent).isEmpty()) {
+                if(!getRouteParents(parent).isEmpty()) {
                         return false;
                 }
@@ -292 +294 @@
                 roundabout.getReferrers(), Relation.class);
         referrers.removeIf(r -> !RouteUtils.isPTRoute(r));
+        return referrers;
+    }
+
+    private List<Relation> getRouteParents(Way roundabout) {
+        List <Relation> referrers = OsmPrimitive.getFilteredList(
+                roundabout.getReferrers(), Relation.class);
+        referrers.removeIf(r -> !RouteUtils.isRoute(r));
         return referrers;
     }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -72 +72 @@
     }
 
+    public static boolean isRoute(Relation r) {
+        return r.get("route") != null;
+    }
+
     /**
      * Checks if the relation member refers to a stop in a public transport