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.

Sign up for GitHub

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

Jump to bottom

Upstream merge 2024-09-30 #227

Merged
merged 96 commits into from
Sep 30, 2024
Merged

Upstream merge 2024-09-30 #227

merged 96 commits into from
Sep 30, 2024

Conversation

leonardehrenfried
Copy link

@leonardehrenfried leonardehrenfried commented Sep 30, 2024 •
edited
Loading

This one allows us to build Sound Transit again by removing the support for the old-style location groups, aka stop areas: opentripplanner#6074

My goal with this PR wasn't actually fixing ST but just to remove un-needed compatibility code. Happy accident!

It also fixes some ORCA fare problems, curtesy of @daniel-heppner-ibigroup: opentripplanner#6089

vesameskanen and others added 30 commits September 3, 2024 12:06
@vesameskanen
GTFS graphql API supports querying itinerary leg status
5e18c0a
@vesameskanen
Catch non-transit legs properly
021e07c
@vesameskanen
Add type resolver for Leg
01b460d
@vesameskanen
Fix formatting
2182066
@vesameskanen
Do not encode null reference as 'null' string
7e2033f
@vesameskanen
More accurate docs about leg query
6b92741
@vesameskanen
Add leg id to plan query test
e489f05
@vesameskanen
Use self-documenting value for non-transit leg ids
6bd5d04 
Also, move all encoding/decoding logig to LegReferenceSerializer class.
@vesameskanen
Add more docs about leg re-fetching into gtfs graphql schema
a998e52
@vesameskanen
Support querying leg's realTimeState in GTFS graphql api
cf37e89
@vesameskanen
Query realtimeState in extended plan test
cd54cbe
@vesameskanen
Revert LegReferenceSerializer changes
4025d5b
@vesameskanen
Generate unique id for non-transit legs
b206ce1
@vesameskanen
Restore LegReferenceSerializer null test
15f1f34
@vesameskanen
Update plan-extended expoctations to use unique leg ids
20f855a
@vpaturet
Introduce timetable builder
f7fc002
@t2gran @vpaturet
refactor: Encapsulate ordering trip-times in Timetable
307a745 
All trip-times in a Timetable should be ordered by the first departure-time for the first
stop in the trip pattern. This was not enforced in the Timetable <-> TimetableBuilder, but
relied on the "outside" to do it. This PR enforces this and provides two methods for adding
trip-times to a Timetable (add & addOrUpdate).
@t2gran @vpaturet
refactor: Replace 'Timetable.of(tt)' with 'tt.copyOf()'
2b6c7f0
@vpaturet
Fix unit test (the timetable is now sorted)
cc692c6
@vpaturet
Remove redundant timetable sorting in TransitLayerMapper
15833df
@vpaturet
Code clean-up
4b6a019
@vpaturet
Ensure stable TripPattern creation order
16c8264
@vpaturet
Code clean-up
c3553d5
@leonardehrenfried
Remove GTFS flex stop areas
1139e19
@leonardehrenfried
Fix remaining mentions of /docs
1468498
@JustCris654
fix /docs/user mentions
3fe0161
@JustCris654
fix docs mentions in function comments
3fe686b
@JustCris654
fix documentation bash command doc folder
882730a
@JustCris654
Merge remote-tracking branch 'otp_master/dev-2.x' into fix-docs
f09d3be
@renovate
Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.4
1cff559
leonardehrenfried and others added 14 commits September 26, 2024 11:27
@leonardehrenfried
Move styling into CSS
31577c9
@daniel-heppner-ibigroup
add tests for FareRuleSet
feedefe
@vesameskanen
Use string type instead of relay ID type for transit leg identification
ba100e8
@vesameskanen @optionsome
Update src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegIm…
45d6f98 
…pl.java

Co-authored-by: Joel Lappalainen <[email protected]>
@vesameskanen @optionsome
Update src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
857b815 
Co-authored-by: Joel Lappalainen <[email protected]>
@vesameskanen
Merge pull request opentripplanner#6045 from HSLdevcom/gfts-leg-node-…
2cfbd7b 
…refetch

Refetch transit leg with a leg query of GTFS GraphQL API
Add changelog entry for opentripplanner#6045 [ci skip]
69a5ff1
@a-limyr
Changed label from text to icon
25194e2
@leonardehrenfried
Merge pull request opentripplanner#6074 from leonardehrenfried/flex-s…
d792ef6 
…top-areas

Remove deprecated support for GTFS flex stop areas
Add changelog entry for opentripplanner#6074 [ci skip]
8cf6db5
@daniel-heppner-ibigroup
add Javadoc
364cf4f
@daniel-heppner-ibigroup
replace new hashset with set.of()
54223b1
@leonardehrenfried
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
450a8ad 
…024-09-30
@leonardehrenfried
Re-enable Seattle smoke tests
f6ec36d
leonardehrenfried and others added 11 commits September 30, 2024 10:23
@leonardehrenfried
Merge pull request opentripplanner#6090 from entur/debug-ui-wheelchai…
f285066 
…r-accessible

Add wheelchair accessible checkbox to Debug UI
@leonardehrenfried
Merge remote-tracking branch 'upstream/dev-2.x' into route-button
4637e26
Upgrade debug client to version 2024/09/2024-09-30T08:24
f584dbd
@leonardehrenfried
Fix typo
a1bcecf
@leonardehrenfried
Rename icon
3a7a984
@leonardehrenfried
Change breakpoint to 1895px
94943d5
@leonardehrenfried
Add hint to button
0be4f9f
@leonardehrenfried
Merge pull request opentripplanner#6089 from ibi-group/orca-remove-ru…
2fe2b37 
…leless-attributes

fix(orca-fares): remove fare attributes with no rules
@leonardehrenfried
Merge pull request opentripplanner#6091 from leonardehrenfried/route-…
a891ef6 
…button

Make debug UI search bar more compact, avoid overflow
Upgrade debug client to version 2024/09/2024-09-30T09:03
b174c25
@leonardehrenfried
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
00fdbff 
…024-09-30
miles-grant-ibigroup
miles-grant-ibigroup approved these changes Sep 30, 2024
View reviewed changes
Copy link

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working!

@miles-grant-ibigroup miles-grant-ibigroup merged commit ccb97b4 into ibi-dev-2.x Sep 30, 2024
18 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the upstream-merge-2024-09-30 branch September 30, 2024 15:29
@leonardehrenfried leonardehrenfried mentioned this pull request Sep 30, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miles-grant-ibigroup miles-grant-ibigroup miles-grant-ibigroup approved these changes

Assignees

@miles-grant-ibigroup miles-grant-ibigroup

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@leonardehrenfried @miles-grant-ibigroup @vesameskanen @vpaturet @t2gran @JustCris654 @habrahamsson-skanetrafiken @daniel-heppner-ibigroup @a-limyr