Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge 2024-12-12 #241

Merged
merged 92 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
ae50bd6
Add: GraphQL pagination to Decision Records
t2gran Sep 19, 2024
f431d17
Apply suggestions from code review
t2gran Oct 24, 2024
47300f9
use duration tag from osm as escalator traversal duration
tkalvas Nov 19, 2024
d9ead12
make default escalator speed a configuration parameter
tkalvas Nov 22, 2024
8028990
test the added duration tag in OsmWay
tkalvas Nov 25, 2024
aa3de3a
ignore escalator duration tags if the speed are nonsense. include dur…
tkalvas Nov 25, 2024
4566194
use Optional<Duration> instead of Integer which can be null
tkalvas Nov 25, 2024
3127cf3
test changes included
tkalvas Nov 25, 2024
1e5aca1
use Optional upwards only
tkalvas Nov 26, 2024
8f2c146
Remove unused GtfsGraphQlApiRentalStationFuzzyMatching feature
optionsome Nov 26, 2024
627b3fd
add bad duration tags to issue store, better testing of duration parsing
tkalvas Nov 28, 2024
dccc6d3
add tests for the osm duration tag cases where the leading unit is la…
tkalvas Nov 28, 2024
718b738
added retry mechanism for Azure service bus
Nov 25, 2024
d345a03
explain the duration parser better, more tests
tkalvas Nov 29, 2024
c161378
prettier reformatting
tkalvas Nov 29, 2024
769e380
Add background tiles
leonardehrenfried Nov 25, 2024
77fdc5e
Add UI elements for selecting background map
leonardehrenfried Nov 25, 2024
c0b4243
Add fixed TriMet raster tile
leonardehrenfried Dec 1, 2024
6ae498d
Add configuration for debug ui
leonardehrenfried Dec 1, 2024
a934342
Update tests
leonardehrenfried Dec 2, 2024
25b4fee
Fix configuration
leonardehrenfried Dec 2, 2024
9bd492a
Style background layer picker
leonardehrenfried Dec 2, 2024
441711b
Add nicer names to UI
leonardehrenfried Dec 2, 2024
21e183f
fix showing duration for escalator edges in debug client
tkalvas Dec 2, 2024
2f0692b
Add documentation
leonardehrenfried Dec 2, 2024
57c6593
Update config scope docs
leonardehrenfried Dec 2, 2024
c6c6c3b
Fix TS linting
leonardehrenfried Dec 2, 2024
7d29c1d
Merge remote-tracking branch 'upstream/dev-2.x' into remove-rental-fu…
optionsome Dec 3, 2024
8395345
DebugUiConfig doesn't need to be Serializable
leonardehrenfried Dec 4, 2024
d831ec4
Update application/src/main/java/org/opentripplanner/standalone/confi…
leonardehrenfried Dec 4, 2024
2ac997f
Update docs
leonardehrenfried Dec 4, 2024
a83afac
Remove check for LOG.isWarnEnabled()
leonardehrenfried Dec 4, 2024
9230aa3
Merge remote-tracking branch 'upstream/dev-2.x' into background-tiles
leonardehrenfried Dec 4, 2024
20696c1
Use 'OTP Debug' in the UI
leonardehrenfried Dec 4, 2024
0ce1067
Merge pull request #6282 from HSLdevcom/remove-rental-fuzzy-mapping
optionsome Dec 5, 2024
0fe4bdd
Add changelog entry for #6282 [ci skip]
Dec 5, 2024
72d5765
allow valid json array in include config
miklcct Dec 5, 2024
3952cfc
fix: Fix references to the shaded jar for performance tests and in doc
t2gran Dec 6, 2024
4a63ca1
Convert booking notice to durations
leonardehrenfried Dec 6, 2024
42b23c0
chore(deps): update micrometer.version to v1.14.1
renovate[bot] Dec 7, 2024
0efdb4f
Merge pull request #6310 from entur/fix_shaded_jar_ref
t2gran Dec 7, 2024
540cbbd
fix(deps): update dependency org.onebusaway:onebusaway-gtfs to v4
renovate[bot] Dec 8, 2024
4cdde4b
fix(deps): update dependency org.mobilitydata:gbfs-java-model to v1.0…
renovate[bot] Dec 9, 2024
83dc8da
Merge pull request #6318 from opentripplanner/renovate/org.onebusaway…
leonardehrenfried Dec 9, 2024
1438c98
Merge pull request #6295 from ibi-group/background-tiles
leonardehrenfried Dec 9, 2024
6683aed
Upgrade debug client to version 2024/12/2024-12-09T09:17
Dec 9, 2024
ff03169
Add changelog entry for #6295 [ci skip]
Dec 9, 2024
0079a16
Remove console.log [ci skip]
leonardehrenfried Dec 9, 2024
da62261
chore(deps): update react monorepo to v19
renovate[bot] Dec 9, 2024
c550e29
Merge pull request #6314 from opentripplanner/renovate/micrometer.ver…
leonardehrenfried Dec 9, 2024
0f3f148
Fix link
optionsome Dec 9, 2024
3d9924c
Remove extra line break
optionsome Dec 9, 2024
f2db3f4
Update @testing-library/react to react19 compatible version
testower Dec 9, 2024
b22001a
Add doc for refetching in GraphQL
optionsome Dec 9, 2024
1689bfd
Merge remote-tracking branch 'upstream/dev-2.x' into ddr_connecti_realay
optionsome Dec 9, 2024
f345801
Merge pull request #6320 from entur/renovate/major-react-monorepo
leonardehrenfried Dec 9, 2024
e0422cd
Upgrade debug client to version 2024/12/2024-12-09T10:11
Dec 9, 2024
2e7720f
Update doc/dev/decisionrecords/APIGraphQLDesign.md
optionsome Dec 9, 2024
6f5b5df
put escalator preferences in a sub object in walk preferences
tkalvas Dec 9, 2024
1e64a99
prettier wanted less spaces
tkalvas Dec 9, 2024
9c8e928
comment formatting
tkalvas Dec 9, 2024
68b9c61
revert explanation of default escalator speed
tkalvas Dec 9, 2024
ffffb13
Update application/src/main/java/org/opentripplanner/osm/model/OsmWit…
optionsome Dec 9, 2024
5a4fdfe
Merge pull request #6268 from HSLdevcom/escalator-duration
optionsome Dec 9, 2024
7b38d5c
Add changelog entry for #6268 [ci skip]
Dec 9, 2024
a866234
Bump serialization version id for #6268
Dec 9, 2024
a178b9d
Set bogus name to false when updating a StreetEdge's name
leonardehrenfried Dec 8, 2024
f0dd4f2
Add test for name setting
leonardehrenfried Dec 9, 2024
a1d44ba
Reduce geocode cluster radius
leonardehrenfried Dec 9, 2024
e70d2eb
chore(deps): update google.dagger.version to v2.53
renovate[bot] Dec 9, 2024
1415c6a
automatically calculate WSF fares
daniel-heppner-ibigroup Dec 10, 2024
3138dcc
update WSF agency ID
daniel-heppner-ibigroup Dec 10, 2024
9e8f2f6
Fix nullability
leonardehrenfried Dec 10, 2024
b476098
Update magidoc
leonardehrenfried Dec 10, 2024
51f004c
Merge pull request #6276 from Skanetrafiken/retry-handling-service-bus
habrahamsson-skanetrafiken Dec 10, 2024
7266bdf
Add endpoint to download Transmodel GraphQL Schema
t2gran Dec 10, 2024
f765199
doc: Add a disclaimer to the top of the Transmodel Schema served at r…
t2gran Dec 10, 2024
c2b70d5
Merge pull request #6327 from opentripplanner/renovate/google.dagger.…
vpaturet Dec 10, 2024
e15f69b
Merge pull request #6313 from ibi-group/booking-info-durations
leonardehrenfried Dec 10, 2024
c43e2b9
add javadoc, tests
daniel-heppner-ibigroup Dec 10, 2024
da0d520
Merge pull request #6325 from ibi-group/reduce-geocoder-radius
leonardehrenfried Dec 11, 2024
cd254bf
Merge pull request #6330 from entur/otp2_add_schema_endpoint
t2gran Dec 11, 2024
ce2bf50
fix silly math error in comment
daniel-heppner-ibigroup Dec 11, 2024
4141ce9
use currency from instance
daniel-heppner-ibigroup Dec 11, 2024
b5d5d54
Merge pull request #6329 from ibi-group/wsf-fares-calculation
leonardehrenfried Dec 11, 2024
dfe1d41
Add schedule for Dagger and Jackson
leonardehrenfried Dec 12, 2024
34cb0c9
Merge pull request #6193 from opentripplanner/ddr_connecti_realay
optionsome Dec 12, 2024
e5f1f2f
apply review suggestion by @leonardehrenfried
miklcct Dec 12, 2024
7329a95
Merge pull request #6307 from Jnction/include-file-json-array
leonardehrenfried Dec 12, 2024
b0158c8
Add changelog entry for #6307 [ci skip]
Dec 12, 2024
7aa1baf
Merge pull request #6321 from leonardehrenfried/bogus-name
leonardehrenfried Dec 12, 2024
9d2bb63
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
leonardehrenfried Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:

