Upstream merge 2026-05-05#300
Merged
miles-grant-ibigroup merged 97 commits intoibi-dev-2.xfrom May 5, 2026
Merged
Conversation
# Conflicts: # raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java
…ction and RaptorVisitStopViaConnection
Three short-circuit guards avoid rebuilding ScheduledTransitLeg through its builder when a decorator has no actual content to add: - DecorateWithFare: return the itinerary unchanged when the fare service returns an empty ItineraryFare (not only null). - ItineraryFaresDecorator: return the leg unchanged when both the itinerary-level and leg-level fare offer lists are empty. - AlertToLegMapper: return the leg unchanged when no alerts match after time filtering. Each rebuild re-runs GeometryUtils.sumDistances on the full transit polyline inside the constructor, so these guards remove measurable CPU and allocation pressure for deployments where the corresponding feature returns nothing (e.g. NeTEx datasets without GTFS fares).
# Conflicts: # application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java
The non-regression test queried hashGrid twice instead of comparing hashGrid against the STRtree reference, making the assertion a tautology.
…e-osm Make OSM entities immutable
…oration Skip leg rebuild when fare/alert decoration would be a no-op
Replace C2-based pass-through with via-connection chaining
add Aubin and remove OTP Android from independent productions in the documentation
…-self-comparison Fix HashGridTest comparing query results against itself
…/highly-trusted-dependencies-(patch) Update highly trusted dependencies (patch)
…edaction Improve Secret redaction for config File Logging
…lter-bugfix Replacement filter bugfix
…idated-stops-clean Check for clustered stops in geocoder
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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 merge fixes a geocoder/stop consolidation issue reported by @daniel-heppner-ibigroup.
It also contains a boat load of refactoring and some performance improvements.