Check service dates instead of service ids for block id transfers by optionsome · Pull Request #5162 · opentripplanner/OpenTripPlanner

optionsome · 2023-06-02T17:35:46Z

Summary

Changes block_id based interline generation to work according to the GTFS specification. This means that we check that trips share the same service date(s) instead of service id. Multiple transfers can be created from one from trip if one to trip doesn't cover all the service dates of the from trip.

Issue

closes #5099

Unit tests

Added tests

Documentation

Not needed

Changelog

from title

… and block

codecov · 2023-06-02T17:50:08Z

Codecov Report

Patch coverage: 94.36% and project coverage change: +0.13 🎉

Comparison is base (fb0961a) 65.15% compared to head (519345b) 65.29%.

Additional details and impacted files

@@              Coverage Diff              @@
##             dev-2.x    #5162      +/-   ##
=============================================
+ Coverage      65.15%   65.29%   +0.13%     
- Complexity     14327    14365      +38     
=============================================
  Files           1741     1750       +9     
  Lines          67725    67787      +62     
  Branches        7222     7209      -13     
=============================================
+ Hits           44125    44260     +135     
+ Misses         21156    21083      -73     
  Partials        2444     2444

Impacted Files	Coverage Δ
.../opentripplanner/gtfs/graphbuilder/GtfsModule.java	`69.47% <ø> (ø)`
...builder/module/interlining/InterlineProcessor.java	`94.78% <93.44%> (+4.08%)`	⬆️
...ripplanner/model/calendar/CalendarServiceData.java	`95.34% <100.00%> (+1.40%)`	⬆️

... and 71 files with indirect coverage changes

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

t2gran

I have done a technical review - I have not looked at the logic.

t2gran · 2023-06-06T12:12:04Z

+    return serviceDatesByServiceId
+      .values()
+      .stream()
+      .filter(list -> !list.isEmpty())
+      .map(list -> list.get(0))
+      .min(LocalDate::compareTo);


Use serviceIdsByDate instead, finding the min in keys() is fast and simpler.

This methods do not need to return optional either; An empty calendar should never be processed - so you may throw an exception instead of returning the optional.

Fixed in 71727bd, I wasn't sure which implementation was faster but it shouldn't matter as both are fast enough and your suggestion in simpler.

t2gran · 2023-06-06T12:12:29Z

+      .filter(list -> !list.isEmpty())
+      .map(list -> list.get(list.size() - 1))
+      .max(LocalDate::compareTo);
+  }


Use serviceIdsByDate instead, finding the max in keys()

t2gran · 2023-06-06T13:24:51Z

+   * @param mutable This should be set as true if the {@link BitSet} will be modified as otherwise
+   *                we don't have to create a copy of a cached entity.


This is a bad practice, either create two methods: getAndCopyDaysForService(FeedScopedId)and getDaysForService(FeedScopedId), or just do the clone() in the caller. Do not pass in boolean flags to alter method flow.

I first had it like that but I thought with one method, it might be more difficult to miss the fact that it should be considered if the BitSet will be modified. I agree that it's bad practice to alter the method flow through a parameter like that so I have implemented your suggestion in e40297d

…ning/InterlineProcessor.java Co-authored-by: Thomas Gran <t2gran@gmail.com>

