Fix ID generation hacks in GTFS mapping, improve FaresV2 spec conformance #6586
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
leonardehrenfried
added
GTFS
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6586 +/- ##
=============================================
+ Coverage 71.04% 71.06% +0.01%
- Complexity 18299 18312 +13
=============================================
Files 2005 2005
Lines 75849 75871 +22
Branches 7779 7773 -6
=============================================
+ Hits 53885 53915 +30
+ Misses 19221 19210 -11
- Partials 2743 2746 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
leonardehrenfried
force-pushed
the
faresv2-transfers
branch
from
abe29a4 to
cea28d4
Compare
leonardehrenfried
changed the title
| @@ -360,51 +360,6 @@ private GtfsMutableRelationalDao loadBundle(GtfsBundle gtfsBundle) throws IOExce | |||
| } | |||
| } | |||
|
|
|||
| for (ShapePoint shapePoint : store.getAllEntitiesForType(ShapePoint.class)) { | |||
There was a problem hiding this comment.
@binh-dam-ibigroup You asked about this in a previous PR and all of this ugly code is now going away completely.
optionsome
reviewed
Apr 7, 2025
application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java
Outdated
Show resolved
Hide resolved
optionsome
previously approved these changes
Apr 8, 2025
|
@optionsome I'm sorry but I noticed another bug. |
optionsome
approved these changes
Apr 10, 2025
# Conflicts: # application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java # application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java # application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java # application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java # application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java # application/src/test/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapperTest.java
leonardehrenfried
force-pushed
the
faresv2-transfers
branch
from
d8dca70 to
119ac69
Compare
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.
Summary
This PR has two parts:
ID generation
Previously OTP re-wrote the
AgencyAndIdand set the agency ID to the feed ID and then during mapping converted that to a feed scoped ID. This was pretty confusing, brittle and allowed you to only convertAgencyAndIds toFeedScopedIds not strings.This has been replaced with a more robust approach where we inject a
IdFactoryinto the mappers.Unit tests
Lots updated and new ones for fares functionality added.
Bumping the serialization version id
Yes, graph entities are changed.
cc @miles-grant-ibigroup @fpurcell