From 86b9e970fcd7f3f0f80b3cd886f0472e5da47fdc Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Mon, 11 Nov 2024 09:15:08 +0200
Subject: [PATCH 01/11] chore: format

---
 app/component/itinerary/ItineraryDetails.js | 109 +++++++++++---------
 1 file changed, 61 insertions(+), 48 deletions(-)

diff --git a/app/component/itinerary/ItineraryDetails.js b/app/component/itinerary/ItineraryDetails.js
index 8adae18d57..115dab0cbe 100644
--- a/app/component/itinerary/ItineraryDetails.js
+++ b/app/component/itinerary/ItineraryDetails.js
@@ -83,7 +83,7 @@ class ItineraryDetails extends React.Component {
       this.context.match.params.hash !== streetHash.walk &&
       this.context.match.params.hash !== streetHash.bike
     );
-  };
+  }
 
   getFutureText(startTime) {
     const refTime = Date.now();
@@ -96,7 +96,7 @@ class ItineraryDetails extends React.Component {
       });
     }
     return getFormattedTimeDate(startTime, 'dd D.M.');
-  };
+  }
 
   getExtraProps(itinerary) {
     const compressedItinerary = {
@@ -130,24 +130,36 @@ class ItineraryDetails extends React.Component {
       futureText,
       isMultiRow,
     };
-  };
+  }
 
   render() {
-    const { itinerary, currentLanguage, isMobile, bikeAndPublicItineraryCount } = this.props;
+    const {
+      itinerary,
+      currentLanguage,
+      isMobile,
+      bikeAndPublicItineraryCount,
+    } = this.props;
     const { config } = this.context;
     if (!itinerary?.legs[0]) {
       return null;
     }
     const fares = getFaresFromLegs(itinerary.legs, config);
     const extraProps = this.getExtraProps(itinerary);
-    const {biking, walking, driving, futureText, isMultiRow} = extraProps;
+    const { biking, walking, driving, futureText, isMultiRow } = extraProps;
     const legsWithRentalBike = compressLegs(itinerary.legs).filter(leg =>
       legContainsRentalBike(leg),
     );
-    const legswithBikePark = compressLegs(itinerary.legs).filter(leg => legContainsBikePark(leg));
-    const legsWithScooter = compressLegs(itinerary.legs).some(leg => leg.mode === 'SCOOTER');
+    const legswithBikePark = compressLegs(itinerary.legs).filter(leg =>
+      legContainsBikePark(leg),
+    );
+    const legsWithScooter = compressLegs(itinerary.legs).some(
+      leg => leg.mode === 'SCOOTER',
+    );
     const containsBiking = biking.duration > 0 && biking.distance > 0;
-    const showBikeBoardingInformation = containsBiking && bikeAndPublicItineraryCount > 0 && legswithBikePark.length === 0;
+    const showBikeBoardingInformation =
+      containsBiking &&
+      bikeAndPublicItineraryCount > 0 &&
+      legswithBikePark.length === 0;
     const rentalBikeNetworks = new Set();
     let showRentalBikeDurationWarning = false;
     if (legsWithRentalBike.length > 0) {
@@ -183,7 +195,10 @@ class ItineraryDetails extends React.Component {
 
     const externalOperatorJourneys = legsWithScooter;
 
-    if (shouldShowFareInfo(config) && (fares.some(fare => fare.isUnknown) || externalOperatorJourneys) ) {
+    if (
+      shouldShowFareInfo(config) &&
+      (fares.some(fare => fare.isUnknown) || externalOperatorJourneys)
+    ) {
       const found = {};
       itinerary.legs.forEach(leg => {
         if (config.modeDisclaimers?.[leg.mode] && !found[leg.mode]) {
@@ -201,13 +216,10 @@ class ItineraryDetails extends React.Component {
       });
 
       const info = config.callAgencyInfo?.[currentLanguage];
-      if (
-        info &&
-        itinerary.legs.some(leg => isCallAgencyPickupType(leg))
-      ) {
+      if (info && itinerary.legs.some(leg => isCallAgencyPickupType(leg))) {
         disclaimers.push(
           <FareDisclaimer
-	    key={disclaimers.length}
+            key={disclaimers.length}
             textId="separate-ticket-required-for-call-agency-disclaimer"
             href={info.callAgencyInfoLink}
             linkText={info.callAgencyInfoLinkText}
@@ -218,11 +230,13 @@ class ItineraryDetails extends React.Component {
       if (!disclaimers.length) {
         disclaimers.push(
           <FareDisclaimer
-	    key="faredisclaimer-separate-ticket-key"
+            key="faredisclaimer-separate-ticket-key"
             textId="separate-ticket-required-disclaimer"
             values={{
-              agencyName: typeof config.primaryAgencyName === 'string' ? config.primaryAgencyName :
-		config.primaryAgencyName?.[currentLanguage]
+              agencyName:
+                typeof config.primaryAgencyName === 'string'
+                  ? config.primaryAgencyName
+                  : config.primaryAgencyName?.[currentLanguage],
             }}
           />,
         );
@@ -238,10 +252,10 @@ class ItineraryDetails extends React.Component {
               number: itineraryIndex,
             }}
           />
-	</h2>
+        </h2>
         <BreakpointConsumer>
           {breakpoint => [
-	    breakpoint === 'large' && !this.props.hideTitle && (
+            breakpoint === 'large' && !this.props.hideTitle && (
               <div className="desktop-title" key="header">
                 <div className="title-container h2">
                   <BackButton
@@ -258,7 +272,7 @@ class ItineraryDetails extends React.Component {
                 </div>
               </div>
             ),
-	    <ItinerarySummary
+            <ItinerarySummary
               itinerary={itinerary}
               key="summary"
               walking={walking}
@@ -267,15 +281,14 @@ class ItineraryDetails extends React.Component {
               futureText={futureText}
               isMultiRow={isMultiRow}
               isMobile={isMobile}
-              hideBottomDivider={isMobile && shouldShowFarePurchaseInfo(
-                config,
-                breakpoint,
-                fares,
-              )}
+              hideBottomDivider={
+                isMobile &&
+                shouldShowFarePurchaseInfo(config, breakpoint, fares)
+              }
             />,
             showRentalBikeDurationWarning && (
               <VehicleRentalDurationInfo
-		key="rentaldurationinfo"
+                key="rentaldurationinfo"
                 networks={Array.from(rentalBikeNetworks)}
                 config={config}
               />
@@ -283,28 +296,28 @@ class ItineraryDetails extends React.Component {
             shouldShowFareInfo(config) &&
               (shouldShowFarePurchaseInfo(config, breakpoint, fares) ? (
                 <MobileTicketPurchaseInformation
-		  key="mobileticketpurchaseinformation"
+                  key="mobileticketpurchaseinformation"
                   fares={fares}
                   zones={getZones(itinerary.legs)}
                 />
               ) : (
                 <TicketInformation
-		  key="ticketinformation"
+                  key="ticketinformation"
                   fares={fares}
                   zones={getZones(itinerary.legs)}
                   legs={itinerary.legs}
                 />
               )),
 
-              this.props.setNavigation && (
-                <StartNavi
-                  key="navigation"
-                  setNavigation={this.props.setNavigation}
-                />
-              ),
+            this.props.setNavigation && (
+              <StartNavi
+                key="navigation"
+                setNavigation={this.props.setNavigation}
+              />
+            ),
             config.showCO2InItinerarySummary && !legsWithScooter && (
               <EmissionsInfo
-		key="emissionsummary"
+                key="emissionsummary"
                 itinerary={itinerary}
                 isMobile={isMobile}
               />
@@ -319,11 +332,11 @@ class ItineraryDetails extends React.Component {
                 className={cx('itinerary-main', {
                   'bp-large': breakpoint === 'large',
                 })}
-		key="legwrapper"
+                key="legwrapper"
               >
                 {disclaimers}
                 <Legs
-		  key="itinerarylegs"
+                  key="itinerarylegs"
                   fares={fares}
                   itinerary={itinerary}
                   focusToPoint={this.props.focusToPoint}
@@ -337,7 +350,7 @@ class ItineraryDetails extends React.Component {
               </div>
               {config.showCO2InItinerarySummary && !legsWithScooter && (
                 <Emissions
-		  key="emissionsinfo"
+                  key="emissionsinfo"
                   config={config}
                   itinerary={itinerary}
                   carEmissions={this.props.carEmissions}
@@ -354,7 +367,7 @@ class ItineraryDetails extends React.Component {
                   />
                 </div>
               )}
-              <div className="itinerary-empty-space" key="emptyspace"/>
+              <div className="itinerary-empty-space" key="emptyspace" />
             </div>,
           ]}
         </BreakpointConsumer>
@@ -447,14 +460,14 @@ const withRelay = createFragmentContainer(
             lat
             lon
             name
-            vehicleParking  {
+            vehicleParking {
               name
               vehicleParkingId
             }
             vehicleRentalStation {
               rentalNetwork {
-               networkId
-            }
+                networkId
+              }
               availableVehicles {
                 total
               }
@@ -469,7 +482,7 @@ const withRelay = createFragmentContainer(
               lon
               rentalUris {
                 android
-                ios 
+                ios
                 web
               }
               rentalNetwork {
@@ -507,7 +520,7 @@ const withRelay = createFragmentContainer(
               lon
               stationId
               rentalNetwork {
-               networkId
+                networkId
               }
               availableVehicles {
                 total
@@ -542,13 +555,13 @@ const withRelay = createFragmentContainer(
                 }
               }
             }
-            vehicleParking  {
-               vehicleParkingId
-               name
+            vehicleParking {
+              vehicleParkingId
+              name
             }
           }
           intermediatePlaces {
-            arrival  {
+            arrival {
               scheduledTime
               estimated {
                 time

From e0a93cbc6c64d6f406b4a703504f7847ec028fa2 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Tue, 12 Nov 2024 23:02:57 +0200
Subject: [PATCH 02/11] chore: moved navigator itinerary storage to more
 appropriate place

---
 app/component/itinerary/ItineraryDetails.js |  1 +
 app/component/itinerary/ItineraryPage.js    |  6 -----
 app/component/itinerary/StartNavi.js        | 26 +++++++++++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/component/itinerary/ItineraryDetails.js b/app/component/itinerary/ItineraryDetails.js
index 115dab0cbe..4a3ed6e6b4 100644
--- a/app/component/itinerary/ItineraryDetails.js
+++ b/app/component/itinerary/ItineraryDetails.js
@@ -312,6 +312,7 @@ class ItineraryDetails extends React.Component {
             this.props.setNavigation && (
               <StartNavi
                 key="navigation"
+                itinerary={itinerary}
                 setNavigation={this.props.setNavigation}
               />
             ),
diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index 06ea3eef92..bd8c2ee491 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -17,7 +17,6 @@ import {
   getDialogState,
   getLatestNavigatorItinerary,
   setDialogState,
-  setLatestNavigatorItinerary,
 } from '../../store/localStorage';
 import { addAnalyticsEvent } from '../../util/analyticsUtils';
 import { getWeatherData } from '../../util/apiUtils';
@@ -650,11 +649,6 @@ export default function ItineraryPage(props, context) {
       setMapState({ center: undefined, zoom: undefined, bounds: undefined });
       navigateMap();
       clearLatestNavigatorItinerary();
-    } else {
-      const { combinedEdges, selectedIndex } = getItinerarySelection();
-      if (combinedEdges[selectedIndex]?.node) {
-        setLatestNavigatorItinerary(combinedEdges[selectedIndex]?.node);
-      }
     }
     setNaviMode(isEnabled);
   };
diff --git a/app/component/itinerary/StartNavi.js b/app/component/itinerary/StartNavi.js
index f29a104a1c..52aae69d3e 100644
--- a/app/component/itinerary/StartNavi.js
+++ b/app/component/itinerary/StartNavi.js
@@ -1,18 +1,34 @@
+import { matchShape } from 'found';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
-import { configShape } from '../../util/shapes';
+import { setLatestNavigatorItinerary } from '../../store/localStorage';
+import { configShape, itineraryShape } from '../../util/shapes';
 import Icon from '../Icon';
 
-const StartNavi = ({ setNavigation }, context) => {
-  const { config, intl } = context;
+const StartNavi = ({ setNavigation, itinerary }, context) => {
+  const { config, intl, match } = context;
 
   const color =
     config.colors?.accessiblePrimary || config.colors?.primary || 'black';
 
+  const handleClick = () => {
+    setNavigation(true);
+    setLatestNavigatorItinerary({
+      itinerary,
+      params: {
+        from: match.params.from,
+        to: match.params.to,
+        arriveBy: match.location.query.arriveBy,
+        time: match.location.query.time,
+        index: match.params.hash,
+      },
+    });
+  };
+
   return (
     <div className="navi-start-container">
-      <button type="button" onClick={() => setNavigation(true)}>
+      <button type="button" onClick={handleClick}>
         <Icon img="icon-icon_navigation" color={color} height={2} width={2} />
         <div className="content">
           <FormattedMessage tagName="div" id="new-feature" />
@@ -32,11 +48,13 @@ const StartNavi = ({ setNavigation }, context) => {
 
 StartNavi.propTypes = {
   setNavigation: PropTypes.func.isRequired,
+  itinerary: itineraryShape.isRequired,
 };
 
 StartNavi.contextTypes = {
   config: configShape.isRequired,
   intl: intlShape.isRequired,
+  match: matchShape.isRequired,
 };
 
 export default StartNavi;

From eb06be1fe8ad4921ce1529dd226fd31d6a2cda41 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Tue, 12 Nov 2024 23:03:26 +0200
Subject: [PATCH 03/11] fix: More context aware Navigator

---
 app/component/itinerary/ItineraryPage.js | 66 +++++++++++++++++++++---
 1 file changed, 58 insertions(+), 8 deletions(-)

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index bd8c2ee491..e409f5fa63 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -739,16 +739,63 @@ export default function ItineraryPage(props, context) {
     );
   }
 
+  /**
+   * Checks if itinerary in local storage was set with identical parameters.
+   *
+   * @param {{from: string, to: string, time: number, arriveBy: boolean, hash: number}} storedParams
+   * @param {boolean} shouldCompareHash false bypasses hash check when user navigates to ItineraryPage root with the list of suggested itineraries
+   * @returns true if stored itinerary was set with identical parameters
+   */
+  const isMatchingParams = (storedParams, shouldCompareHash) => {
+    if (!storedParams) {
+      return false;
+    }
+    let isHashOK = true;
+    if (shouldCompareHash) {
+      isHashOK =
+        hash !== undefined && hash !== null && storedParams.index === hash;
+    }
+    return (
+      storedParams.from === params.from &&
+      storedParams.to === params.to &&
+      storedParams.time === query.time &&
+      storedParams.arriveBy === query.arriveBy &&
+      isHashOK
+    );
+  };
+
+  /**
+   * Enables naviMode immediately on itinerary selection if all of the following resolve as true:
+   * a stored itinerary exists
+   * the stored itinerary ends in future
+   * the stored itinerary to and from coordinates match those of current query
+   *
+   * Note: false value is not passed to function to prevent localStorage entry from being cleared
+   */
+  const setupNavigator = () => {
+    const { itinerary: storedItinerary, params: storedParams } =
+      getLatestNavigatorItinerary();
+    if (
+      storedItinerary &&
+      Date.parse(storedItinerary.end) > Date.now() &&
+      isMatchingParams(storedParams, true)
+    ) {
+      setNavigation(true);
+    }
+  };
+
   useEffect(() => {
     setCurrentTimeToURL(config, match);
     updateLocalStorage(true);
     addFeedbackly(context);
 
-    const storedItinerary = getLatestNavigatorItinerary();
-
-    setNavigation(
-      storedItinerary?.end && Date.parse(storedItinerary.end) > Date.now(),
-    );
+    const { params: storedParams } = getLatestNavigatorItinerary();
+    if (
+      !isMatchingParams(storedParams, false) &&
+      (hash === undefined || hash === null)
+    ) {
+      clearLatestNavigatorItinerary();
+    }
 
     return () => {
       if (showVehicles()) {
@@ -770,6 +817,7 @@ export default function ItineraryPage(props, context) {
       makeRelaxedQuery();
       makeRelaxedScooterQuery();
     }
+    setupNavigator();
   }, [
     settingsState.settingsChanged,
     params.from,
@@ -781,6 +829,7 @@ export default function ItineraryPage(props, context) {
   useEffect(() => {
     navigateMap();
     setMapState({ center: undefined, zoom: undefined, bounds: undefined });
+    setupNavigator();
 
     if (detailView) {
       // If itinerary is not found in detail view, go back to summary view
@@ -1134,8 +1183,9 @@ export default function ItineraryPage(props, context) {
     );
   } else if (detailView) {
     if (naviMode) {
-      const naviModeItinerary =
-        getLatestNavigatorItinerary() || combinedEdges[selectedIndex]?.node;
+      const { itinerary: storedItinerary } = getLatestNavigatorItinerary();
+      const itineraryForNavigator =
+        storedItinerary || combinedEdges[selectedIndex]?.node;
 
       content = (
         <>
@@ -1147,7 +1197,7 @@ export default function ItineraryPage(props, context) {
             />
           )}
           <NaviContainer
-            itinerary={naviModeItinerary}
+            itinerary={itineraryForNavigator}
             focusToLeg={focusToLeg}
             relayEnvironment={props.relayEnvironment}
             setNavigation={setNavigation}

From 41a6d4448632f859cb6ab09dee3567306157d683 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Tue, 12 Nov 2024 23:20:56 +0200
Subject: [PATCH 04/11] chore: updated comment

---
 app/component/itinerary/ItineraryPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index e409f5fa63..cf5c4ced1c 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -768,9 +768,9 @@ export default function ItineraryPage(props, context) {
    * Enables naviMode immediately on itinerary selection if all of the following resolve as true:
    * a stored itinerary exists
    * the stored itinerary ends in future
-   * the stored itinerary to and from coordinates match those of current query
+   * the params stored along itinerary match those of the current query
    *
-   * Note: false value is not passed to function to prevent localStorage entry from being cleared
+   * Note: false value is not passed to setNavigation to prevent localStorage entry from being cleared
    */
   const setupNavigator = () => {
     const { itinerary: storedItinerary, params: storedParams } =

From 185480c50aa1e702bb647c60b675640b45d4239e Mon Sep 17 00:00:00 2001
From: Vesa Meskanen <vesa@realsoft.com>
Date: Wed, 13 Nov 2024 10:42:06 +0200
Subject: [PATCH 05/11] chore: remove es-lint disable

---
 app/component/itinerary/ItineraryDetails.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/component/itinerary/ItineraryDetails.js b/app/component/itinerary/ItineraryDetails.js
index 4a3ed6e6b4..30f31e8570 100644
--- a/app/component/itinerary/ItineraryDetails.js
+++ b/app/component/itinerary/ItineraryDetails.js
@@ -42,7 +42,6 @@ import Emissions from './Emissions';
 import EmissionsInfo from './EmissionsInfo';
 import FareDisclaimer from './FareDisclaimer';
 
-/* eslint-disable prettier/prettier */
 class ItineraryDetails extends React.Component {
   static propTypes = {
     itinerary: itineraryShape.isRequired,

From 97562593eeb7f28ebb2fe059daf9c3035c1d6371 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 08:28:21 +0200
Subject: [PATCH 06/11] chore: removed obsolete eslint-disable, organized
 imports

---
 app/component/itinerary/ItineraryDetails.js | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/component/itinerary/ItineraryDetails.js b/app/component/itinerary/ItineraryDetails.js
index 30f31e8570..9b679f6209 100644
--- a/app/component/itinerary/ItineraryDetails.js
+++ b/app/component/itinerary/ItineraryDetails.js
@@ -1,17 +1,15 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import { createFragmentContainer, graphql } from 'react-relay';
 import cx from 'classnames';
+import connectToStores from 'fluxible-addons-react/connectToStores';
 import { matchShape, routerShape } from 'found';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { FormattedMessage, intlShape } from 'react-intl';
-import connectToStores from 'fluxible-addons-react/connectToStores';
-import { configShape, itineraryShape, relayShape } from '../../util/shapes';
-import TicketInformation from './TicketInformation';
-import ItinerarySummary from './ItinerarySummary';
-import Legs from './Legs';
-import BackButton from '../BackButton';
-import StartNavi from './StartNavi';
-import MobileTicketPurchaseInformation from './MobileTicketPurchaseInformation';
+import { createFragmentContainer, graphql } from 'react-relay';
+import {
+  getFaresFromLegs,
+  shouldShowFareInfo,
+  shouldShowFarePurchaseInfo,
+} from '../../util/fareUtils';
 import {
   compressLegs,
   getTotalBikingDistance,
@@ -25,22 +23,24 @@ import {
   legContainsBikePark,
   legContainsRentalBike,
 } from '../../util/legUtils';
-import { BreakpointConsumer } from '../../util/withBreakpoint';
 import { streetHash } from '../../util/path';
-import {
-  getFaresFromLegs,
-  shouldShowFareInfo,
-  shouldShowFarePurchaseInfo,
-} from '../../util/fareUtils';
+import { configShape, itineraryShape, relayShape } from '../../util/shapes';
 import {
   getFormattedTimeDate,
   isToday,
   isTomorrow,
 } from '../../util/timeUtils';
-import VehicleRentalDurationInfo from './VehicleRentalDurationInfo';
+import { BreakpointConsumer } from '../../util/withBreakpoint';
+import BackButton from '../BackButton';
 import Emissions from './Emissions';
 import EmissionsInfo from './EmissionsInfo';
 import FareDisclaimer from './FareDisclaimer';
+import ItinerarySummary from './ItinerarySummary';
+import Legs from './Legs';
+import MobileTicketPurchaseInformation from './MobileTicketPurchaseInformation';
+import StartNavi from './StartNavi';
+import TicketInformation from './TicketInformation';
+import VehicleRentalDurationInfo from './VehicleRentalDurationInfo';
 
 class ItineraryDetails extends React.Component {
   static propTypes = {

From d98461dc1f9f64588f1e8a7fd020e781a2352fe9 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 11:18:29 +0200
Subject: [PATCH 07/11] chore: refactored util functions into
 ItineraryPageUtils

---
 app/component/itinerary/ItineraryPage.js      | 59 +++--------------
 app/component/itinerary/ItineraryPageUtils.js | 64 ++++++++++++++++---
 2 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index cf5c4ced1c..81123f18e2 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -61,6 +61,7 @@ import {
   getSelectedItineraryIndex,
   getTopics,
   isEqualItineraries,
+  isStoredItineraryRelevant,
   mergeBikeTransitPlans,
   mergeScooterTransitPlan,
   quitIteration,
@@ -69,6 +70,7 @@ import {
   setCurrentTimeToURL,
   settingsLimitRouting,
   stopClient,
+  storedParamsMatchURL,
   updateClient,
 } from './ItineraryPageUtils';
 import ItineraryTabs from './ItineraryTabs';
@@ -739,51 +741,6 @@ export default function ItineraryPage(props, context) {
     );
   }
 
-  /**
-   * Checks if itinerary in local storage was set with identical parameters.
-   *
-   * @param {{from: string, to: string, time: number, arriveBy: boolean, hash: number}} storedParams
-   * @param {boolean} shouldCompareHash false bypasses hash check when user navigates to ItineraryPage root with the list of suggested itineraries
-   * @returns true if stored itinerary was set with identical parameters
-   */
-  const isMatchingParams = (storedParams, shouldCompareHash) => {
-    if (!storedParams) {
-      return false;
-    }
-    let isHashOK = true;
-    if (shouldCompareHash) {
-      isHashOK =
-        hash !== undefined && hash !== null && storedParams.index === hash;
-    }
-    return (
-      storedParams.from === params.from &&
-      storedParams.to === params.to &&
-      storedParams.time === query.time &&
-      storedParams.arriveBy === query.arriveBy &&
-      isHashOK
-    );
-  };
-
-  /**
-   * Enables naviMode immediately on itinerary selection if all of the following resolve as true:
-   * a stored itinerary exists
-   * the stored itinerary ends in future
-   * the params stored along itinerary match those of the current query
-   *
-   * Note: false value is not passed to setNavigation to prevent localStorage entry from being cleared
-   */
-  const setupNavigator = () => {
-    const { itinerary: storedItinerary, params: storedParams } =
-      getLatestNavigatorItinerary();
-    if (
-      storedItinerary &&
-      Date.parse(storedItinerary.end) > Date.now() &&
-      isMatchingParams(storedParams, true)
-    ) {
-      setNavigation(true);
-    }
-  };
-
   useEffect(() => {
     setCurrentTimeToURL(config, match);
     updateLocalStorage(true);
@@ -791,8 +748,8 @@ export default function ItineraryPage(props, context) {
 
     const { params: storedParams } = getLatestNavigatorItinerary();
     if (
-      !isMatchingParams(storedParams, false) &&
-      (hash === undefined || hash === null)
+      (hash === undefined || hash === null) &&
+      !storedParamsMatchURL(storedParams, match)
     ) {
       clearLatestNavigatorItinerary();
     }
@@ -817,7 +774,9 @@ export default function ItineraryPage(props, context) {
       makeRelaxedQuery();
       makeRelaxedScooterQuery();
     }
-    setupNavigator();
+    if (isStoredItineraryRelevant(match)) {
+      setNavigation(true);
+    }
   }, [
     settingsState.settingsChanged,
     params.from,
@@ -829,7 +788,9 @@ export default function ItineraryPage(props, context) {
   useEffect(() => {
     navigateMap();
     setMapState({ center: undefined, zoom: undefined, bounds: undefined });
-    setupNavigator();
+    if (isStoredItineraryRelevant(match)) {
+      setNavigation(true);
+    }
 
     if (detailView) {
       // If itinerary is not found in detail view, go back to summary view
diff --git a/app/component/itinerary/ItineraryPageUtils.js b/app/component/itinerary/ItineraryPageUtils.js
index f77399ea17..c41ca55357 100644
--- a/app/component/itinerary/ItineraryPageUtils.js
+++ b/app/component/itinerary/ItineraryPageUtils.js
@@ -1,21 +1,22 @@
-import isEqual from 'lodash/isEqual';
+import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
 import pick from 'lodash/pick';
-import get from 'lodash/get';
 import polyline from 'polyline-encoded';
 import SunCalc from 'suncalc';
-import { boundWithMinimumArea } from '../../util/geo-utils';
-import { addAnalyticsEvent } from '../../util/analyticsUtils';
-import { getStartTimeWithColon } from '../../util/timeUtils';
-import { getSettings, getDefaultSettings } from '../../util/planParamUtil';
-import { PlannerMessageType } from '../../constants';
 import {
+  changeRealTimeClientTopics,
   startRealTimeClient,
   stopRealTimeClient,
-  changeRealTimeClientTopics,
 } from '../../action/realTimeClientAction';
+import { PlannerMessageType } from '../../constants';
+import { getLatestNavigatorItinerary } from '../../store/localStorage';
+import { addAnalyticsEvent } from '../../util/analyticsUtils';
+import { boundWithMinimumArea } from '../../util/geo-utils';
+import { compressLegs, getTotalBikingDistance } from '../../util/legUtils';
 import { getMapLayerOptions } from '../../util/mapLayerUtils';
-import { getTotalBikingDistance, compressLegs } from '../../util/legUtils';
+import { getDefaultSettings, getSettings } from '../../util/planParamUtil';
+import { getStartTimeWithColon } from '../../util/timeUtils';
 
 /**
  * Returns the index of selected itinerary. Attempts to look for
@@ -535,3 +536,48 @@ export function quitIteration(plan, newPlan, planParams, startTime) {
   }
   return false;
 }
+
+/**
+ * Checks if itinerary in local storage was set with identical URL parameters.
+ *
+ * Note: storedParams.hash is not compared
+ * @param {{from: string, to: string, time: number, arriveBy: boolean}} storedParams
+ * @param {matchShape} match matchContext with URL params
+ * @returns true if stored itinerary was set with identical parameters
+ */
+export const storedParamsMatchURL = (storedParams, match) => {
+  if (!storedParams || !match) {
+    return false;
+  }
+
+  return (
+    storedParams.from === match?.params?.from &&
+    storedParams.to === match?.params?.to &&
+    storedParams.time === match?.location?.query?.time &&
+    storedParams.arriveBy === match?.location?.query?.arriveBy
+  );
+};
+
+/**
+ * Enables Navigator assisted journey to on itinerary selection if all of the following resolve as true:
+ * a stored itinerary exists
+ * the stored itinerary ends in future
+ * the params stored along itinerary match those of the current query
+ *
+ * Note: Itinerary related hash param is also compared
+ * @param {matchShape} match matchContext with URL params
+ * @returns true if Navigator can be initialized with stored itinerary
+ */
+export const isStoredItineraryRelevant = match => {
+  const { itinerary, params } = getLatestNavigatorItinerary();
+  const {
+    params: { hash = null },
+  } = match;
+
+  return (
+    itinerary &&
+    Date.parse(itinerary.end) > Date.now() &&
+    storedParamsMatchURL(params, match) &&
+    params?.index === hash
+  );
+};

From 054642c7753e4703ebeb49da9cecd258162f3826 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 11:55:09 +0200
Subject: [PATCH 08/11] fix: improved jsdoc wording

---
 app/component/itinerary/ItineraryPageUtils.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/component/itinerary/ItineraryPageUtils.js b/app/component/itinerary/ItineraryPageUtils.js
index c41ca55357..61b86edf3c 100644
--- a/app/component/itinerary/ItineraryPageUtils.js
+++ b/app/component/itinerary/ItineraryPageUtils.js
@@ -541,6 +541,7 @@ export function quitIteration(plan, newPlan, planParams, startTime) {
  * Checks if itinerary in local storage was set with identical URL parameters.
  *
  * Note: storedParams.hash is not compared
+ *
  * @param {{from: string, to: string, time: number, arriveBy: boolean}} storedParams
  * @param {matchShape} match matchContext with URL params
  * @returns true if stored itinerary was set with identical parameters
@@ -559,12 +560,13 @@ export const storedParamsMatchURL = (storedParams, match) => {
 };
 
 /**
- * Enables Navigator assisted journey to on itinerary selection if all of the following resolve as true:
- * a stored itinerary exists
- * the stored itinerary ends in future
- * the params stored along itinerary match those of the current query
+ * Enables Navigator assisted journey on itinerary selection if all of the following resolve as true:
+ * - a stored itinerary exists
+ * - the stored itinerary ends in future
+ * - the params stored along itinerary match those of the current query
  *
  * Note: Itinerary related hash param is also compared
+ *
  * @param {matchShape} match matchContext with URL params
  * @returns true if Navigator can be initialized with stored itinerary
  */

From 114102640e4fa37a9cbf9ce8ed677ea2f3923905 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 14:29:55 +0200
Subject: [PATCH 09/11] fix: changes based on review comments

---
 app/component/itinerary/ItineraryPage.js      | 15 +++----------
 app/component/itinerary/ItineraryPageUtils.js | 22 ++++++++++---------
 app/component/itinerary/StartNavi.js          |  2 +-
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index 81123f18e2..08fe3d96e1 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -70,7 +70,6 @@ import {
   setCurrentTimeToURL,
   settingsLimitRouting,
   stopClient,
-  storedParamsMatchURL,
   updateClient,
 } from './ItineraryPageUtils';
 import ItineraryTabs from './ItineraryTabs';
@@ -746,11 +745,9 @@ export default function ItineraryPage(props, context) {
     updateLocalStorage(true);
     addFeedbackly(context);
 
-    const { params: storedParams } = getLatestNavigatorItinerary();
-    if (
-      (hash === undefined || hash === null) &&
-      !storedParamsMatchURL(storedParams, match)
-    ) {
+    if (isStoredItineraryRelevant(match)) {
+      setNavigation(true);
+    } else {
       clearLatestNavigatorItinerary();
     }
 
@@ -774,9 +771,6 @@ export default function ItineraryPage(props, context) {
       makeRelaxedQuery();
       makeRelaxedScooterQuery();
     }
-    if (isStoredItineraryRelevant(match)) {
-      setNavigation(true);
-    }
   }, [
     settingsState.settingsChanged,
     params.from,
@@ -788,9 +782,6 @@ export default function ItineraryPage(props, context) {
   useEffect(() => {
     navigateMap();
     setMapState({ center: undefined, zoom: undefined, bounds: undefined });
-    if (isStoredItineraryRelevant(match)) {
-      setNavigation(true);
-    }
 
     if (detailView) {
       // If itinerary is not found in detail view, go back to summary view
diff --git a/app/component/itinerary/ItineraryPageUtils.js b/app/component/itinerary/ItineraryPageUtils.js
index 61b86edf3c..dccd79b330 100644
--- a/app/component/itinerary/ItineraryPageUtils.js
+++ b/app/component/itinerary/ItineraryPageUtils.js
@@ -546,16 +546,16 @@ export function quitIteration(plan, newPlan, planParams, startTime) {
  * @param {matchShape} match matchContext with URL params
  * @returns true if stored itinerary was set with identical parameters
  */
-export const storedParamsMatchURL = (storedParams, match) => {
+const storedParamsMatchURL = (storedParams, match) => {
   if (!storedParams || !match) {
     return false;
   }
 
   return (
-    storedParams.from === match?.params?.from &&
-    storedParams.to === match?.params?.to &&
-    storedParams.time === match?.location?.query?.time &&
-    storedParams.arriveBy === match?.location?.query?.arriveBy
+    storedParams.from === match.params?.from &&
+    storedParams.to === match.params?.to &&
+    storedParams.time === match.location?.query?.time &&
+    storedParams.arriveBy === match.location?.query?.arriveBy
   );
 };
 
@@ -571,15 +571,17 @@ export const storedParamsMatchURL = (storedParams, match) => {
  * @returns true if Navigator can be initialized with stored itinerary
  */
 export const isStoredItineraryRelevant = match => {
+  /* eslint-disable eqeqeq */
   const { itinerary, params } = getLatestNavigatorItinerary();
   const {
-    params: { hash = null },
+    params: { hash, secondHash },
   } = match;
 
   return (
-    itinerary &&
-    Date.parse(itinerary.end) > Date.now() &&
-    storedParamsMatchURL(params, match) &&
-    params?.index === hash
+    (itinerary &&
+      Date.parse(itinerary.end) > Date.now() &&
+      storedParamsMatchURL(params, match) &&
+      params?.index == secondHash) ||
+    params?.index == hash
   );
 };
diff --git a/app/component/itinerary/StartNavi.js b/app/component/itinerary/StartNavi.js
index 52aae69d3e..430478ec62 100644
--- a/app/component/itinerary/StartNavi.js
+++ b/app/component/itinerary/StartNavi.js
@@ -21,7 +21,7 @@ const StartNavi = ({ setNavigation, itinerary }, context) => {
         to: match.params.to,
         arriveBy: match.location.query.arriveBy,
         time: match.location.query.time,
-        index: match.params.hash,
+        index: match.params.secondHash ?? match.params.hash,
       },
     });
   };

From b8b5f1cc18058210c4686e55348f7e22d5479766 Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 22:08:26 +0200
Subject: [PATCH 10/11] fix: review fixes, refactored into single exported
 function

---
 app/component/itinerary/ItineraryPage.js      |  3 +-
 app/component/itinerary/ItineraryPageUtils.js | 50 +++++--------------
 app/component/itinerary/StartNavi.js          |  3 +-
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
index 08fe3d96e1..3210867133 100644
--- a/app/component/itinerary/ItineraryPage.js
+++ b/app/component/itinerary/ItineraryPage.js
@@ -745,7 +745,8 @@ export default function ItineraryPage(props, context) {
     updateLocalStorage(true);
     addFeedbackly(context);
 
-    if (isStoredItineraryRelevant(match)) {
+    const storedItinerary = getLatestNavigatorItinerary();
+    if (isStoredItineraryRelevant(storedItinerary, match)) {
       setNavigation(true);
     } else {
       clearLatestNavigatorItinerary();
diff --git a/app/component/itinerary/ItineraryPageUtils.js b/app/component/itinerary/ItineraryPageUtils.js
index dccd79b330..74408fd4fd 100644
--- a/app/component/itinerary/ItineraryPageUtils.js
+++ b/app/component/itinerary/ItineraryPageUtils.js
@@ -10,7 +10,6 @@ import {
   stopRealTimeClient,
 } from '../../action/realTimeClientAction';
 import { PlannerMessageType } from '../../constants';
-import { getLatestNavigatorItinerary } from '../../store/localStorage';
 import { addAnalyticsEvent } from '../../util/analyticsUtils';
 import { boundWithMinimumArea } from '../../util/geo-utils';
 import { compressLegs, getTotalBikingDistance } from '../../util/legUtils';
@@ -537,51 +536,28 @@ export function quitIteration(plan, newPlan, planParams, startTime) {
   return false;
 }
 
-/**
- * Checks if itinerary in local storage was set with identical URL parameters.
- *
- * Note: storedParams.hash is not compared
- *
- * @param {{from: string, to: string, time: number, arriveBy: boolean}} storedParams
- * @param {matchShape} match matchContext with URL params
- * @returns true if stored itinerary was set with identical parameters
- */
-const storedParamsMatchURL = (storedParams, match) => {
-  if (!storedParams || !match) {
-    return false;
-  }
-
-  return (
-    storedParams.from === match.params?.from &&
-    storedParams.to === match.params?.to &&
-    storedParams.time === match.location?.query?.time &&
-    storedParams.arriveBy === match.location?.query?.arriveBy
-  );
-};
-
 /**
  * Enables Navigator assisted journey on itinerary selection if all of the following resolve as true:
  * - a stored itinerary exists
  * - the stored itinerary ends in future
- * - the params stored along itinerary match those of the current query
- *
- * Note: Itinerary related hash param is also compared
+ * - the params stored along itinerary are identical to current URL parameters
  *
+ * @param {{itinerary: itineraryShape, params: {from: string, to: string, time: number, arriveBy: boolean, index: string}}} itinerary matchContext with URL params
  * @param {matchShape} match matchContext with URL params
  * @returns true if Navigator can be initialized with stored itinerary
  */
-export const isStoredItineraryRelevant = match => {
-  /* eslint-disable eqeqeq */
-  const { itinerary, params } = getLatestNavigatorItinerary();
-  const {
-    params: { hash, secondHash },
-  } = match;
+export const isStoredItineraryRelevant = ({ itinerary, params }, match) => {
+  if (!itinerary || !params) {
+    return false;
+  }
 
   return (
-    (itinerary &&
-      Date.parse(itinerary.end) > Date.now() &&
-      storedParamsMatchURL(params, match) &&
-      params?.index == secondHash) ||
-    params?.index == hash
+    Date.parse(itinerary.end) > Date.now() &&
+    params.from === match.params.from &&
+    params.to === match.params.to &&
+    params.time === match.location?.query?.time &&
+    params.arriveBy === match.location?.query?.arriveBy &&
+    params.hash === match.params.hash &&
+    params.secondHash === match.params.secondHash
   );
 };
diff --git a/app/component/itinerary/StartNavi.js b/app/component/itinerary/StartNavi.js
index 430478ec62..8fd7fe8471 100644
--- a/app/component/itinerary/StartNavi.js
+++ b/app/component/itinerary/StartNavi.js
@@ -21,7 +21,8 @@ const StartNavi = ({ setNavigation, itinerary }, context) => {
         to: match.params.to,
         arriveBy: match.location.query.arriveBy,
         time: match.location.query.time,
-        index: match.params.secondHash ?? match.params.hash,
+        hash: match.params.hash,
+        secondHash: match.params.secondHash,
       },
     });
   };

From 1ad32a89940494a8eeec0168076038880a8b317f Mon Sep 17 00:00:00 2001
From: Simo Partinen <simo.partinen@twoday.com>
Date: Wed, 13 Nov 2024 22:08:53 +0200
Subject: [PATCH 11/11] feat: unit test cases for isStoredItineraryRelevant

---
 .../ItineraryPage/ItineraryPageUtils.test.js  | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 test/unit/views/ItineraryPage/ItineraryPageUtils.test.js

diff --git a/test/unit/views/ItineraryPage/ItineraryPageUtils.test.js b/test/unit/views/ItineraryPage/ItineraryPageUtils.test.js
new file mode 100644
index 0000000000..35984b0146
--- /dev/null
+++ b/test/unit/views/ItineraryPage/ItineraryPageUtils.test.js
@@ -0,0 +1,143 @@
+import { isStoredItineraryRelevant } from '../../../../app/component/itinerary/ItineraryPageUtils';
+
+describe('itineraryPageUtils', () => {
+  describe('isStoredItineraryRelevant', () => {
+    const TIME = 12345;
+    const ARRIVE_BY = false;
+    const INDEX = '0';
+    const TEN_MINUTES_FROM_NOW = new Date(Date.now() + 600000).toISOString();
+
+    let mockStoredItinerary;
+    let mockMatch;
+
+    beforeEach(() => {
+      mockStoredItinerary = {
+        itinerary: {
+          end: TEN_MINUTES_FROM_NOW,
+        },
+        params: {
+          from: 'foo',
+          to: 'bar',
+          arriveBy: ARRIVE_BY,
+          time: TIME,
+          hash: INDEX,
+          secondHash: undefined,
+        },
+      };
+
+      mockMatch = {
+        params: { from: 'foo', to: 'bar', hash: INDEX, secondHash: undefined },
+        location: { query: { time: TIME, arriveBy: ARRIVE_BY } },
+      };
+    });
+
+    it('should return true for equal params', () => {
+      expect(
+        isStoredItineraryRelevant(mockStoredItinerary, mockMatch),
+      ).to.equal(true);
+    });
+
+    it('should return true if stored index matches secondHash', () => {
+      expect(
+        isStoredItineraryRelevant(mockStoredItinerary, {
+          ...mockMatch,
+          hash: 'other',
+          secondHash: INDEX,
+        }),
+      ).to.equal(true);
+    });
+
+    it('should return true if arriveBy is undefined for both', () => {
+      const itineraryWithoutArriveBy = { ...mockStoredItinerary };
+      const matchWithoutArriveBy = { ...mockMatch };
+      itineraryWithoutArriveBy.params.arriveBy = undefined;
+      matchWithoutArriveBy.location.query.arriveBy = undefined;
+
+      expect(
+        isStoredItineraryRelevant(
+          itineraryWithoutArriveBy,
+          matchWithoutArriveBy,
+        ),
+      ).to.equal(true);
+    });
+
+    it('should return false for past itinerary', () => {
+      const TEN_MINUTES_IN_THE_PAST = new Date(
+        Date.now() + 600000,
+      ).toISOString();
+
+      expect(
+        isStoredItineraryRelevant(
+          {
+            ...mockStoredItinerary,
+            itinerary: { end: TEN_MINUTES_IN_THE_PAST },
+          },
+          mockMatch,
+        ),
+      ).to.equal(true);
+    });
+
+    it('should return false on index and hash mismatch if secondHash is undefined', () => {
+      const matchWithDifferentHash = { ...mockMatch };
+      matchWithDifferentHash.params.hash = '999';
+      matchWithDifferentHash.params.secondHash = undefined;
+
+      expect(
+        isStoredItineraryRelevant(mockStoredItinerary, matchWithDifferentHash),
+      ).to.equal(false);
+    });
+
+    it('should return false on index and hash mismatch if hash and secondHash are undefined', () => {
+      const matchWithDifferentHash = { ...mockMatch };
+      matchWithDifferentHash.params.hash = undefined;
+      matchWithDifferentHash.params.secondHash = undefined;
+
+      expect(
+        isStoredItineraryRelevant(mockStoredItinerary, matchWithDifferentHash),
+      ).to.equal(false);
+    });
+
+    it('should throw error if match is undefined', () => {
+      expect(() =>
+        isStoredItineraryRelevant(mockStoredItinerary, undefined),
+      ).to.throw(Error);
+    });
+
+    it('should not throw error if stored itinerary is empty object', () => {
+      expect(() => isStoredItineraryRelevant({}, mockMatch)).to.not.throw(
+        Error,
+      );
+      expect(isStoredItineraryRelevant({}, mockMatch)).to.equal(false);
+    });
+
+    it('should not throw error if stored itinerary is missing itinerary field', () => {
+      expect(() =>
+        isStoredItineraryRelevant(
+          { ...mockStoredItinerary, itinerary: undefined },
+          mockMatch,
+        ),
+      ).to.not.throw(Error);
+      expect(
+        isStoredItineraryRelevant(
+          { ...mockStoredItinerary, itinerary: undefined },
+          mockMatch,
+        ),
+      ).to.equal(false);
+    });
+
+    it('should not throw error if stored itinerary is missing itinerary field', () => {
+      expect(() =>
+        isStoredItineraryRelevant(
+          { ...mockStoredItinerary, params: undefined },
+          mockMatch,
+        ),
+      ).to.not.throw(Error);
+      expect(
+        isStoredItineraryRelevant(
+          { ...mockStoredItinerary, params: undefined },
+          mockMatch,
+        ),
+      ).to.equal(false);
+    });
+  });
+});