ibi-group · miles-grant-ibigroup · Apr 30, 2026 · Jan 6, 2026 · Jan 13, 2026 · Jan 15, 2026
diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
@@ -39,12 +39,6 @@ jobs:
 
           # extended locations that are run only after merging to dev-2.x
 
-          # Hamburg is disabled because of https://github.com/opentripplanner/OpenTripPlanner/issues/6430
-          # - location: hamburg # German city
-          #  iterations: 1
-          #  jfr-delay: "50s"
-          #  profile: extended
-
           - location: baden-wuerttemberg # German state of Baden-Württemberg: https://en.wikipedia.org/wiki/Baden-W%C3%BCrttemberg
             iterations: 1
             jfr-delay: "50s"

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -19,8 +19,8 @@ jobs:
         locations:
           - name: seattle
             sleep: 30
-          - name: atlanta
-            sleep: 15
+          #- name: atlanta
+          #  sleep: 15
           - name: houston
             sleep: 30
           - name: denver

diff --git a/application/pom.xml b/application/pom.xml
@@ -296,12 +296,6 @@
             <artifactId>onebusaway-gtfs</artifactId>
             <version>11.2.2</version>
         </dependency>
-        <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
-        <dependency>
-            <groupId>org.processing</groupId>
-            <artifactId>core</artifactId>
-            <version>2.2.1</version>
-        </dependency>
         <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
         <dependency>
             <groupId>net.java.dev.jets3t</groupId>
@@ -323,7 +317,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>25.0</version>
+            <version>26.0</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
@@ -333,7 +327,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.6</version>
+            <version>5.6.1</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -349,7 +343,7 @@
         <dependency>
             <groupId>com.hivemq</groupId>
             <artifactId>hivemq-mqtt-client</artifactId>
-            <version>1.3.12</version>
+            <version>1.3.13</version>
         </dependency>
         <dependency>
             <groupId>io.github.ci-cmg</groupId>

diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/04/2026-04-13T19:04/assets/index-D2GqM7fO.js"></script>
-    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/04/2026-04-13T19:04/assets/index-BarhKzG9.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/04/2026-04-21T10:34/assets/index-DONfXEWF.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/04/2026-04-21T10:34/assets/index-BarhKzG9.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/.../ext-test/java/org/opentripplanner/ext/carpooling/CarpoolEstimatedVehicleJourneyData.java b/.../ext-test/java/org/opentripplanner/ext/carpooling/CarpoolEstimatedVehicleJourneyData.java
@@ -19,7 +19,9 @@
 import uk.org.siri.siri21.EstimatedVehicleJourney;
 import uk.org.siri.siri21.NaturalLanguageStringStructure;
 import uk.org.siri.siri21.OperatorRefStructure;
+import uk.org.siri.siri21.PassengerCapacityStructure;
 import uk.org.siri.siri21.StopAssignmentStructure;
