Use three states for accessibility

opentripplanner · Jan 2, 2025 · 713143b · 713143b
1 parent e473061
commit 713143b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/...ication/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java b/...ication/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java
@@ -95,7 +95,7 @@ public void buildElevatorEdges(Graph graph) {
       }
       int travelTime = parseDuration(node).orElse(-1);
 
-      var wheelchair = node.getWheelchairAccessibility();
+      var wheelchair = node.wheelchairAccessibility();
 
       createElevatorHopEdges(
         onboardVertices,
@@ -138,7 +138,7 @@ public void buildElevatorEdges(Graph graph) {
 
       int travelTime = parseDuration(elevatorWay).orElse(-1);
       int levels = nodes.size();
-      var wheelchair = elevatorWay.getWheelchairAccessibility();
+      var wheelchair = elevatorWay.wheelchairAccessibility();
 
       createElevatorHopEdges(
         onboardVertices,

diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/VertexGenerator.java
@@ -104,9 +104,7 @@ IntersectionVertex getVertexForOsmNode(OsmNode node, OsmWithTags way) {
 
       if (includeOsmSubwayEntrances && node.isSubwayEntrance()) {
         String ref = node.getTag("ref");
-
-        boolean accessible = node.isTag("wheelchair", "yes");
-        iv = vertexFactory.stationEntrance(nid, coordinate, ref, accessible);
+        iv = vertexFactory.stationEntrance(nid, coordinate, ref, node.wheelchairAccessibility());
       }
 
       if (iv == null) {

diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java
@@ -139,7 +139,7 @@ public boolean isTagFalse(String tag) {
   /**
    * Returns the level of wheelchair access of the element.
    */
-  public Accessibility getWheelchairAccessibility() {
+  public Accessibility wheelchairAccessibility() {
     if (isTagTrue("wheelchair")) {
       return Accessibility.POSSIBLE;
     } else if (isTagFalse("wheelchair")) {

diff --git a/.../src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java b/.../src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java
@@ -29,7 +29,6 @@
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.TraverseMode;
 import org.opentripplanner.street.search.state.State;
-import org.opentripplanner.transit.model.basic.Accessibility;
 import org.opentripplanner.transit.model.site.Entrance;
 
 /**

diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java
@@ -13,18 +13,18 @@ public class StationEntranceVertex extends OsmVertex {
 
   private static final String FEED_ID = "osm";
   private final String code;
-  private final boolean wheelchairAccessible;
+  private final Accessibility wheelchairAccessibility;
 
   public StationEntranceVertex(
     double lat,
     double lon,
     long nodeId,
     String code,
-    boolean wheelchairAccessible
+    Accessibility wheelchairAccessibility
   ) {
     super(lat, lon, nodeId);
     this.code = code;
-    this.wheelchairAccessible = wheelchairAccessible;
+    this.wheelchairAccessibility = wheelchairAccessibility;
   }
 
   /**
@@ -44,7 +44,7 @@ public String code() {
   }
 
   public Accessibility wheelchairAccessibility() {
-    return wheelchairAccessible ? Accessibility.POSSIBLE : Accessibility.NOT_POSSIBLE;
+    return wheelchairAccessibility;
   }
 
   @Override

diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java b/application/src/main/java/org/opentripplanner/street/model/vertex/VertexFactory.java
@@ -11,6 +11,7 @@
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
 import org.opentripplanner.street.model.edge.StreetEdge;
+import org.opentripplanner.transit.model.basic.Accessibility;
 import org.opentripplanner.transit.model.site.BoardingArea;
 import org.opentripplanner.transit.model.site.Entrance;
 import org.opentripplanner.transit.model.site.PathwayNode;
@@ -98,9 +99,11 @@ public StationEntranceVertex stationEntrance(
     long nid,
     Coordinate coordinate,
     String code,
-    boolean accessible
+    Accessibility wheelchairAccessibility
   ) {
-    return addToGraph(new StationEntranceVertex(coordinate.x, coordinate.y, nid, code, accessible));
+    return addToGraph(
+      new StationEntranceVertex(coordinate.x, coordinate.y, nid, code, wheelchairAccessibility)
+    );
   }
 
   public OsmVertex osm(

diff --git a/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmWithTagsTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.osm.wayproperty.specifier.WayTestData;
+import org.opentripplanner.transit.model.basic.Accessibility;
 
 public class OsmWithTagsTest {
 
@@ -215,6 +216,20 @@ void isWheelchairAccessible() {
     assertTrue(osm3.isWheelchairAccessible());
   }
 
+  @Test
+  void wheelchairAccessibility() {
+    var osm1 = new OsmWithTags();
+    assertEquals(Accessibility.NO_INFORMATION, osm1.wheelchairAccessibility());
+
+    var osm2 = new OsmWithTags();
+    osm2.addTag("wheelchair", "no");
+    assertEquals(Accessibility.NOT_POSSIBLE, osm2.wheelchairAccessibility());
+
+    var osm3 = new OsmWithTags();
+    osm3.addTag("wheelchair", "yes");
+    assertEquals(Accessibility.POSSIBLE, osm3.wheelchairAccessibility());
+  }
+
   @Test
   void isRoutable() {
     assertFalse(WayTestData.zooPlatform().isRoutable());