* Add changelog entry for opentripplanner#5100 [ci skip] * refactor: Add proper progress tracking for GraphQL timeouts. * refactor: Fix spelling 'guarantied' -> 'guaranteed' * review: Fix documentation * feature: Trace HTTP request headers * Add changelog entry for opentripplanner#5081 [ci skip] * Add changelog entry for opentripplanner#5091 [ci skip] * Add changelog entry for opentripplanner#5133 [ci skip] * Remove unused code * Generate full POM for shaded jar [ci skip] * Add elevation data to Transmodel API * Finetune elevation format * Update documentation * Add changelog entry for opentripplanner#5142 [ci skip] * fix: Make sure the log key is removed from the Grizzly thread log context * Apply suggestions from code review Co-authored-by: Thomas Gran <t2gran@gmail.com> * Remove San Francisco fare calculator * Remove TimeBasedVehicleRentalFareService * Add documentation about deleted calculators * Remove empty lines * Refactor null check on from and to vertices * review: Apply review feedback * Apply suggestions from code review Co-authored-by: Leonard Ehrenfried <mail@leonard.io> * feature: Add sanity check for HTTP header value The value must match `[^\p{Cntrl}\v]{1,512}` * test: Add test regular expression for HTTP header value * Apply suggestions from code review Co-authored-by: Leonard Ehrenfried <mail@leonard.io> * feature: Remove batch query from Transmodel API * refactor: re-generate doc * fix(deps): update dependency com.google.guava:guava to v32 * fix(deps): update dependency com.graphql-java:graphql-java to v20.3 * Add changelog entry for opentripplanner#5130 [ci skip] * fix(deps): update dependency com.google.guava:guava to v32 * Use git to figure out last-modified date * Debug last modified check * Increase fetch depth * Make update frequency a Duration * fix(deps): update dependency com.fasterxml.jackson.core:jackson-annotations to v2.15.2 * Update log messages * Update docs * Remove link to 1.x-dev docs * refactor: Avoid creating builders unnecessary. * test: Add test for bug in TripRequestMapperTest * Add changelog entry for opentripplanner#5131 [ci skip] * Bump serialization version id for opentripplanner#5131 * Add changelog entry for opentripplanner#5141 [ci skip] * Bump serialization version id for opentripplanner#5141 * Improve money documentation * Implement stop sequence in GraphQL * Add stop sequence and test * Fix docs, formatting and tests * Add test for walk step mapping * fix: Fix bug in maxDirectDurationForMode and refactor - The code is not DRY, so I refactored it - this also fixes the bug * refactor: Extract mappers out off PreferencesMapper * fix(deps): update dependency com.google.cloud:libraries-bom to v26.15.0 * fix(deps): update dependency org.onebusaway:onebusaway-gtfs to v1.4.3 * Make absolute direction optional * Add test for GraphQL API * Add changelog entry for opentripplanner#5140 [ci skip] * Update documentation * Add changelog entry for opentripplanner#5145 [ci skip] * Consider level and layer tags when linking public transit stop area nodes E.g. transit entrances above ground should not get directly linked to subway platforms * Add test for ensuring that entrances do not link to platforms across different layers/levels * Update documentation and mapping * test: Add regression test. * fix: Fix validation of flex area, assert isComplete and isConsistent, before isStopTimesIncreasing * refactor: Cleanup AbstractStopTimeAdaptor * Improve documentation * Handle stop areas with many platforms properly Entrances and other unconnected nodes included in stop area relation were linked only with the first platform area. Now they are matched with all platforms. Walkable area builder won't create connections if node is outside a platform. * Update documenation * Create interline transfers for trips that share the same service date and block * Connect area boundary to entrance points inside it to prevent pruning * Add better test data for testing area processing of stop_area relations * Validate to/from in routing request * Add changelog entry for opentripplanner#5152 [ci skip] * Bump serialization version id for opentripplanner#5152 * Stop area linking tests * Changing default value for earlyStartSec * Add some documetation about stop area relations * Fix formatting * Add support for mapping NeTEx operating day in operating period * Add error mapping in REST API * Update documentation * Add new doc page to mkdocs.yml * Move getLevel to OSMWithTags andd simplify it * Test also layer tag relevance in stop area processing * Fix misleading data report issue content from stop area processing * Use multimap for storing stop area link nodes * Remove obsolete issue Stop area which does not have entrances or other link points is really not any kind of error * Add changelog entry for opentripplanner#5147 [ci skip] * Improve updater log messages * refactor: Apply code review - Change `earlyStartSec:int` to `earlyStart:Duration` - Add more doc on parameter * Relax validity check for flex trip with null duration * Make FlexPath fields final * refactor: Make `SiriSXUpdaterParameters#timeout` a Duration * Apply suggestions from code review * refactor: Make Siri Updaters use Duration, not int, for reminding parameters - This also remove a bit of unnecessary mapping code. * Update src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java Co-authored-by: Leonard Ehrenfried <mail@leonard.io> * chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.1.2 * Refactor shutdown hook * Add changelog entry for opentripplanner#5159 [ci skip] * Update pull_request_template.md [ci skip] * fix(deps): update dependency com.graphql-java:graphql-java to v20.4 * Use hashmultimap in src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java> Co-authored-by: Leonard Ehrenfried <mail@leonard.io> * Add HashMultimap import * Refactor first/last date getters * Split method in two * Update src/main/java/org/opentripplanner/graph_builder/module/interlining/InterlineProcessor.java Co-authored-by: Thomas Gran <t2gran@gmail.com> * More accurate tagging instructions, one example relation linked * Log warning if GBFS status reports unexpected vehicle type * Code cleanup * refactor: Cleanup TransitRouter and AccessEgressMapper * refactor: Sort values in DurationForEnum.toString to make it deterministic * refactor: Add State.containsModeWalkOnly() and DefaultAccessEgress.isWalkOnly() These methods will make it simpler to filter access/egress later * refactor: Add Duration#requireNonNegative(Duration) : Duration to DurationUtils * refactor: Implement openingHoursToString() for AccessEgress for testing Having to brows through many classes and hairy logic is time-consuming when debugging FLEX access/egress, this simplifies the process. * refactor: Move RaptorConstants into raptor.api.model package * feature: Search before the earliest-departure-time in Raptor with searchWindowAccessSlack. * refactor: Move AccessEgresses to street package * refactor: Cleanup DoubleUtils * refactor: Add requireXyz to IntUtils * refactor: Add Cost value-object * refactor: Improve int and double utilities * refactor: Small cleanups * Apply suggestions from code review Co-authored-by: Thomas Gran <t2gran@gmail.com> * Formatting * Add changelog entry for opentripplanner#5161 [ci skip] * Add changelog entry for opentripplanner#5162 [ci skip] * Add changelog entry for opentripplanner#5168 [ci skip] * Apply review suggestions * Apply review suggestions * Fix bicyle optimise type in TransmodelApi * Add test for optimize type in GraphQL API * fix(deps): update dependency com.google.guava:guava to v32.0.1-jre * Add changelog entry for opentripplanner#5167 [ci skip] * Add reusable method * Add union type for stop position * Simplify type resolving * Use interface type in data fetcher * Applied review suggestion * Add documentation * Add documentation * Apply review feedback Co-authored-by: Joel Lappalainen <lappalj8@gmail.com> * Generate new SiriUpdater doc * Add changelog entry for opentripplanner#5169 [ci skip] * Add changelog entry for opentripplanner#5175 [ci skip] * Add changelog entry for opentripplanner#5164 [ci skip] * Add changelog entry for opentripplanner#5165 [ci skip] * review: Remove serialVersionUID * Validate that from and to temporary vertices are distinct * review: Extract TestVehicleRentalStationBuilder * Reduce log severity for non-optimized transfers * Return an int as the stopPosition for StopTimes * doc: Move JavaDoc to accessors, fix typo. * fix: Improve error handling and prevent OTP from going down when connecting to external http services. The VehicleRentalServiceDirectoryFetcher went down with a IllegalSateException when the http endpoint failed. Instead of returning null in some error-cases and throwing IOExceptions in others the HttpUtils is changed to throw an IOException in all cases. This make it more robust, and the checked exception forces the client to handle it. * Use Finland OSM mapping as basis for constant speed mapper * Add support for taxi mode * Rename ConstansSpeedMapper to describe the new super class * Add changelog entry for opentripplanner#5153 [ci skip] * Update micrometer.version to v1.11.1 * Update src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java Co-authored-by: Thomas Gran <t2gran@gmail.com> * Apply review feedback * Update dependency ch.qos.logback:logback-classic to v1.4.8 * Add changelog entry for opentripplanner#5135 [ci skip] * Separate words with underscore in osm tag mapper enum value * Update docs * Bump serialization version id for opentripplanner#5176 * Make stop area linking more precise and capable to handle elevators * Add changelog entry for opentripplanner#5181 [ci skip] * Use EnumSet instead of Stream * Add changelog entry for opentripplanner#5183 [ci skip] * Add changelog entry for opentripplanner#5179 [ci skip] * Fix formatting in RouterConfig.md * improve: add language argument to Quay and StopPlace types deprecate lang arguments * fix: the overloaded getLocale method does not use the language argument * improve: extract shared code into helper method in transmodel GqlUtil * add test for GqlUtil.getLocale * Fix default value for bicycle safety report * Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.0 * Update dependency net.logstash.logback:logstash-logback-encoder to v7.4 * Update dependency org.mockito:mockito-core to v5.4.0 * Add more tests for stop area linking - Test that elevators get linked - Test that stop positions will not get linked * Fix typo * Update src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java Co-authored-by: Leonard Ehrenfried <mail@leonard.io> * Return set * Update src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java Co-authored-by: Joel Lappalainen <lappalj8@gmail.com> * Update src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java Co-authored-by: Joel Lappalainen <lappalj8@gmail.com> * Add changelog entry for opentripplanner#5166 [ci skip] --------- Co-authored-by: Leonard Ehrenfried <mail@leonard.io> Co-authored-by: OTP Changelog Bot <changelog-bot@opentripplanner.org> Co-authored-by: Thomas Gran <t2gran@gmail.com> Co-authored-by: vpaturet <46598384+vpaturet@users.noreply.github.com> Co-authored-by: Vincent Paturet <vincent.paturet@entur.org> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: OTP Serialization Version Bot <serialization-version-bot@opentripplanner.org> Co-authored-by: Vesa Meskanen <vesa.meskanen@cgi.com> Co-authored-by: Joel Lappalainen <lappalj8@gmail.com> Co-authored-by: Lasse Tyrihjell <lassetyr@gmail.com> Co-authored-by: Vesa Meskanen <vesa@realsoft.com> Co-authored-by: Tom Erik Støwer <testower@gmail.com>

