Restructure walk/bicycle/car preferences in router-config.json #5582

optionsome · 2023-12-18T16:08:36Z

Summary

Make own wrapper objects for bicycle, car and walk in router-config.json. Additionally, make parking and rental objects for car and triangle, walk, rental and parking objects for bicycle.

Issue

This is related to #4803

Unit tests

Added and updated tests

Documentation

Updated documentation

Changelog

From title

…ngle configuration

codecov · 2024-01-08T14:49:58Z

Codecov Report

Attention: 27 lines in your changes are missing coverage. Please review.

Comparison is base (ab694b8) 67.55% compared to head (ed51e52) 67.49%.
Report is 60 commits behind head on dev-2.x.

Files	Patch %	Lines
...ext/restapi/mapping/LegacyBicycleOptimizeType.java	50.00%	6 Missing ⚠️
...rg/opentripplanner/visualizer/GraphVisualizer.java	0.00%	4 Missing ⚠️
.../request/preference/VehicleWalkingPreferences.java	95.16%	0 Missing and 3 partials ⚠️
.../restapi/resources/RequestToPreferencesMapper.java	85.71%	1 Missing and 1 partial ⚠️
...i/request/preference/VehicleRentalPreferences.java	93.10%	0 Missing and 2 partials ⚠️
.../opentripplanner/street/model/edge/StreetEdge.java	75.00%	2 Missing ⚠️
...nner/apis/gtfs/mapping/OptimizationTypeMapper.java	85.71%	1 Missing ⚠️
...routing/api/request/preference/CarPreferences.java	85.71%	0 Missing and 1 partial ⚠️
...ing/api/request/preference/RoutingPreferences.java	0.00%	0 Missing and 1 partial ⚠️
...pi/request/preference/TimeSlopeSafetyTriangle.java	0.00%	0 Missing and 1 partial ⚠️
... and 4 more

Additional details and impacted files

@@              Coverage Diff              @@
##             dev-2.x    #5582      +/-   ##
=============================================
- Coverage      67.55%   67.49%   -0.07%     
- Complexity     16223    16282      +59     
=============================================
  Files           1865     1887      +22     
  Lines          71204    71553     +349     
  Branches        7398     7409      +11     
=============================================
+ Hits           48103    48292     +189     
- Misses         20607    20759     +152     
- Partials        2494     2502       +8

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

docs/RouteRequest.md

leonardehrenfried · 2024-01-09T12:28:13Z

src/main/java/org/opentripplanner/api/mapping/LegacyBicycleOptimizeType.java

+/**
+ * Bicycle optimization types that are only meant to be used by the REST API. Related to {@link org.opentripplanner.routing.core.BicycleOptimizeType}
+ */
+public enum LegacyBicycleOptimizeType {


👍 Nice separation here.

src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java

leonardehrenfried · 2024-01-09T12:48:09Z

src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java

+      // triangle overrides the optimization type if defined
+      .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(cb, it))
+      .withWalking(it -> mapVehicleWalking(cb, it))
+      .withParking(it -> mapParking(cb, it))
+      .withRental(it -> mapRental(cb, it));


A very nice cleanup. 👍

leonardehrenfried · 2024-01-09T12:55:28Z

src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java

      )
-      .withRental(it -> setVehicleRental(c, it));
+      // triangle overrides the optimization type if defined
+      .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(cb, it))


I'm in favour of this behaviour but doesn't this change how the API works?

This is only used by the configuration which we can break now. Later on I will use it for the new plan query as well. All the other places use the old method.

leonardehrenfried

I have a few comments but generally I think this is a great PR.

…ce/VehicleWalkingPreferences.java Co-authored-by: Leonard Ehrenfried <[email protected]>

leonardehrenfried · 2024-01-09T13:08:30Z

It's not directly related to this PR but I realised that we don't have a test for mapping the walkRelucance from the API, so I added it: leonardehrenfried@614ef6b

Do you think you can pull it into this branch?

optionsome · 2024-01-09T16:00:25Z

It's not directly related to this PR but I realised that we don't have a test for mapping the walkRelucance from the API, so I added it: leonardehrenfried@614ef6b

Do you think you can pull it into this branch?

Thanks, I've included it now.

…factor

src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java

...main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java

src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java

optionsome added Improvement bump serialization id Add this label if you want the serialization id automatically bumped after merging the PR Config Change labels Dec 18, 2023

optionsome mentioned this pull request Jan 2, 2024

Restructure street preeferences to prepare for otp changes HSLdevcom/OpenTripPlanner-data-container#379

Merged

optionsome force-pushed the route-request-refactor branch from 3813de5 to cbf2406 Compare January 4, 2024 09:22

optionsome added 9 commits January 8, 2024 16:22

Introduce vehicle walking preferences

1ba569a

Restructure and name bike/car preferences in router-config

f96c42b

