Merge pull request #890 from stadtnavi/feat/itinerary-page-bike-rent

feat(itinerary-page): show bike rent and park only itineraries
stadtnavi · Jan 21, 2025 · 2dd3c19 · 2dd3c19
2 parents ae1e577 + 9e57c16
commit 2dd3c19
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/app/component/ItineraryListContainer.js b/app/component/ItineraryListContainer.js
@@ -119,6 +119,7 @@ class ItineraryListContainer extends React.Component {
       'onDemandTaxi',
       'car',
       'scooter',
+      'bike',
     ];
     const { hash } = this.props.params;
     if (modesWithSubpath.includes(hash)) {

diff --git a/app/component/ItineraryPage.js b/app/component/ItineraryPage.js
@@ -279,7 +279,7 @@ class ItineraryPage extends React.Component {
           transitItineraries(result.bikeAndPublicPlan?.itineraries),
           ['BICYCLE'],
         );
-        const bikeRentAndPublicPlan = filterItineraries(
+        const bikeRentAndPublicItineraries = filterItineraries(
           transitItineraries(result.bikeRentAndPublicPlan?.itineraries),
           ['BICYCLE'],
         );
@@ -288,9 +288,10 @@ class ItineraryPage extends React.Component {
           itineraries: [
             ...bikeParkItineraries.slice(0, 3),
             ...bikePublicItineraries.slice(0, 3),
-            ...bikeRentAndPublicPlan.slice(0, 3),
+            ...bikeRentAndPublicItineraries.slice(0, 3),
           ],
         };
+
         this.bikeAndParkItineraryCount = Math.min(
           bikeParkItineraries.length,
           3,
@@ -302,15 +303,19 @@ class ItineraryPage extends React.Component {
         );
 
         this.bikeRentAndPublicItineraryCount = Math.min(
-          bikeRentAndPublicPlan.length,
+          bikeRentAndPublicItineraries.length,
           3,
         );
 
         const bikePlan = {
-          ...result.bikePlan,
-          itineraries: filterItineraries(result.bikePlan?.itineraries, [
-            'BICYCLE',
-          ]),
+          itineraries: filterItineraries(
+            [
+              ...(result.bikePlan?.itineraries || []),
+              ...(result.bikeRentAndPublicPlan?.itineraries || []),
+              ...(result.bikeParkPlan?.itineraries || []),
+            ],
+            ['BICYCLE'],
+          ).filter(itinerary => itinerary.legs.every(l => !l.transitLeg)),
         };
 
         const parkRidePlan = {
@@ -324,8 +329,12 @@ class ItineraryPage extends React.Component {
             walkPlan: result.walkPlan,
             bikePlan,
             bikeTransitPlan,
-            bikeRentAndPublicPlan: result.bikeRentAndPublicPlan,
-            bikeParkPlan: result.bikeParkPlan,
+            bikeRentAndPublicPlan: {
+              itineraries: bikeRentAndPublicItineraries,
+            },
+            bikeParkPlan: {
+              itineraries: bikeParkItineraries,
+            },
             scooterRentAndPublicPlan: result.scooterRentAndPublicPlan,
             carPlan: result.carPlan,
             carRentalPlan: result.carRentalPlan,

diff --git a/app/component/ItineraryPageUtils.js b/app/component/ItineraryPageUtils.js
@@ -77,7 +77,8 @@ export function showDetailView(hash, secondHash, itineraries) {
   if (
     hash === streetHash.bikeAndVehicle ||
     hash === streetHash.parkAndRide ||
-    hash === streetHash.scooter
+    hash === streetHash.scooter ||
+    hash === streetHash.bike
   ) {
     // note that '0' < 1 in javascript, because strings are converted to numbers
     return secondHash < itineraries.length;

diff --git a/app/util/planParamUtil.js b/app/util/planParamUtil.js
@@ -454,8 +454,6 @@ export const preparePlanParams = (config, useDefaultModes) => (
       // - include itineraries with rented `BICYCLE` legs
       // - include itineraries without any `BICYCLE` legs whatsoever
       { mode: 'BICYCLE', qualifier: 'RENT' },
-      // TODO: OTP seems to require FLEX DIRECT to return bike rental & transit results, to be checked
-      { mode: 'FLEX', qualifier: 'DIRECT' },
       ...modesAsOTPModes(getBicycleCompatibleModes(config, modesOrDefault)),
     ],
     bannedBicycleParkingTags,