+import uk.org.siri.siri21.VehicleOccupancyStructure;
 
 public class CarpoolEstimatedVehicleJourneyData {
 
@@ -174,6 +176,139 @@ static EstimatedCall forPolygon(String posList) {
     return call;
   }
 
+  public static EstimatedVehicleJourney journeyWithTotalCapacity(int capacity) {
+    var journey = minimalCompleteJourney();
+    for (var call : journey.getEstimatedCalls().getEstimatedCalls()) {
+      addTotalCapacity(call, capacity);
+    }
+    return journey;
+  }
+
+  public static EstimatedVehicleJourney journeyWithDifferentCapacitiesPerCall(
+    int firstCapacity,
+    int lastCapacity
+  ) {
+    var journey = minimalCompleteJourney();
+    var calls = journey.getEstimatedCalls().getEstimatedCalls();
+    addTotalCapacity(calls.getFirst(), firstCapacity);
+    addTotalCapacity(calls.getLast(), lastCapacity);
+    return journey;
+  }
+
+  public static EstimatedVehicleJourney journeyWithOnboardCounts(int... onboardCounts) {
+    var journey = minimalCompleteJourney();
+    var calls = journey.getEstimatedCalls().getEstimatedCalls();
+    for (int i = 0; i < Math.min(onboardCounts.length, calls.size()); i++) {
+      addOnboardCount(calls.get(i), onboardCounts[i]);
+    }
+    return journey;
+  }
+
+  private static void addTotalCapacity(EstimatedCall call, int totalCapacity) {
+    var capacity = new PassengerCapacityStructure();
+    capacity.setTotalCapacity(BigInteger.valueOf(totalCapacity));
+    call.getExpectedDepartureCapacities().add(capacity);
+  }
+
+  public static EstimatedVehicleJourney journeyWithLatestExpectedArrivalTime(
+    int expectedArrivalMinutes,
+    int latestExpectedArrivalMinutes
+  ) {
+    var journey = minimalCompleteJourney();
+    var lastStop = journey.getEstimatedCalls().getEstimatedCalls().getLast();
+    var base = lastStop.getAimedArrivalTime();
+    lastStop.setExpectedArrivalTime(base.plusMinutes(expectedArrivalMinutes));
+    lastStop.setLatestExpectedArrivalTime(base.plusMinutes(latestExpectedArrivalMinutes));
+    return journey;
+  }
+
+  public static EstimatedVehicleJourney journeyWithLatestExpectedArrivalTimeAimedOnly(
+    int latestExpectedArrivalMinutes
+  ) {
+    var journey = minimalCompleteJourney();
+    var lastStop = journey.getEstimatedCalls().getEstimatedCalls().getLast();
+    var base = lastStop.getAimedArrivalTime();
+    lastStop.setExpectedArrivalTime(null);
+    lastStop.setLatestExpectedArrivalTime(base.plusMinutes(latestExpectedArrivalMinutes));
+    return journey;
+  }
+
+  /**
+   * Builds a 3-stop journey (origin, intermediate, destination) where the intermediate and
+   * destination stops each get their own {@code expectedArrivalTime} and
+   * {@code latestExpectedArrivalTime}, enabling assertions on per-stop deviation budgets.
+   * Arrival times are offset from {@code now} in minutes.
+   */
+  public static EstimatedVehicleJourney journeyWithPerStopLatestExpectedArrivalTimes(
+    int intermediateExpectedArrivalMinutes,
+    int intermediateLatestExpectedArrivalMinutes,
+    int lastExpectedArrivalMinutes,
+    int lastLatestExpectedArrivalMinutes
+  ) {
+    var base = ZonedDateTime.now();
+
+    var origin = forPoint(OSLO_EAST);
+    origin.setAimedDepartureTime(base);
+    addStopName(origin, "Origin");
+
+    var intermediate = createArrivalStop(
+      OSLO_NORTH,
+      "Intermediate",
+      base,
+      intermediateExpectedArrivalMinutes,
+      intermediateLatestExpectedArrivalMinutes
+    );
+    intermediate.setAimedDepartureTime(base.plusMinutes(intermediateExpectedArrivalMinutes));
+
+    var last = createArrivalStop(
+      OSLO_NORTH,
+      "Last",
+      base,
+      lastExpectedArrivalMinutes,
+      lastLatestExpectedArrivalMinutes
+    );
+
+    var journey = new EstimatedVehicleJourney();
+    var operator = new OperatorRefStructure();
+    operator.setValue("TESTOPERATOR");
+    journey.setEstimatedVehicleJourneyCode("unittest");
+    journey.setOperatorRef(operator);
+    journey.setEstimatedCalls(new EstimatedVehicleJourney.EstimatedCalls());
+    journey.getEstimatedCalls().getEstimatedCalls().add(origin);
+    journey.getEstimatedCalls().getEstimatedCalls().add(intermediate);
+    journey.getEstimatedCalls().getEstimatedCalls().add(last);
+
+    return journey;
+  }
+
+  private static EstimatedCall createArrivalStop(
+    WgsCoordinate coordinate,
+    String name,
+    ZonedDateTime base,
+    int expectedArrivalMinutes,
+    int latestExpectedArrivalMinutes
+  ) {
+    var arrivalTime = base.plusMinutes(expectedArrivalMinutes);
+    var call = forPoint(coordinate);
+    call.setAimedArrivalTime(arrivalTime);
+    call.setExpectedArrivalTime(arrivalTime);
+    call.setLatestExpectedArrivalTime(base.plusMinutes(latestExpectedArrivalMinutes));
+    addStopName(call, name);
+    return call;
+  }
+
+  private static void addStopName(EstimatedCall call, String name) {
+    var nameStruct = new NaturalLanguageStringStructure();
+    nameStruct.setValue(name);
+    call.getStopPointNames().add(nameStruct);
+  }
+
+  private static void addOnboardCount(EstimatedCall call, int onboardCount) {
+    var occupancy = new VehicleOccupancyStructure();
+    occupancy.setOnboardCount(BigInteger.valueOf(onboardCount));
+    call.getExpectedDepartureOccupancies().add(occupancy);
+  }
+
   static AimedFlexibleArea poslistToAimedFlexibleArea(String coordinates) {
     var gmlFactory = new ObjectFactory();
 

diff --git a/...ication/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolGraphPathBuilder.java b/...ication/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolGraphPathBuilder.java
@@ -18,9 +18,6 @@ public class CarpoolGraphPathBuilder {
   // Walking speed in m/s (OTP default from WalkPreferences)
   private static final double WALKING_SPEED_MPS = 1.33;
 
-  // Default number of edges to distribute duration across
-  private static final int DEFAULT_NUM_EDGES = 3;
-
   /**
    * Creates a GraphPath with default 5-minute duration.
    */
@@ -30,24 +27,20 @@ public static GraphPath<State, Edge, Vertex> createGraphPath() {
 
   /**
    * Creates a GraphPath with specified duration using State chain.
+   * Uses a single edge with floor distance to avoid rounding errors: the edge traversal
+   * applies ceiling when converting to milliseconds, and State.getTime() applies ceiling
+   * when converting to seconds, so floor distance ensures the final second-precision
+   * duration matches the requested value.
    *
    * @param duration Total duration for the path
    * @return GraphPath with real State objects and accurate timing
    */
   public static GraphPath<State, Edge, Vertex> createGraphPath(Duration duration) {
     var builder = TestStateBuilder.ofWalking();
 
-    // Calculate distance needed for target duration
-    double totalDistanceMeters = duration.toSeconds() * WALKING_SPEED_MPS;
-
-    // Distribute across multiple edges for realistic path
-    int numEdges = DEFAULT_NUM_EDGES;
-    int distancePerEdge = (int) Math.ceil(totalDistanceMeters / numEdges);
+    int distanceMeters = (int) (duration.toSeconds() * WALKING_SPEED_MPS);
 
-    // Build state chain with calculated distances
-    for (int i = 0; i < numEdges; i++) {
-      builder.streetEdge("segment-" + i, distancePerEdge);
-    }
+    builder.streetEdge("segment-0", distanceMeters);
 
     return new GraphPath<>(builder.build());
   }