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

Fix precedence rules for NeTEx flexible line booking information #5021

Merged

Conversation

vpaturet
Copy link
Contributor

@vpaturet vpaturet commented Apr 3, 2023

Summary

As detailed in #5020, the current algorithm for importing booking information from NeTEx flexible lines does not allow for fine-grained merging of the different booking properties specified at different levels (FlexibleLine, ServiceJourney, StopPointInJourneyPattern).

This PR changes the import logic to make it possible to define common properties at a higher level (for example contact information at the flexible line level), and define more specific properties at lower level.

Issue

closes #5020

Unit tests

Added unit test.

Documentation

No

@vpaturet vpaturet added bug NeTEx This issue is related to the Netex model/import. labels Apr 3, 2023
@vpaturet vpaturet self-assigned this Apr 3, 2023
@vpaturet vpaturet changed the title Fix precdence rules for NeTEx flexible line booking information Fix precedence rules for NeTEx flexible line booking information Apr 3, 2023
@codecov
Copy link

codecov bot commented Apr 3, 2023

Codecov Report

Patch coverage: 85.29% and no project coverage change.

Comparison is base (560ea80) 64.32% compared to head (c794e41) 64.32%.

Additional details and impacted files
@@            Coverage Diff             @@
##             dev-2.x    #5021   +/-   ##
==========================================
  Coverage      64.32%   64.32%           
+ Complexity     13804    13783   -21     
==========================================
  Files           1689     1689           
  Lines          66770    66799   +29     
  Branches        7189     7200   +11     
==========================================
+ Hits           42947    42971   +24     
- Misses         21417    21419    +2     
- Partials        2406     2409    +3     
Impacted Files Coverage Δ
...entripplanner/netex/mapping/BookingInfoMapper.java 85.71% <85.29%> (+0.18%) ⬆️

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@t2gran t2gran marked this pull request as ready for review April 11, 2023 16:06
@t2gran t2gran requested a review from a team as a code owner April 11, 2023 16:06
@t2gran t2gran added this to the 2.3 milestone Apr 13, 2023
@t2gran t2gran added the Entur test This is currently being tested at Entur label Apr 13, 2023
@t2gran t2gran merged commit e710479 into opentripplanner:dev-2.x Apr 13, 2023
5 checks passed
@t2gran t2gran deleted the otp2_allow_netex_bookinginfo_overriding branch April 13, 2023 22:35
t2gran pushed a commit that referenced this pull request Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Entur test This is currently being tested at Entur NeTEx This issue is related to the Netex model/import.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect precedence rules for NeTEx flexible line booking information
3 participants