Skip to content

Enable fuzzyTripMatching in other SIRI-ET updaters - #4495

Merged
hannesj merged 9 commits into
opentripplanner:dev-2.xfrom
entur:otp2_siri_fuzzy
Oct 6, 2022
Merged

Enable fuzzyTripMatching in other SIRI-ET updaters#4495
hannesj merged 9 commits into
opentripplanner:dev-2.xfrom
entur:otp2_siri_fuzzy

Conversation

@hannesj

@hannesj hannesj commented Oct 3, 2022

Copy link
Copy Markdown
Contributor

Summary

After #4347, the fuzzyTripMatching was set to false in all SIR-ET updaters-except in the Azure updater. This PR adds the config option to other SIRI-ET updater modules, and cleans up the implementation, so that a SiriFuzzyTripMatcher is created only when the config parameter is set to true. This required some clean-up of the matcher, which is included in the PR.

@hannesj hannesj added !Technical Debt Improve code quality, no functional changes. +Real-Time The issue/PR is related to RealTime updates +Config Change This PR might require the configuration to be updated. labels Oct 3, 2022
@hannesj hannesj added this to the 2.2 milestone Oct 3, 2022
@hannesj
hannesj requested a review from a team as a code owner October 3, 2022 12:52
@codecov-commenter

codecov-commenter commented Oct 3, 2022

Copy link
Copy Markdown

Codecov Report

Base: 58.60% // Head: 58.60% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (92a4632) compared to base (efe8374).
Patch coverage: 23.07% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             dev-2.x    #4495   +/-   ##
==========================================
  Coverage      58.60%   58.60%           
+ Complexity     11516    11513    -3     
==========================================
  Files           1517     1517           
  Lines          60538    60511   -27     
  Branches        6885     6884    -1     
==========================================
- Hits           35478    35464   -14     
+ Misses         22972    22961   -11     
+ Partials        2088     2086    -2     
Impacted Files Coverage Δ
...pplanner/ext/siri/SiriTimetableSnapshotSource.java 0.00% <0.00%> (ø)
.../org/opentripplanner/ext/siri/TimetableHelper.java 2.11% <0.00%> (+<0.01%) ⬆️
...er/ext/siri/updater/SiriETGooglePubsubUpdater.java 0.00% <0.00%> (ø)
...i/updater/SiriETGooglePubsubUpdaterParameters.java 0.00% <0.00%> (ø)
...pentripplanner/ext/siri/updater/SiriETUpdater.java 0.00% <0.00%> (ø)
...nner/ext/siri/updater/SiriETUpdaterParameters.java 0.00% <0.00%> (ø)
...t/siri/updater/azure/AbstractAzureSiriUpdater.java 0.00% <0.00%> (ø)
...ner/ext/siri/updater/azure/SiriAzureETUpdater.java 0.00% <ø> (ø)
...nfig/updaters/SiriETGooglePubsubUpdaterConfig.java 0.00% <0.00%> (ø)
...tandalone/config/updaters/SiriETUpdaterConfig.java 0.00% <0.00%> (ø)
... and 6 more

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 at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Bartosz-Kruba
Bartosz-Kruba previously approved these changes Oct 4, 2022

@leonardehrenfried leonardehrenfried 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.

I reviewed the non-sandbox code and it looks good.

@hannesj hannesj added the Entur Test This is currently being tested at Entur label Oct 5, 2022
lassetyr
lassetyr previously approved these changes Oct 6, 2022
@leonardehrenfried

Copy link
Copy Markdown
Member

I'm afraid you need to resolve the conflicts with the metrics PR that I merged a few minutes ago.

@hannesj
hannesj merged commit 4fe14a3 into opentripplanner:dev-2.x Oct 6, 2022
@hannesj
hannesj deleted the otp2_siri_fuzzy branch October 6, 2022 12:26
t2gran pushed a commit that referenced this pull request Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

+Config Change This PR might require the configuration to be updated. Entur Test This is currently being tested at Entur +Real-Time The issue/PR is related to RealTime updates !Technical Debt Improve code quality, no functional changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants