Add entity to walk steps

src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java

@@ -81,6 +81,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.stepImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.stopAtDistanceImpl;
+import org.opentripplanner.apis.gtfs.model.StepEntity;
 import org.opentripplanner.apis.gtfs.model.StopPosition;
 import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation;
@@ -124,6 +125,7 @@ protected static GraphQLSchema buildSchema() {
         .type("Node", type -> type.typeResolver(new NodeTypeResolver()))
         .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver()))
         .type("StopPosition", type -> type.typeResolver(new StopPosition() {}))
+        .type("StepEntity", type -> type.typeResolver(new StepEntity() {}))
         .type("FareProduct", type -> type.typeResolver(new FareProductTypeResolver()))
         .type("AlertEntity", type -> type.typeResolver(new AlertEntityTypeResolver()))
         .type(typeWiring.build(AgencyImpl.class))

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/stepImpl.java

@@ -54,8 +54,8 @@ public DataFetcher<String> exit() {
   }
 
   @Override
-  public DataFetcher<String> entrance() {
-    return environment -> getSource(environment).getEntrance();
+  public DataFetcher<Object> entity() {
+    return environment -> getSource(environment).getEntity();
   }
 
   @Override

src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java

@@ -365,6 +365,11 @@ public interface GraphQLEmissions {
     public DataFetcher<org.opentripplanner.framework.model.Grams> co2();
   }
 
+  /** Station entrance/exit */
+  public interface GraphQLEntrance {
+    public DataFetcher<String> name();
+  }
+
   /** A 'medium' that a fare product applies to, for example cash, 'Oyster Card' or 'DB Navigator App'. */
   public interface GraphQLFareMedium {
     public DataFetcher<String> id();
@@ -977,6 +982,9 @@ public interface GraphQLRoutingError {
     public DataFetcher<GraphQLInputField> inputField();
   }
 
+  /** Entity to a step */
+  public interface GraphQLStepEntity extends TypeResolver {}
+
   /**
    * Stop can represent either a single public transport stop, where passengers can
    * board and/or disembark vehicles, or a station, which contains multiple stops.
@@ -1428,7 +1436,7 @@ public interface GraphQLStep {
 
     public DataFetcher<Iterable<org.opentripplanner.model.plan.ElevationProfile.Step>> elevationProfile();
 
-    public DataFetcher<String> entrance();
+    public DataFetcher<Object> entity();
 
     public DataFetcher<String> exit();
 

src/main/java/org/opentripplanner/apis/gtfs/model/StepEntity.java

@@ -0,0 +1,19 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import graphql.TypeResolutionEnvironment;
+import graphql.schema.GraphQLObjectType;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+
+public interface StepEntity extends GraphQLDataFetchers.GraphQLStepEntity {
+  record Entrance(String name) implements StepEntity {}
+
+  @Override
+  default GraphQLObjectType getType(TypeResolutionEnvironment env) {
+    var schema = env.getSchema();
+    Object o = env.getObject();
+    if (o instanceof Entrance) {
+      return schema.getObjectType("Entrance");
+    }
+    return null;
+  }
+}

src/main/java/org/opentripplanner/model/plan/WalkStep.java

@@ -4,6 +4,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import org.opentripplanner.apis.gtfs.model.StepEntity;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.lang.DoubleUtils;
@@ -44,7 +45,7 @@ public final class WalkStep {
   private final boolean walkingBike;
 
   private final String exit;
-  private final String entrance;
+  private final StepEntity entity;
   private final ElevationProfile elevationProfile;
   private final boolean stayOn;
 
@@ -57,7 +58,7 @@ public final class WalkStep {
     I18NString directionText,
     Set<StreetNote> streetNotes,
     String exit,
-    String entrance,
+    StepEntity entity,
     ElevationProfile elevationProfile,
     boolean bogusName,
     boolean walkingBike,
@@ -78,7 +79,7 @@ public final class WalkStep {
     this.walkingBike = walkingBike;
     this.area = area;
     this.exit = exit;
-    this.entrance = entrance;
+    this.entity = entity;
     this.elevationProfile = elevationProfile;
     this.stayOn = stayOn;
     this.edges = List.copyOf(Objects.requireNonNull(edges));
@@ -134,10 +135,10 @@ public String getExit() {
   }
 
   /**
-   * When entering or exiting a public transport station, the entrance name
+   * Entity related to a step e.g. building entrance/exit.
    */
-  public String getEntrance() {
-    return entrance;
+  public Object getEntity() {
+    return entity;
   }
 
   /**

src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java

@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Set;
 import javax.annotation.Nullable;
+import org.opentripplanner.apis.gtfs.model.StepEntity;
+import org.opentripplanner.apis.gtfs.model.StepEntity.Entrance;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.lang.DoubleUtils;
@@ -25,7 +27,7 @@ public class WalkStepBuilder {
   private RelativeDirection relativeDirection;
   private ElevationProfile elevationProfile;
   private String exit;
-  private String entrance;
+  private StepEntity entity;
   private boolean stayOn = false;
   /**
    * Distance used for appending elevation profiles
@@ -75,8 +77,8 @@ public WalkStepBuilder withExit(String exit) {
     return this;
   }
 
-  public WalkStepBuilder withEntrance(String entrance) {
-    this.entrance = entrance;
+  public WalkStepBuilder withEntrance(Entrance entrance) {
+    this.entity = entrance;
     return this;
   }
 
@@ -162,7 +164,7 @@ public WalkStep build() {
       directionText,
       streetNotes,
       exit,
-      entrance,
+      entity,
       elevationProfile,
       bogusName,
       walkingBike,

src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java

@@ -10,6 +10,7 @@
 import javax.annotation.Nonnull;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
+import org.opentripplanner.apis.gtfs.model.StepEntity.Entrance;
 import org.opentripplanner.framework.geometry.DirectionUtils;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
@@ -394,7 +395,9 @@ private void setStationEntrance(State backState) {
       entranceEdge = entranceState.getBackEdge();
     }
     if (entranceState.getVertex() instanceof StationEntranceVertex) {
-      current.withEntrance(((StationEntranceVertex) entranceState.getVertex()).getEntranceName());
+      current.withEntrance(
+        new Entrance(((StationEntranceVertex) entranceState.getVertex()).getEntranceName())
+      );
     }
   }
 

src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

@@ -2607,6 +2607,15 @@ type serviceTimeRange {
   start: Long
 }
 
+"Station entrance/exit"
+type Entrance {
+  "Name of a station entrance/exit"
+  name: String
+}
+
+"Entity to a step"
+union StepEntity = Entrance
+
 type step {
   "The cardinal (compass) direction (e.g. north, northeast) taken when engaging this step."
   absoluteDirection: AbsoluteDirection
@@ -2628,8 +2637,6 @@ type step {
   elevationProfile: [elevationProfileComponent]
   "When exiting a highway or traffic circle, the exit name/number."
   exit: String
-  "Name of entrance to a public transport station"
-  entrance: String
   "The latitude of the start of the step."
   lat: Float
   "The longitude of the start of the step."
@@ -2642,6 +2649,8 @@ type step {
   streetName: String
   "Is this step walking with a bike?"
   walkingBike: Boolean
+  "Step entity e.g. an entrance"
+  entity: StepEntity
 }
 
 type stopAtDistance implements Node {