diff --git a/app/component/itinerary/navigator/NaviCardContainer.js b/app/component/itinerary/navigator/NaviCardContainer.js
index 97c7ac1b94..31c2282d08 100644
--- a/app/component/itinerary/navigator/NaviCardContainer.js
+++ b/app/component/itinerary/navigator/NaviCardContainer.js
@@ -11,6 +11,7 @@ import {
getAdditionalMessages,
getItineraryAlerts,
getTransitLegState,
+ itinerarySearchPath,
LEGTYPE,
DESTINATION_RADIUS,
} from './NaviUtils';
@@ -92,6 +93,17 @@ function NaviCardContainer(
config,
);
+ const makeNewItinerarySearch = () => {
+ const path = itinerarySearchPath(
+ time,
+ currentLeg,
+ nextLeg,
+ position,
+ match.params.to,
+ );
+ router.push(path);
+ };
+
useEffect(() => {
updateClient(getNaviTopics(), context);
}, []);
@@ -116,8 +128,7 @@ function NaviCardContainer(
origin,
intl,
messages,
- match.params,
- router,
+ makeNewItinerarySearch,
),
);
@@ -170,11 +181,10 @@ function NaviCardContainer(
// handle initial focus when not tracking
if (currentLeg) {
focusToLeg(currentLeg);
- destCountRef.current = 0;
} else if (time < legTime(firstLeg.start)) {
focusToLeg(firstLeg);
} else {
- focusToLeg(lastLeg);
+ focusToLeg(nextLeg || lastLeg);
}
focusRef.current = true;
}
diff --git a/app/component/itinerary/navigator/NaviUtils.js b/app/component/itinerary/navigator/NaviUtils.js
index 9c25e670aa..d258d9a5ba 100644
--- a/app/component/itinerary/navigator/NaviUtils.js
+++ b/app/component/itinerary/navigator/NaviUtils.js
@@ -7,6 +7,7 @@ import { timeStr, epochToIso } from '../../../util/timeUtils';
import { getFaresFromLegs } from '../../../util/fareUtils';
import { ExtendedRouteTypes } from '../../../constants';
import { getItineraryPagePath } from '../../../util/path';
+import { locationToUri } from '../../../util/otpStrings';
const TRANSFER_SLACK = 60000;
const DISPLAY_MESSAGE_THRESHOLD = 120 * 1000; // 2 minutes
@@ -279,7 +280,10 @@ export const getTransitLegState = (leg, intl, messages, time) => {
const departure = leg.trip.stoptimesForDate[0];
const departed =
1000 * (departure.serviceDay + departure.scheduledDeparture);
- if (time - departed < DISPLAY_MESSAGE_THRESHOLD) {
+ if (
+ time - departed < DISPLAY_MESSAGE_THRESHOLD &&
+ time + DISPLAY_MESSAGE_THRESHOLD > legTime(leg.start)
+ ) {
// vehicle just departed, maybe no realtime yet
severity = 'INFO';
} else {
@@ -330,6 +334,43 @@ export const getTransitLegState = (leg, intl, messages, time) => {
return [{ severity, content, id: legId, expiresOn: legTime(start) }];
};
+export function itinerarySearchPath(time, leg, nextLeg, position, to) {
+ let from;
+ if (leg?.transitLeg) {
+ from = leg.intermediatePlaces.find(
+ p => legTime(p.arrival) > time + TRANSFER_SLACK,
+ );
+ if (!from) {
+ from = leg.to;
+ }
+ } else {
+ from = position || leg?.to || nextLeg?.from;
+ }
+ const location = { ...from, ...from.stop };
+
+ return getItineraryPagePath(locationToUri(location), to);
+}
+
+function withNewSearchBtn(children, searchCallback) {
+ return (
+
+ {children}
+
+
+
+ );
+}
+
+function alertId(alert) {
+ return `${alert.effectiveStartDate}-${alert.alertDescriptionText}`;
+}
+
export const getItineraryAlerts = (
legs,
time,
@@ -337,21 +378,16 @@ export const getItineraryAlerts = (
origin,
intl,
messages,
- location,
- router,
+ itinerarySearchCallback,
) => {
- const canceled = legs.filter(
- leg => leg.realtimeState === 'CANCELED' && legTime(leg.start) > time,
- );
- let content;
const alerts = legs.flatMap(leg => {
return leg.alerts
.filter(alert => {
- const { first } = getFirstLastLegs(legs);
- const startTime = legTime(first.start) / 1000;
- if (messages.get(alert.id)) {
+ if (messages.get(alertId(alert))?.closed) {
return false;
}
+ const { first } = getFirstLastLegs(legs);
+ const startTime = legTime(first.start) / 1000;
// show only alerts that are active when
// the journey starts
if (startTime < alert.effectiveStartDate) {
@@ -372,30 +408,22 @@ export const getItineraryAlerts = (
{alert.alertHeaderText}
),
- id: `${alert.effectiveStartDate}-${alert.alertDescriptionText}`,
+ id: alertId(alert),
}));
});
- const abortTrip =
- {children}
- router.push(getItineraryPagePath('POS', location.to))}
- >
-
-
+
+ const canceled = legs.filter(
+ leg => leg.realtimeState === 'CANCELED' && legTime(leg.start) > time,
);
- if (canceled) {
+ if (canceled.length) {
// show routes button only for first canceled leg.
canceled.forEach((leg, i) => {
const { legId, mode, route } = leg;
const lMode = getLocalizedMode(mode, intl);
const routeName = `${lMode} ${route.shortName}`;
+
const m = (
- {m}
- {abortTrip}
-
,
+ const content =
+ i === 0 ? (
+ withNewSearchBtn({ m }, itinerarySearchCallback)
+ ) : (
+ {m}
);
- } else {
- content = {m}
;
- }
+
if (!messages.get(`canceled-${legId}`)) {
alerts.push({
severity: 'ALERT',
@@ -423,36 +448,33 @@ export const getItineraryAlerts = (
});
}
});
- }
-
- const transferProblems = findTransferProblems(legs, time, position, origin);
- if (transferProblems.length) {
- let prob = transferProblems.find(p => p.severity === 'ALERT');
- if (!prob) {
- // just take first
- [prob] = transferProblems;
- }
- const transferId = `transfer-${prob.fromLeg.legId}-${prob.toLeg.legId}}`;
- const alert = messages.get(transferId);
- if (!alert || alert.severity !== prob.severity) {
- content = withShowRoutesBtn(
-
-
,
- );
- alerts.push({
- severity: prob.severity,
- content,
- id: transferId,
- hideClose: prob.severity === 'ALERT',
- });
+ } else {
+ const transferProblems = findTransferProblems(legs, time, position, origin);
+ if (transferProblems.length) {
+ let prob = transferProblems.find(p => p.severity === 'ALERT');
+ if (!prob) {
+ // just take first
+ [prob] = transferProblems;
+ }
+ const transferId = `transfer-${prob.fromLeg.legId}-${prob.toLeg.legId}}`;
+ const alert = messages.get(transferId);
+ if (!alert || alert.severity !== prob.severity) {
+ alerts.push({
+ severity: prob.severity,
+ content: withNewSearchBtn(
+