AB#288 fix departure typing and check last stop

Author: sharhio

src/test/data/monitor.ts

@@ -24,13 +24,13 @@ export const departure: IDeparture = {
   scheduledDeparture: 51763,
   serviceDay: 1645480800,
   stop: stop,
+  stops: [stop],
   trip: {
     tripHeadsign: 'Helsinki',
     tripHeadsignfi: 'Helsinki',
     tripHeadsignsv: 'Helsingfors',
     tripHeadsignen: 'Helsinki',
     gtfsId: 'HSL:1234trip',
-    stops: [stop],
     route: { alerts: [], shortName: '123' },
   },
 };

src/ui/MonitorRow.tsx

@@ -27,7 +27,6 @@ interface ITrip {
   tripHeadsignsv: string;
   tripHeadsignen: string;
   route: IRoute;
-  stops: Array<IStop>;
   gtfsId: string;
 }
 export interface IDeparture {
@@ -44,6 +43,7 @@ export interface IDeparture {
   realtime: boolean;
   pickupType: string;
   stop: IStop;
+  stops: Array<IStop>;
   combinedPattern?: string;
   showStopNumber: boolean;
   showVia: boolean;
@@ -193,12 +193,12 @@ const MonitorRow: FC<IProps> = ({
         )
       : '';
   }
-  /* if (departure.pickupType === 'NONE') {
-    const lastStop = departure.trip?.stops?.slice(-1).pop().gtfsId;
+  if (departure.pickupType === 'NONE') {
+    const lastStop = departure.stops[departure.stops.length - 1].gtfsId;
     if (departure.stop.gtfsId === lastStop) {
-      destination = `${t('endStopArrive')}/${t('endStopTerminus')}`;
+      destination = `${t('arriveTerminal')}`;
     }
-  } */
+  }
 
   const line = processLine(departure.trip?.route.shortName);
   if (destination?.indexOf(' via') !== -1) {