diff --git a/src/page-modules/departures/__tests__/departure-data.fixture.ts b/src/page-modules/departures/__tests__/departure-data.fixture.ts index 3fa946d5f..cb1d2a5d7 100644 --- a/src/page-modules/departures/__tests__/departure-data.fixture.ts +++ b/src/page-modules/departures/__tests__/departure-data.fixture.ts @@ -26,6 +26,7 @@ export const departureDataFixture: ExtendedDeparturesType = { expectedDepartureTime: '2025-04-04T13:55:00+02:00', realtime: false, cancellation: false, + requestStop: false, quay: { id: 'NSR:Quay:71184', }, @@ -55,6 +56,7 @@ export const departureDataFixture: ExtendedDeparturesType = { expectedDepartureTime: '2025-04-04T13:57:00+02:00', realtime: false, cancellation: false, + requestStop: false, quay: { id: 'NSR:Quay:71184', }, @@ -93,6 +95,7 @@ export const departureDataFixture: ExtendedDeparturesType = { expectedDepartureTime: '2025-04-04T13:53:00+02:00', realtime: false, cancellation: false, + requestStop: false, quay: { id: 'NSR:Quay:71181', }, @@ -122,6 +125,7 @@ export const departureDataFixture: ExtendedDeparturesType = { expectedDepartureTime: '2025-04-04T13:54:00+02:00', realtime: false, cancellation: false, + requestStop: false, quay: { id: 'NSR:Quay:71181', }, diff --git a/src/page-modules/departures/__tests__/service-journey-data.fixture.ts b/src/page-modules/departures/__tests__/service-journey-data.fixture.ts index 2e9ff9514..e888eddb4 100644 --- a/src/page-modules/departures/__tests__/service-journey-data.fixture.ts +++ b/src/page-modules/departures/__tests__/service-journey-data.fixture.ts @@ -24,6 +24,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T14:59:24+01:00', forAlighting: false, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -53,6 +54,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:01:22+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -82,6 +84,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:02:11+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -111,6 +114,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:03:04+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -140,6 +144,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:03:54+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -169,6 +174,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:04:42+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -198,6 +204,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:05:19+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -227,6 +234,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:06:34+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -256,6 +264,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:07:52+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', @@ -285,6 +294,7 @@ export const serviceJourneyFixture: ServiceJourneyType = { expectedArrivalTime: '2023-11-10T15:09:56+01:00', forAlighting: true, forBoarding: true, + requestStop: false, realtime: true, quay: { publicCode: '', diff --git a/src/page-modules/departures/details/estimated-call-rows.tsx b/src/page-modules/departures/details/estimated-call-rows.tsx index e3e27df8b..188407fb7 100644 --- a/src/page-modules/departures/details/estimated-call-rows.tsx +++ b/src/page-modules/departures/details/estimated-call-rows.tsx @@ -146,6 +146,8 @@ function EstimatedCallRow({ const { t } = useTranslation(); const { group, isStartOfGroup, isEndOfGroup } = call.metadata; const isBetween = !isStartOfGroup && !isEndOfGroup; + const isStartOfTripGroup = group === 'trip' && isStartOfGroup; + const isEndOfTripGroup = group === 'trip' && isEndOfGroup; const iconColor = useTransportationThemeColor({ transportMode: group === 'trip' ? mode : 'unknown', transportSubmode: subMode, @@ -187,6 +189,17 @@ function EstimatedCallRow({ {t(PageText.Departures.details.messages.noBoarding)} )} + {call.requestStop && ( + + {t( + isStartOfTripGroup + ? PageText.Departures.details.messages.requestStopBoarding + : isEndOfTripGroup + ? PageText.Departures.details.messages.requestStopAlighting + : PageText.Departures.details.messages.requestStop, + )} + + )} {situations.map((situation) => ( diff --git a/src/page-modules/departures/details/index.tsx b/src/page-modules/departures/details/index.tsx index 0855fe711..ec1d1d0ed 100644 --- a/src/page-modules/departures/details/index.tsx +++ b/src/page-modules/departures/details/index.tsx @@ -164,6 +164,14 @@ export function DeparturesDetails({ /> ), )} + {focusedCall.requestStop && ( + + )} )}