Merge remote-tracking branch 'upstream/dev-2.x' into route-button

client/src/components/SearchBar/SearchBar.tsx

@@ -15,6 +15,7 @@ import { ServerInfoTooltip } from './ServerInfoTooltip.tsx';
 import { useRef, useState } from 'react';
 import logo from '../../static/img/otp-logo.svg';
 import GraphiQLRouteButton from './GraphiQLRouteButton.tsx';
+import WheelchairAccessibleCheckBox from './WheelchairAccessibleCheckBox.tsx';
 
 type SearchBarProps = {
   onRoute: () => void;
@@ -50,6 +51,11 @@ export function SearchBar({ onRoute, tripQueryVariables, setTripQueryVariables,
         tripQueryVariables={tripQueryVariables}
         setTripQueryVariables={setTripQueryVariables}
       />
+      <WheelchairAccessibleCheckBox
+        tripQueryVariables={tripQueryVariables}
+        setTripQueryVariables={setTripQueryVariables}
+      />
+
       <div className="search-bar-route-button-wrapper">
         <ButtonGroup>
           <Button variant="primary" onClick={() => onRoute()} disabled={loading}>

client/src/components/SearchBar/WheelchairAccessibleCheckBox.tsx

@@ -0,0 +1,35 @@
+import { Form } from 'react-bootstrap';
+import wheelchairIcon from '../../static/img/wheelchair.svg';
+import { TripQueryVariables } from '../../gql/graphql.ts';
+
+export default function WheelchairAccessibleCheckBox({
+  tripQueryVariables,
+  setTripQueryVariables,
+}: {
+  tripQueryVariables: TripQueryVariables;
+  setTripQueryVariables: (tripQueryVariables: TripQueryVariables) => void;
+}) {
+  return (
+    <Form.Group>
+      <Form.Label column="sm" htmlFor="wheelchairAccessibleCheck">
+        <img
+          alt="Wheelchair Accessible Trip"
+          title="Wheelchair Accessible Trip"
+          src={wheelchairIcon}
+          width="20"
+          height="20"
+          className="d-inline-block align-middle"
+        />
+      </Form.Label>
+      <Form.Check
+        id="wheelchairAccessible"
+        onChange={(e) => {
+          setTripQueryVariables({
+            ...tripQueryVariables,
+            wheelchairAccessible: e.target.checked,
+          });
+        }}
+      ></Form.Check>
+    </Form.Group>
+  );
+}

client/src/static/query/tripQuery.tsx

@@ -11,6 +11,7 @@ export const query = graphql(`
     $searchWindow: Int
     $modes: Modes
     $itineraryFiltersDebug: ItineraryFilterDebugProfile
+    $wheelchairAccessible: Boolean
     $pageCursor: String
   ) {
     trip(
@@ -22,6 +23,7 @@ export const query = graphql(`
       searchWindow: $searchWindow
       modes: $modes
       itineraryFilters: { debug: $itineraryFiltersDebug }
+      wheelchairAccessible: $wheelchairAccessible
       pageCursor: $pageCursor
     ) {
       previousPageCursor

doc/user/Changelog.md

@@ -8,6 +8,8 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Extra leg when transferring at the same stop [#5984](https://github.com/opentripplanner/OpenTripPlanner/pull/5984)
 - Filter vector tiles stops by current service week [#6003](https://github.com/opentripplanner/OpenTripPlanner/pull/6003)
 - Add a matcher API for filters in the transit service used for datedServiceJourneyQuery [#5713](https://github.com/opentripplanner/OpenTripPlanner/pull/5713)
+- Refetch transit leg with a leg query of GTFS GraphQL API [#6045](https://github.com/opentripplanner/OpenTripPlanner/pull/6045)
+- Remove deprecated support for GTFS flex stop areas [#6074](https://github.com/opentripplanner/OpenTripPlanner/pull/6074)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.6.0 (2024-09-18)

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

@@ -23,6 +23,7 @@
 import org.opentripplanner.model.plan.StreetLeg;
 import org.opentripplanner.model.plan.TransitLeg;
 import org.opentripplanner.model.plan.WalkStep;
+import org.opentripplanner.model.plan.legreference.LegReferenceSerializer;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 import org.opentripplanner.routing.alternativelegs.AlternativeLegs;
 import org.opentripplanner.routing.alternativelegs.AlternativeLegsFilter;
@@ -189,10 +190,12 @@ public DataFetcher<Boolean> realTime() {
     return environment -> getSource(environment).getRealTime();
   }
 
-  // TODO
   @Override
   public DataFetcher<String> realtimeState() {
-    return environment -> null;
+    return environment -> {
+      var state = getSource(environment).getRealTimeState();
+      return (state != null) ? state.name() : null;
+    };
   }
 
   @Override
@@ -324,4 +327,15 @@ public DataFetcher<Iterable<Leg>> nextLegs() {
   public DataFetcher<Double> accessibilityScore() {
     return environment -> NumberMapper.toDouble(getSource(environment).accessibilityScore());
   }
+
+  @Override
+  public DataFetcher<String> id() {
+    return environment -> {
+      var ref = getSource(environment).getLegReference();
+      if (ref == null) {
+        return null;
+      }
+      return LegReferenceSerializer.encode(ref);
+    };
+  }
 }

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

@@ -42,6 +42,9 @@
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.gtfs.mapping.DirectionMapper;
 import org.opentripplanner.model.TripTimeOnDate;
+import org.opentripplanner.model.plan.Leg;
+import org.opentripplanner.model.plan.legreference.LegReference;
+import org.opentripplanner.model.plan.legreference.LegReferenceSerializer;
 import org.opentripplanner.routing.alertpatch.EntitySelector;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 import org.opentripplanner.routing.api.request.RouteRequest;
@@ -362,6 +365,20 @@ public DataFetcher<Connection<PlaceAtDistance>> nearest() {
     };
   }
 
+  @Override
+  public DataFetcher<Leg> leg() {
+    return environment -> {
+      TransitService transitService = getTransitService(environment);
+      var args = new GraphQLTypes.GraphQLQueryTypeLegArgs(environment.getArguments());
+      String id = args.getGraphQLId();
+      LegReference ref = LegReferenceSerializer.decode(id);
+      if (ref == null) {
+        return null;
+      }
+      return ref.getLeg(transitService);
+    };
+  }
+
   @Override
   public DataFetcher<Object> node() {
     return environment -> {

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

@@ -482,6 +482,8 @@ public interface GraphQLLeg {
 
     public DataFetcher<String> headsign();
 
+    public DataFetcher<String> id();
+
     public DataFetcher<Boolean> interlineWithPreviousLeg();
 
     public DataFetcher<Boolean> intermediatePlace();
@@ -779,6 +781,8 @@ public interface GraphQLQueryType {
 
     public DataFetcher<Trip> fuzzyTrip();
 
+    public DataFetcher<Leg> leg();
+
     public DataFetcher<Connection<PlaceAtDistance>> nearest();
 
     public DataFetcher<Object> node();

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

@@ -2432,6 +2432,25 @@ public void setGraphQLTime(Integer time) {
     }
   }
 
+  public static class GraphQLQueryTypeLegArgs {
+
+    private String id;
+
+    public GraphQLQueryTypeLegArgs(Map<String, Object> args) {
+      if (args != null) {
+        this.id = (String) args.get("id");
+      }
+    }
+
+    public String getGraphQLId() {
+      return this.id;
+    }
+
+    public void setGraphQLId(String id) {
+      this.id = id;
+    }
+  }
+
   public static class GraphQLQueryTypeNearestArgs {
 
     private String after;

src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java

@@ -1596,7 +1596,7 @@ private GraphQLSchema create() {
         GraphQLFieldDefinition
           .newFieldDefinition()
           .name("leg")
-          .description("Refetch a single leg based on its id")
+          .description("Refetch a single transit leg based on its id")
           .withDirective(gqlUtil.timingData)
           .type(LegType.REF)
           .argument(

src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java

@@ -63,7 +63,9 @@ public static GraphQLObjectType create(
         GraphQLFieldDefinition
           .newFieldDefinition()
           .name("id")
-          .description("An identifier for the leg, which can be used to re-fetch the information.")
+          .description(
+            "An identifier for the leg, which can be used to re-fetch transit leg information."
+          )
           .type(Scalars.GraphQLID)
           .dataFetcher(env -> LegReferenceSerializer.encode(leg(env).getLegReference()))
           .build()

src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java

@@ -72,7 +72,6 @@ public class GTFSToOtpTransitServiceMapper {
 
   private final FareTransferRuleMapper fareTransferRuleMapper;
 
-  private final StopAreaMapper stopAreaMapper;
   private final DirectionMapper directionMapper;
 
   private final DataImportIssueStore issueStore;
@@ -112,9 +111,6 @@ public GTFSToOtpTransitServiceMapper(
     boardingAreaMapper = new BoardingAreaMapper(translationHelper, stopLookup);
     locationMapper = new LocationMapper(builder.stopModel(), issueStore);
     locationGroupMapper = new LocationGroupMapper(stopMapper, locationMapper, builder.stopModel());
-    // the use of stop areas were reverted in the spec
-    // this code will go away, please migrate now!
-    stopAreaMapper = new StopAreaMapper(stopMapper, locationMapper, builder.stopModel());
     pathwayMapper =
       new PathwayMapper(stopMapper, entranceMapper, pathwayNodeMapper, boardingAreaMapper);
     routeMapper = new RouteMapper(agencyMapper, issueStore, translationHelper);
@@ -126,7 +122,6 @@ public GTFSToOtpTransitServiceMapper(
         stopMapper,
         locationMapper,
         locationGroupMapper,
-        stopAreaMapper,
         tripMapper,
         bookingRuleMapper,
         translationHelper
@@ -166,7 +161,6 @@ public void mapStopTripAndRouteDataIntoBuilder() {
       // Stop areas and Stop groups are only used in FLEX routes
       builder.stopModel().withAreaStops(locationMapper.map(data.getAllLocations()));
       builder.stopModel().withGroupStops(locationGroupMapper.map(data.getAllLocationGroups()));
-      builder.stopModel().withGroupStops(stopAreaMapper.map(data.getAllStopAreas()));
     }
 
     builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways()));

src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java

@@ -7,7 +7,6 @@
 import org.onebusaway.gtfs.model.Location;
 import org.onebusaway.gtfs.model.LocationGroup;
 import org.onebusaway.gtfs.model.Stop;
-import org.onebusaway.gtfs.model.StopArea;
 import org.opentripplanner.framework.collection.MapUtils;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.model.StopTime;
@@ -22,7 +21,6 @@ class StopTimeMapper {
   private final LocationMapper locationMapper;
 
   private final LocationGroupMapper locationGroupMapper;
-  private final StopAreaMapper stopAreaMapper;
 
   private final TripMapper tripMapper;
   private final BookingRuleMapper bookingRuleMapper;
@@ -35,15 +33,13 @@ class StopTimeMapper {
     StopMapper stopMapper,
     LocationMapper locationMapper,
     LocationGroupMapper locationGroupMapper,
-    StopAreaMapper stopAreaMapper,
     TripMapper tripMapper,
     BookingRuleMapper bookingRuleMapper,
     TranslationHelper translationHelper
   ) {
     this.stopMapper = stopMapper;
     this.locationMapper = locationMapper;
     this.locationGroupMapper = locationGroupMapper;
-    this.stopAreaMapper = stopAreaMapper;
     this.tripMapper = tripMapper;
     this.bookingRuleMapper = bookingRuleMapper;
     this.translationHelper = translationHelper;
@@ -71,8 +67,6 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) {
       case Stop stop -> lhs.setStop(stopMapper.map(stop));
       case Location location -> lhs.setStop(locationMapper.map(location));
       case LocationGroup locGroup -> lhs.setStop(locationGroupMapper.map(locGroup));
-      // TODO: only here for backwards compatibility, this will be removed in the future
-      case StopArea area -> lhs.setStop(stopAreaMapper.map(area));
       default -> throw new IllegalArgumentException(
         "Unknown location type: %s".formatted(stopLocation)
       );

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

@@ -22,6 +22,7 @@
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.organization.Operator;
 import org.opentripplanner.transit.model.site.FareZone;
+import org.opentripplanner.transit.model.timetable.RealTimeState;
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.model.timetable.booking.BookingInfo;
@@ -244,6 +245,10 @@ default boolean getRealTime() {
     return false;
   }
 
+  default RealTimeState getRealTimeState() {
+    return null;
+  }
+
   /**
    * Whether this Leg describes a flexible trip. The reason we need this is that FlexTrip does not
    * inherit from Trip, so that the information that the Trip is flexible would be lost when