DT-5921 Add car ferry functionality #5121
Conversation
…ar and disable leg text for ferries in the matka config.
VillePihlava
changed the title
There was a problem hiding this comment.
Good work. I suggested a fair amount of mainly cosmetic changes, which make the code easier to read and understand.
In general, try to avoid adding unncecessary validation checks 'just in case'. The code should fail fast and crash if variable values are not valid.
app/component/itinerary/CarLeg.js
Outdated
| <div className={cx('itinerary-leg-action', 'car')}> | ||
| <div className="itinerary-leg-action-content"> |
There was a problem hiding this comment.
I did not change these for now. For example, there are similar divs in BicycleLeg, BikeParkLeg, CarParkLeg. Do you want all of these changed or none?
There was a problem hiding this comment.
Ok I understand. I would love to see all code improving continuously. Please fix this unless it feels unreasonably big task.
There was a problem hiding this comment.
These two divs have been merged everywhere I could find them.
app/component/itinerary/CarLeg.js
Outdated
| <div className={cx('itinerary-leg-action', 'car')}> | ||
| <div className="itinerary-leg-action-content"> |
There was a problem hiding this comment.
I did not change these for now. For example, there are similar divs in BicycleLeg, BikeParkLeg, CarParkLeg. Do you want all of these changed or none?
There was a problem hiding this comment.
These two divs have been merged everywhere I could find them.
|
There is a conflict. |
app/util/planParamUtil.js
Outdated
| return ( | ||
| transitModes.length > 0 && | ||
| settings.includeCarSuggestions && | ||
| config.carBoardingModes?.FERRY !== undefined |
There was a problem hiding this comment.
This seems wrong. I suggest:
settings.includeCarSuggestions && filterTransitModes(...).length > 0
There was a problem hiding this comment.
I changed this to transitModes.length > 0 && settings.includeCarSuggestions. I didn't realize previously that transitModes is filtered earlier with filterTransitModes.
VillePihlava
changed the title
…n-icon CSS classes.
app/component/itinerary/Itinerary.js
Outdated
| @@ -277,6 +280,9 @@ const Itinerary = ( | |||
| ); | |||
| const usingOwnBicycleWholeTrip = | |||
| usingOwnBicycle && itinerary.legs.every(leg => !leg.to?.vehicleParking); | |||
| const usingOwnCar = itinerary.legs.some(leg => getLegMode(leg) === 'CAR'); | |||
| const usingOwnCarWholeTrip = | |||
| usingOwnCar && itinerary.legs.every(leg => !leg.to?.vehicleParking); | |||
There was a problem hiding this comment.
right, unit tests often use bad mock data. Fixing code causes huge amount of test failures which is really annoying.
|
Merge conflicts resolved |
This should not be merged before the functionality from this pr can be used opentripplanner/OpenTripPlanner#5966,
Proposed Changes