Merge pull request #5782 from HSLdevcom/remove-taxi-option-for-navigator

AB#551 - Disable navigator for itineraries with taxi legs

Author: vesameskanen

app/component/itinerary/ItineraryPage.js

@@ -91,6 +91,7 @@ import NaviContainer from './navigator/NaviContainer';
 import NaviGeolocationInfoModal from './navigator/navigatorgeolocation/NaviGeolocationInfoModal';
 import NavigatorIntroModal from './navigator/navigatorintro/NavigatorIntroModal';
 import { planConnection } from './queries/PlanConnection';
+import { hasTaxiLegs } from '../../util/legUtils';
 
 const MAX_QUERY_COUNT = 4; // number of attempts to collect enough itineraries
 
@@ -1459,7 +1460,10 @@ export default function ItineraryPage(props, context) {
           Date.now() + 24 * 3600 * 1000;
 
       const navigateHook =
-        !desktop && config.navigation && presentSearch
+        !desktop &&
+        config.navigation &&
+        presentSearch &&
+        !hasTaxiLegs(combinedEdges[selectedIndex]?.node)
           ? () =>
               startNavigationWithAnalytics(combinedEdges[selectedIndex]?.node)
           : undefined;

app/util/legUtils.js

@@ -108,6 +108,7 @@ export const LegMode = {
   Car: 'CAR',
   Rail: 'RAIL',
   Wait: 'WAIT',
+  Taxi: 'TAXI',
 };
 
 /**
@@ -134,6 +135,8 @@ export function getLegMode(legOrMode) {
       return LegMode.Car;
     case LegMode.Rail:
       return LegMode.Rail;
+    case LegMode.Taxi:
+      return LegMode.Taxi;
     default:
       return undefined;
   }
@@ -460,7 +463,14 @@ function isBikingLeg(leg) {
   return [LegMode.Bicycle, LegMode.CityBike].includes(getLegMode(leg));
 }
 function isDrivingLeg(leg) {
-  return [LegMode.Car].includes(getLegMode(leg));
+  return LegMode.Car === getLegMode(leg);
+}
+function isTaxiLeg(leg) {
+  return LegMode.Taxi === getLegMode(leg);
+}
+
+export function hasTaxiLegs(itinerary) {
+  return itinerary.legs.some(isTaxiLeg);
 }
 
 /**