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 2023-11-02 #191

Merged
merged 84 commits into from
Nov 2, 2023

Conversation

leonardehrenfried
Copy link

@leonardehrenfried leonardehrenfried commented Nov 2, 2023

This is more of a maintenance merge to not let the diff grow too large. Other than the usual fixes it brings in a few fares-related cleanups by @daniel-heppner-ibigroup and myself.

The smoke tests should give us some confidence that we haven't broken something.

optionsome and others added 30 commits October 10, 2023 16:47
corrected typos
…terResults to limit itineraries based on the numItineraries parameter.

Pulling this functionality into a separate filter from the MaxLimitFilter because of the need to keep more information about the filtered itineraries than just the first one that is removed. The NumItinerariesFilterResults contains information used in the page cursors currently as well as information that will be used in the future deduplication feature.
…ed_scoped_id

Filter out null, empty and blank elements when mapping feed-scoped ids
…/com.graphql-java-graphql-java-21.x

fix(deps): update dependency com.graphql-java:graphql-java to v21.3
…/siri-java-model.version

fix(deps): update dependency org.entur:siri-java-model to v1.25
…/org.entur.gbfs-gbfs-java-model-3.x

fix(deps): update dependency org.entur.gbfs:gbfs-java-model to v3.0.10
…cheduled_transit_leg_reference

Validate stop id in Transit leg reference
…timization/services/OptimizePathDomainServiceTest.java

Co-authored-by: Johan Torin <[email protected]>
t2gran and others added 26 commits October 27, 2023 17:46
In a busy updater it does not matter if we commit early or late, as long as we
throttle the commit to happen with a given frequency. But, when testing OTP
manually, it is easy to do mistakes and assume that an update is applied when you
see "INFO 1 of 1 update messages were applied successfully (success rate: 100.0%)".
In OTP before this commit, the update was not committed, waiting to fill up the
"buffer", and if not other update was applied - nothing happened.
This feature make it much simpler to test realtime updates.
…j_in_leg_reference

Add support for DSJ in transit leg reference
Co-authored-by: Leonard Ehrenfried <[email protected]>
…nt-link-fares

Remove redundant Link fares
…_neg_trip_times

Ignore negative travel-times in Raptor
…timized_transfers_5444

Fix sort order bug in optimized transfers
Run OTP with one key push in interactive OTP launcher
…/org.entur.gbfs-gbfs-java-model-3.x

fix(deps): update dependency org.entur.gbfs:gbfs-java-model to v3.0.11
Create the NumItinerariesFilter and the associated NumItinerariesFilterResults to limit itineraries based on the numItineraries parameter.
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 great

@miles-grant-ibigroup miles-grant-ibigroup merged commit f4d18fd into ibi-dev-2.x Nov 2, 2023
14 checks passed
@miles-grant-ibigroup miles-grant-ibigroup deleted the upstream-merge-2023-11-02 branch November 2, 2023 18:36
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.