Create interline transfers for trips that share the same service date…

d7f0370

… and block

optionsome added !Improvement A functional improvement or micro feature +GTFS Related to import of GTFS data Digitransit Test Feature is under testing in Digitransit environment(s) labels Jun 2, 2023

optionsome added this to the 2.4 (next release) milestone Jun 2, 2023

optionsome requested a review from a team as a code owner June 2, 2023 17:35

leonardehrenfried self-requested a review June 5, 2023 21:07

t2gran requested changes Jun 6, 2023

View reviewed changes

optionsome and others added 3 commits June 8, 2023 11:23

Refactor first/last date getters

71727bd

Split method in two

e40297d

Update src/main/java/org/opentripplanner/graph_builder/module/interli…

519345b

…ning/InterlineProcessor.java Co-authored-by: Thomas Gran <t2gran@gmail.com>

leonardehrenfried approved these changes Jun 8, 2023

View reviewed changes

t2gran approved these changes Jun 8, 2023

View reviewed changes

optionsome merged commit 5c4d936 into opentripplanner:dev-2.x Jun 8, 2023

optionsome deleted the fix-gtfs-interline-generation branch June 8, 2023 11:50

t2gran pushed a commit that referenced this pull request Jun 8, 2023

Add changelog entry for #5162 [ci skip]

c27f893

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check service dates instead of service ids for block id transfers#5162

Check service dates instead of service ids for block id transfers#5162
optionsome merged 4 commits into
opentripplanner:dev-2.xfrom
HSLdevcom:fix-gtfs-interline-generation

optionsome commented Jun 2, 2023

Uh oh!

codecov Bot commented Jun 2, 2023 •

edited

Loading

Uh oh!

t2gran left a comment

Uh oh!

t2gran Jun 6, 2023

Uh oh!

t2gran Jun 6, 2023

Uh oh!

optionsome Jun 8, 2023

Uh oh!

t2gran Jun 6, 2023

Uh oh!

Uh oh!

t2gran Jun 6, 2023

Uh oh!

optionsome Jun 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		* @param mutable This should be set as true if the {@link BitSet} will be modified as otherwise
		* we don't have to create a copy of a cached entity.

Conversation

optionsome commented Jun 2, 2023

Summary

Issue

Unit tests

Documentation

Changelog

Uh oh!

codecov Bot commented Jun 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

t2gran left a comment

Choose a reason for hiding this comment

Uh oh!

t2gran Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

t2gran Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

optionsome Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

t2gran Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

t2gran Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

optionsome Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov Bot commented Jun 2, 2023 •

edited

Loading