Skip to content

Re-add block-based interlining - #4264

Merged
leonardehrenfried merged 16 commits into
opentripplanner:dev-2.xfrom
ibi-group:interlining
Jul 13, 2022
Merged

leonardehrenfried merged 16 commits into
opentripplanner:dev-2.xfrom
ibi-group:interlining

Conversation

@leonardehrenfried

Copy link
Copy Markdown
Member

Summary

Re-implements the block-based interlining from OTP1.

It does so by splitting GeometryAndBlockProcessor into smaller pieces, one for the geometries and one for the interlining.

Issue

n/a

Unit tests

Unit and integration tests added.

I removed the tests from GeometryAndBlockProcessorTest that were supposed to be, according to #4105.

Documentation

n/a

@leonardehrenfried
leonardehrenfried requested a review from a team as a code owner July 11, 2022 11:43
@codecov-commenter

codecov-commenter commented Jul 11, 2022 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 91.93548% with 10 lines in your changes missing coverage. Please review.
✅ Project coverage is 56.96%. Comparing base (c14f86b) to head (23736e0).
⚠️ Report is 13656 commits behind head on dev-2.x.

Files with missing lines Patch % Lines
...builder/module/interlining/InterlineProcessor.java 90.36% 5 Missing and 3 partials ⚠️
...rg/opentripplanner/graph_builder/GraphBuilder.java 0.00% 1 Missing ⚠️
...g/opentripplanner/gtfs/mapping/TransferMapper.java 93.33% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@              Coverage Diff              @@
##             dev-2.x    #4264      +/-   ##
=============================================
+ Coverage      56.89%   56.96%   +0.07%     
- Complexity     10586    10603      +17     
=============================================
  Files           1402     1404       +2     
  Lines          57170    57213      +43     
  Branches        6603     6604       +1     
=============================================
+ Hits           32526    32591      +65     
+ Misses         22630    22621       -9     
+ Partials        2014     2001      -13     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@leonardehrenfried leonardehrenfried added +GTFS Related to import of GTFS data IBI Developed by or important for IBI Group Regression labels Jul 11, 2022
@hannesj
hannesj requested review from hannesj and optionsome July 12, 2022 09:10
Comment thread src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java Outdated
Comment thread src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java Outdated
@leonardehrenfried

Copy link
Copy Markdown
Member Author

Sorry @hannesj, I accidentally rebase after your review. :(

@optionsome optionsome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and it seemed to work.

optionsome
optionsome previously approved these changes Jul 13, 2022
Co-authored-by: Hannes Junnila <hannes.junnila@gmail.com>
@leonardehrenfried
leonardehrenfried merged commit 53ada06 into opentripplanner:dev-2.x Jul 13, 2022
@leonardehrenfried
leonardehrenfried deleted the interlining branch July 13, 2022 15:11
t2gran pushed a commit that referenced this pull request Jul 13, 2022
@t2gran t2gran added this to the 2.2 milestone Jul 14, 2022
@t2gran t2gran added !New Feature A functional feature targeting the end user. and removed Regression labels Sep 24, 2025
aaronbrethorst pushed a commit to OneBusAway/wayfinder that referenced this pull request Mar 26, 2026
* Show a badge and indicate if the rider stays in-seat, and the stop is only interlining bus number changes
* Uses OTP 2.2.0  "Re-add block-based interlining [#4264](opentripplanner/OpenTripPlanner#4264)"
  * https://docs.opentripplanner.org/en/latest/Changelog/?h=interlining#notable-changes_7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

+GTFS Related to import of GTFS data IBI Developed by or important for IBI Group !New Feature A functional feature targeting the end user.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants