Skip to content

Upstream merge 2026-02-27#293

Merged
miles-grant-ibigroup merged 182 commits intoibi-dev-2.xfrom
upstream-merge-2026-02-27
Mar 2, 2026
Merged

Upstream merge 2026-02-27#293
miles-grant-ibigroup merged 182 commits intoibi-dev-2.xfrom
upstream-merge-2026-02-27

Conversation

@leonardehrenfried
Copy link

@leonardehrenfried leonardehrenfried commented Feb 27, 2026

This merge removes the flex zones from the geocoder sandbox.

Caution OTP has migrated to Java 25!

As you can see in the diff, massive refactorings are happening in OTP-land.

optionsome and others added 30 commits January 27, 2026 23:16
The method name isSubMode() was misleading - it actually indicates whether
a filter needs trip-level filtering when a TripPattern contains multiple
modes, not whether the filter is specifically for submodes.
…chema.graphqls

Co-authored-by: Leonard Ehrenfried <mail@leonard.io>
Add 8 tests covering common real-world use cases for the SIRI ET
updater's ModifiedTripBuilder and handleModifiedTrip flow:

- Mixed recorded + estimated calls (most common SIRI pattern)
- Successive updates replacing previous delays
- Cancel all stops triggering implicit trip cancellation
- Multi-trip pattern isolation (update one, leave other unaffected)
- Journey-level occupancy propagation
- Prediction inaccurate flag propagation
- Updating times on a previously added (replacement) trip
- Quay change then revert to original stops

Also adds withOccupancy() and withPredictionInaccurate() builder
methods to SiriEtBuilder for test support.
Cover additional AddedTripBuilder code paths: three-stop journeys,
occupancy propagation, prediction inaccuracy, destination name headsign
mapping, replacement linkage, and implicit cancellation via all-stops-cancelled.
# Conflicts:
#	application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java
leonardehrenfried and others added 26 commits February 25, 2026 10:08
…-search-builder

Move `StreetSearchBuilder` to street module
…departed-without-actual-time

Mark RecordedCall without ActualDepartureTime as not departed
…-order

Reject SIRI messages with missing Order attribute on calls
Add Helsinki videos to presentations page
…/highly-trusted-dependencies-(patch)

Update highly trusted dependencies (patch)
…ocoder

Remove flex locations from geocoder
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.

It's working well! Java 25. It's almost caught up to macos

@miles-grant-ibigroup miles-grant-ibigroup merged commit 26e0274 into ibi-dev-2.x Mar 2, 2026
17 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the upstream-merge-2026-02-27 branch March 2, 2026 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.