Upstream merge 2026-09- 16

.github/workflows/cibuild.yml

@@ -149,7 +149,7 @@ jobs:
       LOCAL_BRANCH: local-pages
       REMOTE_BRANCH: main
       TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
-      MASTER_BRANCH_VERSION: 2.9.0
+      MASTER_BRANCH_VERSION: 2.10.0
 
     steps:
 

application/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opentripplanner</groupId>
         <artifactId>otp-root</artifactId>
-        <version>2.10.0-SNAPSHOT</version>
+        <version>2.11.0-SNAPSHOT</version>
     </parent>
     <artifactId>application</artifactId>
     <name>OpenTripPlanner - Application</name>
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>14.2.2</version>
+            <version>14.2.3</version>
         </dependency>
         <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
         <dependency>
@@ -358,7 +358,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.59.0</version>
+            <version>1.59.1</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
@@ -368,7 +368,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.18.5</version>
+            <version>1.18.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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/09/2026-09-07T12:25/assets/index-B1VUfEow.js"></script>
-    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/09/2026-09-07T12:25/assets/index-GO7pvg6c.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/09/2026-09-14T10:19/assets/index-K1wT9_vr.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/09/2026-09-14T10:19/assets/index-GO7pvg6c.css">
   </head>
   <body>
     <div id="root"></div>

application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolBookingUrlTestData.java

@@ -4,35 +4,53 @@
 import org.opentripplanner.street.geometry.WgsCoordinate;
 
 /**
- * Shared expected-URL formatter for tests that assert the carpool booking URL has been augmented
- * with passenger pickup/dropoff coordinates. Centralised so the production
- * {@code "from_coordinate=lat,lon&to_coordinate=lat,lon"} contract — coordinate precision,
- * parameter names, and ordering — is pinned down in one place that all
- * {@code CarpoolItineraryMapper} tests assert against.
+ * Shared booking-URL template and its expected expansion, for tests asserting that the carpool
+ * booking URL has had the passenger's pickup/dropoff coordinates expanded into it. Centralised so
+ * the production contract — the {@code {from}}/{@code {to}} placeholder spelling and the
+ * {@code "latitude,longitude"} rendering at six decimals — is pinned down in one place that the
+ * mapper and service tests assert against.
+ * <p>
+ * The query parameter names carrying the placeholders ({@code from_coordinate},
+ * {@code to_coordinate}) are the provider's own choice and form no part of OTP's contract; they
+ * are here only to make the template realistic.
  */
 public final class CarpoolBookingUrlTestData {
 
   private CarpoolBookingUrlTestData() {}
 
   /**
-   * Returns the booking URL that {@code CarpoolItineraryMapper.toBookingInfo} is expected to
-   * produce when augmenting {@code baseUrl} with the given carpool boarding ({@code pickup}) and
-   * alighting ({@code dropoff}) coordinates. Assumes {@code baseUrl} carries no existing query
-   * string and no fragment.
+   * Returns {@code baseUrl} with a query string carrying both placeholders — the shape of booking
+   * URL a carpool provider publishes in order to receive the passenger's coordinates.
    */
-  public static String expectedAugmentedUrl(
+  public static String bookingUrlTemplate(String baseUrl) {
+    return baseUrl + "?from_coordinate={from}&to_coordinate={to}";
+  }
+
+  /**
+   * Returns the {@code "latitude,longitude"} rendering that a {@code {from}} or {@code {to}}
+   * placeholder is expected to expand to. The single place test code spells this format out, so
+   * that a change of precision has one place to be updated on the test side.
+   */
+  public static String expandedCoordinate(WgsCoordinate coordinate) {
+    return String.format(Locale.ROOT, "%.6f,%.6f", coordinate.latitude(), coordinate.longitude());
+  }
+
+  /**
+   * Returns the URL that {@code CarpoolItineraryMapper.toBookingInfo} is expected to produce from
+   * {@link #bookingUrlTemplate(String)} for the given carpool boarding ({@code pickup}) and
+   * alighting ({@code dropoff}) coordinates.
+   */
+  public static String expectedExpandedUrl(
     String baseUrl,
     WgsCoordinate pickup,
     WgsCoordinate dropoff
   ) {
-    return String.format(
-      Locale.ROOT,
-      "%s?from_coordinate=%.6f,%.6f&to_coordinate=%.6f,%.6f",
-      baseUrl,
-      pickup.latitude(),
-      pickup.longitude(),
-      dropoff.latitude(),
-      dropoff.longitude()
+    return (
+      baseUrl +
+      "?from_coordinate=" +
+      expandedCoordinate(pickup) +
+      "&to_coordinate=" +
+      expandedCoordinate(dropoff)
     );
   }
 }