Merge remote-tracking branch 'upstream/dev-2.x' into flex-graph-path-perf

Author: leonardehrenfried

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

@@ -66,6 +66,12 @@ public DataFetcher<String> feedId() {
     return this::getSource;
   }
 
+  @Override
+  public DataFetcher<String> version() {
+    return environment ->
+      getTransitService(environment).getFeedInfo(getSource(environment)).getVersion();
+  }
+
   @Override
   public DataFetcher<FeedPublisher> publisher() {
     return environment -> {

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

@@ -383,6 +383,8 @@ public interface GraphQLFeed {
     public DataFetcher<Iterable<Agency>> agencies();
     public DataFetcher<Iterable<TransitAlert>> alerts();
     public DataFetcher<String> feedId();
+
+    public DataFetcher<String> version();
     public DataFetcher<FeedPublisher> publisher();
   }
 

application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java

@@ -180,7 +180,7 @@ public RaptorRequest<T> mapRaptorRequest() {
 
     if (raptorDebugging.isEnabled()) {
       var debug = builder.debug();
-      var debugLogger = new SystemErrDebugLogger(true, false);
+      var debugLogger = new SystemErrDebugLogger(null, true);
 
       debug
         .withStops(mapDebugStopList(raptorDebugging.stops()))

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

@@ -690,6 +690,8 @@ type Feed {
   feedId: String!
   "The publisher of the input transit data."
   publisher: FeedPublisher
+  "The version of the dataset."
+  version: String
 }
 
 "Feed publisher information"

application/src/test-fixtures/java/org/opentripplanner/model/FeedInfoTestFactory.java

@@ -3,6 +3,6 @@
 public class FeedInfoTestFactory {
 
   public static FeedInfo dummyForTest(String id) {
-    return new FeedInfo(id, "publisher", "www.z.org", "en", null, null, null);
+    return new FeedInfo(id, "publisher", "www.z.org", "en", null, null, "12345");
   }
 }

application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json

@@ -11,7 +11,8 @@
         "publisher": {
           "name": "publisher",
           "url": "www.z.org"
-        }
+        },
+        "version": "12345"
       }
     ]
   }

application/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql

@@ -8,5 +8,6 @@
       name
       url
     }
+    version
   }
 }

doc/user/Changelog.md

@@ -14,6 +14,8 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - fix: Introduce stable order for fareZones (tariffZones) [#7434](https://github.com/opentripplanner/OpenTripPlanner/pull/7434)
 - Prevent long routes mistakenly getting grouped across service-date [#7452](https://github.com/opentripplanner/OpenTripPlanner/pull/7452)
 - Migrate away from deprecated FeedScopedId.parse() [#7457](https://github.com/opentripplanner/OpenTripPlanner/pull/7457)
+- Expose GTFS feed version in the GTFS GraphQL API [#7445](https://github.com/opentripplanner/OpenTripPlanner/pull/7445)
+- Fix MC Raptor Pareto comparator performance regression [#7440](https://github.com/opentripplanner/OpenTripPlanner/pull/7440)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.9.0 (2026-03-18)

raptor/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java

@@ -140,11 +140,6 @@ default RaptorTransfer transfer() {
 
   /* Egress */
 
-  /** @return true if destination arrival, otherwise false. */
-  default boolean arrivedAtDestination() {
-    return false;
-  }
-
   default EgressPathView egressPath() {
     throw new UnsupportedOperationException();
   }

raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java

@@ -40,7 +40,8 @@
  *     (generating randomized schedules)
  * </ul>
  * <p>
- * This class originated as a rewrite of Conveyals RAPTOR code: https://github.com/conveyal/r5.
+ * This class originated as a rewrite of
+ * <a href="https://github.com/conveyal/r5">Conveyals RAPTOR code</a>.
  *
  * @param <T> The TripSchedule type defined by the user of the raptor API.
  */
@@ -84,7 +85,7 @@ public RangeRaptor(
     this.calculator = requireNonNull(calculator);
     this.timers = requireNonNull(timers);
     this.accessPaths = requireNonNull(accessPaths);
-    this.minNumberOfRounds = accessPaths.calculateMaxNumberOfRides();
+    this.minNumberOfRounds = accessPaths.maxNumberOfRides();
     this.roundTracker = requireNonNull(roundTracker);
     this.lifeCycle = requireNonNull(lifeCyclePublisher);
     this.timeoutHook = requireNonNull(timeoutHook);