- name: Build GTFS GraphQL API documentation
run: |
npm install -g @magidoc/cli@6.1.0
npm install -g @magidoc/cli@6.2.0
magidoc generate --stacktrace

- name: Deploy compiled HTML to Github pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Build graph
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
run: |
cp application/target/otp-*-SNAPSHOT-shaded.jar otp.jar
cp shaded-jar/target/otp-*-SNAPSHOT-shaded.jar otp.jar
java -Xmx32G -jar otp.jar --build --save test/performance/${{ matrix.location }}/

- name: Run speed test
Expand Down
4 changes: 4 additions & 0 deletions DEVELOPMENT_DECISION_RECORDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,7 @@ Prefer immutable types over mutable. Use builders where appropriate. See
[Avoid using records if you cannot encapsulate it properly](doc/dev/decisionrecords/RecordsPOJOsBuilders.md#records)


## GraphQL Best Practices - API Design

[Follow best practices for designing GraphQL APIs. Our APIs need to be backwards compatible as they are used
by hundreds of clients (web-pages/apps/services).](doc/dev/decisionrecords/APIGraphQLDesign.md)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ We run a speed test (included in the code) to measure the performance for every
The main Java server code is in `application/src/main/`. OTP also includes a Javascript client based on the
MapLibre mapping library in `client/src/`. This client is now used for testing, with most major
deployments building custom clients from reusable components. The Maven build produces a unified ("shaded")
JAR file at `application/target/otp-VERSION.jar` containing all necessary code and dependencies to run OpenTripPlanner.
JAR file at `shaded-jar/target/otp-VERSION.jar` containing all necessary code and dependencies to run OpenTripPlanner.

Additional information and instructions are available in
the [main documentation](http://docs.opentripplanner.org/en/dev-2.x/), including a
Expand Down
4 changes: 2 additions & 2 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>org.mobilitydata</groupId>
<artifactId>gbfs-java-model</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
</dependency>

<!-- TESTING -->
Expand Down Expand Up @@ -302,7 +302,7 @@
<dependency>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-gtfs</artifactId>
<version>3.2.4</version>
<version>4.3.0</version>
</dependency>
<!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions application/src/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<meta charset="UTF-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 Client</title>
<script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-04T08:22/assets/index-D5kxjVzr.js"></script>
<link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-04T08:22/assets/index-CaBThmWm.css">
<title>OTP Debug</title>
<script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-09T10:11/assets/index-Cy40AOLN.js"></script>
<link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-09T10:11/assets/index-DygGy0HD.css">
</head>
<body>
<div id="root"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public class OrcaFareServiceTest {

private static final Money ONE_DOLLAR = usDollars(1f);
private static final Money TWO_DOLLARS = usDollars(2);
private static final Money FERRY_FARE = usDollars(6.50f);
private static final Money HALF_FERRY_FARE = usDollars(3.25f);
private static final Money HALF_FERRY_FARE = usDollars(1.75f);
private static final Money ORCA_SPECIAL_FARE = usDollars(1.00f);
public static final Money VASHON_WATER_TAXI_CASH_FARE = usDollars(6.75f);
public static final Money WEST_SEATTLE_WATER_TAXI_CASH_FARE = usDollars(5.75f);
Expand Down Expand Up @@ -219,24 +218,24 @@ void calculateFareThatIncludesNoFreeTransfers() {
getLeg(KITSAP_TRANSIT_AGENCY_ID, 121),
getLeg(WASHINGTON_STATE_FERRIES_AGENCY_ID, 150, "Fauntleroy-VashonIsland")
);
calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3).plus(FERRY_FARE));
calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(5));
calculateFare(
rides,
FareType.senior,
ONE_DOLLAR.plus(ONE_DOLLAR).plus(HALF_FERRY_FARE).plus(usDollars(0.5f))
ONE_DOLLAR.plus(ONE_DOLLAR).plus(HALF_FERRY_FARE.times(2)).plus(usDollars(0.5f))
);
calculateFare(rides, FareType.youth, Money.ZERO_USD);
// We don't get any fares for the skagit transit leg below here because they don't accept ORCA (electronic)
calculateFare(rides, FareType.electronicSpecial, ONE_DOLLAR.plus(ONE_DOLLAR).plus(FERRY_FARE));
calculateFare(rides, FareType.electronicSpecial, ONE_DOLLAR.plus(ONE_DOLLAR).plus(DEFAULT_TEST_RIDE_PRICE.times(2)));
calculateFare(
rides,
FareType.electronicRegular,
DEFAULT_TEST_RIDE_PRICE.times(2).plus(FERRY_FARE)
DEFAULT_TEST_RIDE_PRICE.times(4)
);
calculateFare(
rides,
FareType.electronicSenior,
ONE_DOLLAR.plus(ONE_DOLLAR).plus(HALF_FERRY_FARE)
ONE_DOLLAR.plus(ONE_DOLLAR).plus(HALF_FERRY_FARE.times(2))
);
calculateFare(rides, FareType.electronicYouth, ZERO_USD);
}
Expand Down Expand Up @@ -326,11 +325,11 @@ void calculateFareForWSFPtToTahlequah() {
List<Leg> rides = List.of(
getLeg(WASHINGTON_STATE_FERRIES_AGENCY_ID, 0, "Point Defiance - Tahlequah")
);
calculateFare(rides, regular, FERRY_FARE);
calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE);
calculateFare(rides, FareType.senior, HALF_FERRY_FARE);
calculateFare(rides, FareType.youth, Money.ZERO_USD);
calculateFare(rides, FareType.electronicSpecial, FERRY_FARE);
calculateFare(rides, FareType.electronicRegular, FERRY_FARE);
calculateFare(rides, FareType.electronicSpecial, DEFAULT_TEST_RIDE_PRICE);
calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE);
calculateFare(rides, FareType.electronicSenior, HALF_FERRY_FARE);
calculateFare(rides, FareType.electronicYouth, Money.ZERO_USD);
}
Expand Down
Loading
Loading