Add StreetDetailsService for storing level and incline information for edges

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -25,6 +25,7 @@
 import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
+import org.opentripplanner.service.streetdetails.StreetDetailsService;
 import org.opentripplanner.street.model.vertex.TransitStopVertex;
 import org.opentripplanner.transit.api.request.TripRequest;
 import org.opentripplanner.transit.model.filter.expr.Matcher;
@@ -61,6 +62,7 @@ public class FlexRouter {
   public FlexRouter(
     Graph graph,
     TransitService transitService,
+    StreetDetailsService streetDetailsService,
     FlexParameters flexParameters,
     TripRequest filterRequest,
     Instant requestedTime,
@@ -85,6 +87,7 @@ public FlexRouter(
       transitService::getRegularStop,
       transitService.getTimeZone(),
       graph.streetNotesService,
+      streetDetailsService,
       graph.ellipsoidToGeoidDifference
     );
 

application/src/main/java/org/opentripplanner/apis/gtfs/SchemaFactory.java

@@ -26,6 +26,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.DepartureRowImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.DependentFareProductImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.EntranceImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.EscalatorUseImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.EstimatedTimeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.FareProductTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.FareProductUseImpl;
@@ -54,6 +55,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.RouteImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RouteTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RoutingErrorImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.StairsUseImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StepFeatureTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.StopCallImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopGeometriesImpl;
@@ -208,6 +210,8 @@ public static GraphQLSchema createSchema() {
         .type(typeWiring.build(EstimatedTimeImpl.class))
         .type(typeWiring.build(EntranceImpl.class))
         .type(typeWiring.build(RentalVehicleFuelImpl.class))
+        .type(typeWiring.build(EscalatorUseImpl.class))
+        .type(typeWiring.build(StairsUseImpl.class))
         .build();
 
       SchemaGenerator schemaGenerator = new SchemaGenerator();

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/EscalatorUseImpl.java

@@ -0,0 +1,35 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.schema.DataFetcher;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVerticalDirection;
+import org.opentripplanner.apis.gtfs.mapping.VerticalDirectionMapper;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.EscalatorUse;
+import org.opentripplanner.service.streetdetails.model.Level;
+
+public class EscalatorUseImpl implements GraphQLDataFetchers.GraphQLEscalatorUse {
+
+  @Override
+  public DataFetcher<Level> from() {
+    return environment -> {
+      EscalatorUse escalatorUse = environment.getSource();
+      return escalatorUse.from();
+    };
+  }
+
+  @Override
+  public DataFetcher<Level> to() {
+    return environment -> {
+      EscalatorUse escalatorUse = environment.getSource();
+      return escalatorUse.to();
+    };
+  }
+
+  @Override
+  public DataFetcher<GraphQLVerticalDirection> verticalDirection() {
+    return environment -> {
+      EscalatorUse escalatorUse = environment.getSource();
+      return VerticalDirectionMapper.map(escalatorUse.verticalDirection());
+    };
+  }
+}

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StairsUseImpl.java

@@ -0,0 +1,35 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.schema.DataFetcher;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVerticalDirection;
+import org.opentripplanner.apis.gtfs.mapping.VerticalDirectionMapper;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.StairsUse;
+import org.opentripplanner.service.streetdetails.model.Level;
+
+public class StairsUseImpl implements GraphQLDataFetchers.GraphQLStairsUse {
+
+  @Override
+  public DataFetcher<Level> from() {
+    return environment -> {
+      StairsUse stairsUse = environment.getSource();
+      return stairsUse.from();
+    };
+  }
+
+  @Override
+  public DataFetcher<Level> to() {
+    return environment -> {
+      StairsUse stairsUse = environment.getSource();
+      return stairsUse.to();
+    };
+  }
+
+  @Override
+  public DataFetcher<GraphQLVerticalDirection> verticalDirection() {
+    return environment -> {
+      StairsUse stairsUse = environment.getSource();
+      return VerticalDirectionMapper.map(stairsUse.verticalDirection());
+    };
+  }
+}

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StepFeatureTypeResolver.java

@@ -4,6 +4,8 @@
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.TypeResolver;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.EscalatorUse;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.StairsUse;
 import org.opentripplanner.transit.model.site.Entrance;
 
 public class StepFeatureTypeResolver implements TypeResolver {
@@ -15,6 +17,10 @@ public GraphQLObjectType getType(TypeResolutionEnvironment environment) {
 
     if (o instanceof Entrance) {
       return schema.getObjectType("Entrance");
+    } else if (o instanceof EscalatorUse) {
+      return schema.getObjectType("EscalatorUse");
+    } else if (o instanceof StairsUse) {
+      return schema.getObjectType("StairsUse");
     }
     return null;
   }

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

@@ -10,6 +10,9 @@
 import org.opentripplanner.apis.gtfs.mapping.StreetNoteMapper;
 import org.opentripplanner.model.plan.leg.ElevationProfile.Step;
 import org.opentripplanner.model.plan.walkstep.WalkStep;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.EscalatorUse;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.StairsUse;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalTransportationUse;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 
 public class stepImpl implements GraphQLDataFetchers.GraphQLStep {
@@ -57,7 +60,22 @@ public DataFetcher<String> exit() {
 
   @Override
   public DataFetcher<Object> feature() {
-    return environment -> getSource(environment).entrance().orElse(null);
+    return environment -> {
+      WalkStep walkStep = getSource(environment);
+      if (walkStep.entrance().isPresent()) {
+        return walkStep.entrance().get();
+      } else if (walkStep.verticalTransportationUse().isPresent()) {
+        VerticalTransportationUse verticalTransportationUse = walkStep
+          .verticalTransportationUse()
+          .get();
+        if (verticalTransportationUse instanceof EscalatorUse escalatorUse) {
+          return escalatorUse;
+        } else if (verticalTransportationUse instanceof StairsUse stairsUse) {
+          return stairsUse;
+        }
+      }
+      return null;
+    };
   }
 
   @Override

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

@@ -23,6 +23,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVerticalDirection;
 import org.opentripplanner.apis.gtfs.model.CallRealTime;
 import org.opentripplanner.apis.gtfs.model.CallSchedule;
 import org.opentripplanner.apis.gtfs.model.CallScheduledTime;
@@ -54,6 +55,7 @@
 import org.opentripplanner.routing.graphfinder.PlaceAtDistance;
 import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
 import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopRelationship;
+import org.opentripplanner.service.streetdetails.model.Level;
 import org.opentripplanner.service.vehicleparking.model.VehicleParking;
 import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces;
 import org.opentripplanner.service.vehicleparking.model.VehicleParkingState;
@@ -389,6 +391,13 @@ public interface GraphQLDepartureRow {
     public DataFetcher<Iterable<TripTimeOnDate>> stoptimes();
   }
 
+  /**
+   * A (possibly discounted) fare product that requires another fare product to be purchased previously
+   * in order to be valid.
+   *
+   * For example, when taking the train into a city, you might get a discounted "transfer fare" when
+   * switching to the bus for the second leg.
+   */
   public interface GraphQLDependentFareProduct {
     public DataFetcher<Iterable<FareOffer>> dependencies();
 
@@ -420,6 +429,15 @@ public interface GraphQLEntrance {
     > wheelchairAccessible();
   }
 
+  /** A single use of an escalator. */
+  public interface GraphQLEscalatorUse {
+    public DataFetcher<Level> from();
+
+    public DataFetcher<Level> to();
+
+    public DataFetcher<GraphQLVerticalDirection> verticalDirection();
+  }
+
   /** Real-time estimates for an arrival or departure at a certain place. */
   public interface GraphQLEstimatedTime {
     public DataFetcher<java.time.Duration> delay();
@@ -614,6 +632,13 @@ public interface GraphQLLegTime {
     public DataFetcher<java.time.OffsetDateTime> scheduledTime();
   }
 
+  /** A level with a name and comparable number. Levels can sometimes contain half levels, e.g. '1.5'. */
+  public interface GraphQLLevel {
+    public DataFetcher<Double> level();
+
+    public DataFetcher<String> name();
+  }
+
   /** A span of time. */
   public interface GraphQLLocalTimeSpan {
     public DataFetcher<Integer> from();
@@ -642,7 +667,7 @@ public interface GraphQLLocation {
   }
 
   /**
-   * A group of fixed stops that are visited in an arbitrary order.
+   * A group of fixed stops that is visited in an arbitrary order.
    *
    * This is mostly used by demand-responsive services.
    */
@@ -1099,6 +1124,15 @@ public interface GraphQLRoutingError {
     public DataFetcher<GraphQLInputField> inputField();
   }
 
+  /** A single use of a set of stairs. */
+  public interface GraphQLStairsUse {
+    public DataFetcher<Level> from();
+
+    public DataFetcher<Level> to();
+
+    public DataFetcher<GraphQLVerticalDirection> verticalDirection();
+  }
+
   /** A feature for a step */
   public interface GraphQLStepFeature extends TypeResolver {}
 
@@ -1281,7 +1315,7 @@ public interface GraphQLTicketType {
     public DataFetcher<Iterable<String>> zones();
   }
 
-  /** A time window when a vehicle visit a stop, area or group of stops. */
+  /** A time window when a vehicle visits a stop, area or group of stops. */
   public interface GraphQLTimeWindow {
     public DataFetcher<java.time.OffsetDateTime> end();
 

application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java

@@ -777,6 +777,15 @@ public void setGraphQLFilter(GraphQLDependentFareProductFilter filter) {
     }
   }
 
+  /**
+   * Dependent fare products can lead to many combinations of fares, however it is often not useful
+   * information to the passenger.
+   *
+   * This enum allows filtering of the dependencies.
+   *
+   * Since it is recognised that this is not covered well in the specification, it is discussed here:
+   * https://github.com/google/transit/pull/423
+   */
   public enum GraphQLDependentFareProductFilter {
     ALL,
     MATCH_CATEGORY_AND_MEDIUM,
@@ -4452,6 +4461,7 @@ public enum GraphQLRelativeDirection {
     DEPART,
     ELEVATOR,
     ENTER_STATION,
+    ESCALATOR,
     EXIT_STATION,
     FOLLOW_SIGNS,
     HARD_LEFT,
@@ -4460,6 +4470,7 @@ public enum GraphQLRelativeDirection {
     RIGHT,
     SLIGHTLY_LEFT,
     SLIGHTLY_RIGHT,
+    STAIRS,
     UTURN_LEFT,
     UTURN_RIGHT,
   }
@@ -5683,6 +5694,12 @@ public enum GraphQLVertexType {
     TRANSIT,
   }
 
+  /** The vertical direction e.g. for a set of stairs. */
+  public enum GraphQLVerticalDirection {
+    DOWN,
+    UP,
+  }
+
   public static class GraphQLWalkPreferencesInput {
 
     private org.opentripplanner.framework.model.Cost boardCost;

application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml

@@ -74,6 +74,7 @@ config:
     Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary
     Leg: org.opentripplanner.model.plan.Leg#Leg
     LegTime: org.opentripplanner.model.plan.leg.LegCallTime#LegCallTime
+    Level: org.opentripplanner.service.streetdetails.model.Level#Level
     Mode: String
     OccupancyStatus: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOccupancyStatus#GraphQLOccupancyStatus
     TransitMode: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode#GraphQLTransitMode
@@ -112,6 +113,7 @@ config:
     VehicleParkingSpaces: org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces#VehicleParkingSpaces
     VehicleParkingState: org.opentripplanner.service.vehicleparking.model.VehicleParkingState#VehicleParkingState
     VertexType: String
+    VerticalDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVerticalDirection#GraphQLVerticalDirection
     SystemNotice: org.opentripplanner.model.SystemNotice#SystemNotice
     VehiclePosition: org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle#RealtimeVehicle
     StopRelationship: org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopRelationship#StopRelationship

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectionMapper.java

@@ -33,6 +33,8 @@ public static GraphQLRelativeDirection map(RelativeDirection relativeDirection)
       case CIRCLE_CLOCKWISE -> GraphQLRelativeDirection.CIRCLE_CLOCKWISE;
       case CIRCLE_COUNTERCLOCKWISE -> GraphQLRelativeDirection.CIRCLE_COUNTERCLOCKWISE;
       case ELEVATOR -> GraphQLRelativeDirection.ELEVATOR;
+      case ESCALATOR -> GraphQLRelativeDirection.ESCALATOR;
+      case STAIRS -> GraphQLRelativeDirection.STAIRS;
       case UTURN_LEFT -> GraphQLRelativeDirection.UTURN_LEFT;
       case UTURN_RIGHT -> GraphQLRelativeDirection.UTURN_RIGHT;
       case ENTER_STATION -> GraphQLRelativeDirection.ENTER_STATION;

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/VerticalDirectionMapper.java

@@ -0,0 +1,14 @@
+package org.opentripplanner.apis.gtfs.mapping;
+
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVerticalDirection;
+import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalDirection;
+
+public class VerticalDirectionMapper {
+
+  public static GraphQLVerticalDirection map(VerticalDirection verticalDirection) {
+    return switch (verticalDirection) {
+      case DOWN -> GraphQLVerticalDirection.DOWN;
+      case UP -> GraphQLVerticalDirection.UP;
+    };
+  }
+}

application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RelativeDirectionMapper.java

@@ -21,6 +21,8 @@ public static RelativeDirection map(RelativeDirection relativeDirection) {
         CIRCLE_CLOCKWISE,
         CIRCLE_COUNTERCLOCKWISE,
         ELEVATOR,
+        ESCALATOR,
+        STAIRS,
         UTURN_LEFT,
         UTURN_RIGHT,
         ENTER_STATION,

application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java

@@ -269,6 +269,8 @@ public class EnumTypes {
     .value("circleClockwise", RelativeDirection.CIRCLE_CLOCKWISE)
     .value("circleCounterclockwise", RelativeDirection.CIRCLE_COUNTERCLOCKWISE)
     .value("elevator", RelativeDirection.ELEVATOR)
+    .value("escalator", RelativeDirection.ESCALATOR)
+    .value("stairs", RelativeDirection.STAIRS)
     .value("uturnLeft", RelativeDirection.UTURN_LEFT)
     .value("uturnRight", RelativeDirection.UTURN_RIGHT)
     .value("enterStation", RelativeDirection.ENTER_STATION)

application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java

@@ -24,6 +24,7 @@
 import org.opentripplanner.routing.fares.FareServiceFactory;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.service.osminfo.OsmInfoGraphBuildRepository;
+import org.opentripplanner.service.streetdetails.StreetDetailsRepository;
 import org.opentripplanner.service.vehicleparking.VehicleParkingRepository;
 import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository;
 import org.opentripplanner.standalone.config.BuildConfig;
@@ -75,6 +76,7 @@ public static GraphBuilder create(
     GraphBuilderDataSources dataSources,
     Graph graph,
     OsmInfoGraphBuildRepository osmInfoGraphBuildRepository,
+    StreetDetailsRepository streetDetailsRepository,
     FareServiceFactory fareServiceFactory,
     TimetableRepository timetableRepository,
     WorldEnvelopeRepository worldEnvelopeRepository,
@@ -98,6 +100,7 @@ public static GraphBuilder create(
       .config(config)
       .graph(graph)
       .osmInfoGraphBuildRepository(osmInfoGraphBuildRepository)
+      .streetDetailsRepository(streetDetailsRepository)
       .timetableRepository(timetableRepository)
       .worldEnvelopeRepository(worldEnvelopeRepository)
       .vehicleParkingRepository(vehicleParkingService)