Skip to content

Commit 7bd0436

Browse files
miles-grant-ibigroupmiles-grant-ibigroup
authored
Merge pull request #288 from ibi-group/upstream-merge-2026-01-09
Upstream merge 2026-01-09
2 parents 915f799 + 45ff003 commit 7bd0436

File tree

84 files changed

+1282
-1779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1282
-1779
lines changed

‎application/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
<dependency>
352352
<groupId>org.apache.httpcomponents.client5</groupId>
353353
<artifactId>httpclient5</artifactId>
354-
<version>5.5.1</version>
354+
<version>5.6</version>
355355
</dependency>
356356
<dependency>
357357
<groupId>commons-cli</groupId>

‎application/src/client/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>OTP Debug</title>
8-
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-02T08:26/assets/index-DugtgCrr.js"></script>
9-
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-02T08:26/assets/index-CME2K3XJ.css">
8+
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-08T13:51/assets/index-B8m6kh2S.js"></script>
9+
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-08T13:51/assets/index-CME2K3XJ.css">
1010
</head>
1111
<body>
1212
<div id="root"></div>

‎application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -361,21 +361,12 @@ void calculateFareThatStartsWithACashFare() {
361361
@Test
362362
void calculateFareForKitsapFastFerry() {
363363
List<Leg> rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0, 4, "404", "east"));
364-
calculateFare(rides, regular, TWO_DOLLARS);
365-
calculateFare(rides, FareType.senior, ONE_DOLLAR);
366-
calculateFare(rides, FareType.youth, Money.ZERO_USD);
367-
calculateFare(rides, FareType.electronicSpecial, ONE_DOLLAR);
368-
calculateFare(rides, FareType.electronicRegular, TWO_DOLLARS);
369-
calculateFare(rides, FareType.electronicSenior, ONE_DOLLAR);
370-
calculateFare(rides, FareType.electronicYouth, Money.ZERO_USD);
371-
372-
rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0, 4, "404", "west"));
373-
calculateFare(rides, regular, usDollars(12f));
374-
calculateFare(rides, FareType.senior, usDollars(6f));
364+
calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE);
365+
calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.half());
375366
calculateFare(rides, FareType.youth, Money.ZERO_USD);
376-
calculateFare(rides, FareType.electronicSpecial, usDollars(6f));
377-
calculateFare(rides, FareType.electronicRegular, usDollars(12f));
378-
calculateFare(rides, FareType.electronicSenior, usDollars(6f));
367+
calculateFare(rides, FareType.electronicSpecial, DEFAULT_TEST_RIDE_PRICE.half());
368+
calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE);
369+
calculateFare(rides, FareType.electronicSenior, DEFAULT_TEST_RIDE_PRICE.half());
379370
calculateFare(rides, FareType.electronicYouth, Money.ZERO_USD);
380371
}
381372

application/src/ext-test/java/org/opentripplanner/ext/trias/doc/TriasApiDocTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/doc/TriasApiDocTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.doc;
1+
package org.opentripplanner.ext.ojp.doc;
22

33
import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME;
44
import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;

application/src/ext-test/java/org/opentripplanner/ext/trias/mapping/PtModeMapperTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/mapping/PtModeMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.mapping;
1+
package org.opentripplanner.ext.ojp.mapping;
22

33
import static org.junit.jupiter.api.Assertions.assertNotNull;
44

application/src/ext-test/java/org/opentripplanner/ext/trias/service/OjpServiceMapperTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/service/OjpServiceMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.service;
1+
package org.opentripplanner.ext.ojp.service;
22

33
import static com.google.common.truth.Truth.assertThat;
44
import static org.junit.jupiter.api.Assertions.assertEquals;

application/src/ext-test/java/org/opentripplanner/ext/trias/service/OjpServiceTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/service/OjpServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.service;
1+
package org.opentripplanner.ext.ojp.service;
22

33
import static com.google.common.truth.Truth.assertThat;
44
import static org.junit.jupiter.api.Assertions.assertEquals;

application/src/ext-test/java/org/opentripplanner/ext/trias/trias/OjpMapperTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/trias/OjpMapperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.trias;
1+
package org.opentripplanner.ext.ojp.trias;
22

33
import static jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
44
import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
@@ -19,8 +19,8 @@
1919
import org.junit.jupiter.api.Test;
2020
import org.opentripplanner._support.time.ZoneIds;
2121
import org.opentripplanner.api.model.transit.DefaultFeedIdMapper;
22-
import org.opentripplanner.ext.trias.mapping.StopEventResponseMapper;
23-
import org.opentripplanner.ext.trias.service.CallAtStop;
22+
import org.opentripplanner.ext.ojp.mapping.StopEventResponseMapper;
23+
import org.opentripplanner.ext.ojp.service.CallAtStop;
2424
import org.opentripplanner.model.TripTimeOnDate;
2525
import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
2626
import org.opentripplanner.transit.model.framework.Deduplicator;

application/src/ext-test/java/org/opentripplanner/ext/trias/trias/OjpToTriasTransformerTest.java renamed to application/src/ext-test/java/org/opentripplanner/ext/ojp/trias/OjpToTriasTransformerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.opentripplanner.ext.trias.trias;
1+
package org.opentripplanner.ext.ojp.trias;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44
import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
@@ -15,7 +15,7 @@
1515
import org.junit.jupiter.api.Test;
1616
import org.junit.jupiter.params.ParameterizedTest;
1717
import org.junit.jupiter.params.provider.ValueSource;
18-
import org.opentripplanner.ext.trias.mapping.ErrorMapper;
18+
import org.opentripplanner.ext.ojp.mapping.ErrorMapper;
1919
import org.opentripplanner.test.support.ResourceLoader;
2020

2121
class OjpToTriasTransformerTest {

application/src/ext-test/resources/org/opentripplanner/ext/trias/doc/router-config.json renamed to application/src/ext-test/resources/org/opentripplanner/ext/ojp/doc/router-config.json

File renamed without changes.

0 commit comments

Comments
 (0)