Merge pull request #5060 from HSLdevcom/DT-6182-scooter-fixes

DT-6182 Scooter routing config
HSLdevcom · Sep 4, 2024 · 3e3c495 · 3e3c495
2 parents a5e36fb + 6d750b5
commit 3e3c495
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/app/component/itinerary/BicycleLeg.js b/app/component/itinerary/BicycleLeg.js
@@ -464,17 +464,14 @@ export default function BicycleLeg(
           </div>
         )}
         {isScooter && (
-          <div>
-            <div className="divider" />
-            <VehicleRentalLeg
-              stationName={leg.from.name}
-              isScooter={isScooter}
-              vehicleRentalStation={leg.from.vehicleRentalStation}
-              returnBike
-              rentalVehicle={leg.from.rentalVehicle}
-              nextLegMode={nextLegMode}
-            />
-          </div>
+          <VehicleRentalLeg
+            stationName={leg.from.name}
+            isScooter={isScooter}
+            vehicleRentalStation={leg.from.vehicleRentalStation}
+            returnBike
+            rentalVehicle={leg.from.rentalVehicle}
+            nextLegMode={nextLegMode}
+          />
         )}
       </div>
     </div>

diff --git a/app/component/itinerary/WalkLeg.js b/app/component/itinerary/WalkLeg.js
@@ -173,13 +173,18 @@ function WalkLeg(
               ) : (
                 <div>
                   {returnNotice ? (
-                    <VehicleRentalLeg
-                      isScooter={isScooter}
-                      stationName={leg[toOrFrom].name}
-                      vehicleRentalStation={leg[toOrFrom].vehicleRentalStation}
-                      returnBike
-                      rentalVehicle={leg.from.rentalVehicle}
-                    />
+                    <>
+                      <div className="divider" />
+                      <VehicleRentalLeg
+                        isScooter={isScooter}
+                        stationName={leg[toOrFrom].name}
+                        vehicleRentalStation={
+                          leg[toOrFrom].vehicleRentalStation
+                        }
+                        returnBike
+                        rentalVehicle={leg.from.rentalVehicle}
+                      />
+                    </>
                   ) : (
                     leg[toOrFrom].name
                   )}

diff --git a/app/util/planParamUtil.js b/app/util/planParamUtil.js
@@ -197,11 +197,12 @@ export function planQueryNeeded(
       );
 
     case PLANTYPE.SCOOTERTRANSIT:
-      /* special logic: relaxed scooter query is made only if no networks allowed, and scooters are available for selection */
+      /* special logic: relaxed scooter query is made only if no networks allowed */
       return (
+        config.transportModes.scooter.availableForSelection &&
         transitModes.length > 0 &&
         !wheelchair &&
-        (relaxSettings && config.transportModes.scooter.availableForSelection
+        (relaxSettings
           ? settings.scooterNetworks.length === 0
           : settings.scooterNetworks.length > 0)
       );