Remove TraversalRequirements and use exactly same method in StreetEdge

mfdz · Apr 1, 2022 · db06a4f · db06a4f
1 parent fc35aff
commit db06a4f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 102 deletions.
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OpenStreetMapModule.java
@@ -30,7 +30,6 @@
 import org.opentripplanner.openstreetmap.model.OSMWay;
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 import org.opentripplanner.routing.api.request.RoutingRequest;
-import org.opentripplanner.routing.core.TraversalRequirements;
 import org.opentripplanner.routing.core.TraverseMode;
 import org.opentripplanner.routing.edgetype.AreaEdge;
 import org.opentripplanner.routing.edgetype.AreaEdgeList;
@@ -421,30 +420,32 @@ private boolean buildParkAndRideAreasForGroup(
             var creativeName = nameParkAndRideEntity(entity);
 
             // Check P+R accessibility by walking and driving.
-            TraversalRequirements walkReq = new TraversalRequirements(new RoutingRequest(
-                    TraverseMode.WALK));
-            TraversalRequirements driveReq = new TraversalRequirements(new RoutingRequest(
-                    TraverseMode.CAR));
+            RoutingRequest walkReq = new RoutingRequest(TraverseMode.WALK);
+            RoutingRequest driveReq = new RoutingRequest(TraverseMode.CAR);
             boolean walkAccessibleIn = false;
             boolean carAccessibleIn = false;
             boolean walkAccessibleOut = false;
             boolean carAccessibleOut = false;
             for (VertexAndName access : accessVertices) {
                 var accessVertex = access.getVertex();
                 for (Edge incoming : accessVertex.getIncoming()) {
-                    if (incoming instanceof StreetEdge) {
-                        if (walkReq.canBeTraversed((StreetEdge)incoming))
+                    if (incoming instanceof StreetEdge streetEdge) {
+                        if (streetEdge.canTraverse(walkReq, TraverseMode.WALK)) {
                             walkAccessibleIn = true;
-                        if (driveReq.canBeTraversed((StreetEdge)incoming))
+                        }
+                        if (streetEdge.canTraverse(driveReq, TraverseMode.CAR)) {
                             carAccessibleIn = true;
+                        }
                     }
                 }
                 for (Edge outgoing : accessVertex.getOutgoing()) {
-                    if (outgoing instanceof StreetEdge) {
-                        if (walkReq.canBeTraversed((StreetEdge)outgoing))
+                    if (outgoing instanceof StreetEdge streetEdge) {
+                        if (streetEdge.canTraverse(walkReq, TraverseMode.WALK)) {
                             walkAccessibleOut = true;
-                        if (driveReq.canBeTraversed((StreetEdge)outgoing))
+                        }
+                        if (streetEdge.canTraverse(driveReq, TraverseMode.CAR)) {
                             carAccessibleOut = true;
+                        }
                     }
                 }
             }

diff --git a/src/main/java/org/opentripplanner/routing/core/TraversalRequirements.java b/src/main/java/org/opentripplanner/routing/core/TraversalRequirements.java
diff --git a/src/main/java/org/opentripplanner/routing/edgetype/StreetEdge.java b/src/main/java/org/opentripplanner/routing/edgetype/StreetEdge.java
@@ -218,7 +218,7 @@ public boolean canTraverse(TraverseModeSet modes) {
      * @param mode
      * @return
      */
-    private boolean canTraverse(RoutingRequest options, TraverseMode mode) {
+    public boolean canTraverse(RoutingRequest options, TraverseMode mode) {
         if (mode.isWalking() && options.wheelchairAccessible) {
             if (!isWheelchairAccessible()) {
                 return false;