Make own wrapper for walk preferences in router-config

d199e39

Rename walking -> walk

845532a

Rename/type rental preferences and remove unused carDropoffTime

ee99250

Retype pickupTime and expose cost as Cost

3bbe2d0

Add car parking to doc

4009ade

Expose triangle in docs

27d4921

Rename bicycle optimization types in the internal model and ease tria…

831a4d8

…ngle configuration

optionsome force-pushed the route-request-refactor branch from cbf2406 to 831a4d8 Compare January 8, 2024 14:43

optionsome marked this pull request as ready for review January 8, 2024 14:43

optionsome requested a review from a team as a code owner January 8, 2024 14:43

optionsome added this to the 2.5 (next release) milestone Jan 8, 2024

t2gran requested review from leonardehrenfried and t2gran January 9, 2024 10:02

leonardehrenfried reviewed Jan 9, 2024

View reviewed changes

docs/RouteRequest.md Outdated Show resolved Hide resolved

leonardehrenfried reviewed Jan 9, 2024

View reviewed changes

src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java Outdated Show resolved Hide resolved

leonardehrenfried reviewed Jan 9, 2024

View reviewed changes

Update src/main/java/org/opentripplanner/routing/api/request/preferen…

a3f55d5

…ce/VehicleWalkingPreferences.java Co-authored-by: Leonard Ehrenfried <[email protected]>

Add API mapper test for walk reluctance

69bd965

optionsome added 2 commits January 9, 2024 17:48

Rename park cost/time

9b075d2

Update docs

173df94

optionsome requested a review from leonardehrenfried January 9, 2024 16:00

leonardehrenfried previously approved these changes Jan 10, 2024

View reviewed changes

Merge remote-tracking branch 'upstream/dev-2.x' into route-request-re…

df6e20d

…factor

optionsome dismissed leonardehrenfried’s stale review via df6e20d January 12, 2024 21:36

leonardehrenfried previously approved these changes Jan 15, 2024

View reviewed changes

t2gran requested changes Jan 17, 2024

View reviewed changes

optionsome added 2 commits January 17, 2024 17:24

Move public methods up

f290e95

Rename variables

f11a81a

optionsome dismissed leonardehrenfried’s stale review via f11a81a January 17, 2024 15:38

optionsome requested review from t2gran and leonardehrenfried January 17, 2024 15:38

leonardehrenfried previously approved these changes Jan 17, 2024

View reviewed changes

Make builder field private

aaff0ec

optionsome dismissed leonardehrenfried’s stale review via aaff0ec January 18, 2024 09:51

optionsome requested a review from leonardehrenfried January 18, 2024 09:52

Move class to correct package

ed51e52

leonardehrenfried approved these changes Jan 18, 2024

View reviewed changes

t2gran approved these changes Jan 18, 2024

View reviewed changes

optionsome merged commit c8a6b86 into opentripplanner:dev-2.x Jan 18, 2024
5 checks passed

optionsome deleted the route-request-refactor branch January 18, 2024 20:52

t2gran pushed a commit that referenced this pull request Jan 18, 2024

Add changelog entry for #5582 [ci skip]

dcd0a5e

t2gran pushed a commit that referenced this pull request Jan 18, 2024

Bump serialization version id for #5582

1832b67

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Restructure walk/bicycle/car preferences in router-config.json #5582

Restructure walk/bicycle/car preferences in router-config.json #5582

optionsome commented Dec 18, 2023 •

edited

Loading

codecov bot commented Jan 8, 2024 •

edited

Loading

leonardehrenfried Jan 9, 2024

leonardehrenfried Jan 9, 2024

leonardehrenfried Jan 9, 2024

optionsome Jan 9, 2024

leonardehrenfried left a comment

leonardehrenfried commented Jan 9, 2024 •

edited

Loading

optionsome commented Jan 9, 2024

Restructure walk/bicycle/car preferences in router-config.json #5582

Restructure walk/bicycle/car preferences in router-config.json #5582

Conversation

optionsome commented Dec 18, 2023 • edited Loading

Summary

Issue

Unit tests

Documentation

Changelog

codecov bot commented Jan 8, 2024 • edited Loading

Codecov Report

leonardehrenfried Jan 9, 2024

Choose a reason for hiding this comment

leonardehrenfried Jan 9, 2024

Choose a reason for hiding this comment

leonardehrenfried Jan 9, 2024

Choose a reason for hiding this comment

optionsome Jan 9, 2024

Choose a reason for hiding this comment

leonardehrenfried left a comment

Choose a reason for hiding this comment

leonardehrenfried commented Jan 9, 2024 • edited Loading

optionsome commented Jan 9, 2024

optionsome commented Dec 18, 2023 •

edited

Loading

codecov bot commented Jan 8, 2024 •

edited

Loading

leonardehrenfried commented Jan 9, 2024 •

edited

Loading