Upstream merge 2023-12-13 #196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Johan Torin <[email protected]> Co-authored-by: Leonard Ehrenfried <[email protected]>
…c_criteria # Conflicts: # src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java
…_off_by_one_minute Fix missed trip when arrive-by search-window is off by one minute
Token serializer for paging and Leg.ID
This ensures the normalization is performed even if the mapper is no used.
This creates a new interface TripTimes and rename the old class to RealTimeTripTimes and let the ScheduledTripTimes also implement this interface. This will allow us to wait for an update before an accusal RealTime object is created.
…d_mc_criteria Transit group priority - Part 1
Removing itineraries outside the search-window is the responsibility of another filter.
Co-authored-by: Johan Torin <[email protected]>
Co-authored-by: Johan Torin <[email protected]>
Co-authored-by: Johan Torin <[email protected]>
…ty_part_2 Transit group priority - part 2
…l_api Make Transmodel GraphQl API an official OTP API
…/siri-java-model.version Update dependency org.entur:siri-java-model to v1.26
Add option to include stations in `nearest` search
GTFS Flex spec update: separate columns for `location_id`, `location_group_id`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just a routine merge to not let upstream get too far ahead of us. It has one small bug fix for flex, but I'm not sure if the IBI data sets would even exhibit the problem: opentripplanner#5517
EDIT
I added the latest upstream and this is turning into a very large merge.
The following relevant items have been added:
location_id,location_group_idopentripplanner/OpenTripPlanner#5564