Restrukturyzacja pobierania danych, zmiany w wyglądzie

src/scripts/interfaces/Station.ts

@@ -1,3 +1,5 @@
+import Train from '@/scripts/interfaces/Train';
+
 export default interface Station {
   stationName: string;
   stationHash: string;
@@ -23,20 +25,24 @@ export default interface Station {
   online: boolean;
   occupiedTo: string;
   statusTimestamp: number;
+  stationTrains: Train[];
   scheduledTrains: {
     trainNo: number;
     driverName: string;
-    category: string;
+    driverId: number;
+    currentStationName: string;
     stopName: string;
     stopType: string;
+    arrivalLine?: string;
     arrivalTime: number;
     arrivalDelay: number;
+    departureLine?: string;
     departureTime: number;
+    beginsHere: boolean;
+    terminatesHere: boolean;
     departureDelay: number;
     confirmed: boolean;
     stopped: boolean;
     stopTime: number;
-    beginsHere: boolean;
-    terminatesHere: boolean;
   }[];
 }

src/scripts/interfaces/Timetable.ts

@@ -0,0 +1,16 @@
+export default interface Timetable {
+  trainNo: number;
+  driverName: string;
+  category: string;
+  stopName: string;
+  stopType: string;
+  arrivalTime: number;
+  arrivalDelay: number;
+  departureTime: number;
+  departureDelay: number;
+  confirmed: boolean;
+  stopped: boolean;
+  stopTime: number;
+  beginsHere: boolean;
+  terminatesHere: boolean;
+}

src/scripts/interfaces/Train.ts

@@ -9,33 +9,31 @@ export default interface Train {
   trainNo: number;
   driverName: string;
   currentStationName: string;
-  route: string | null;
-  timetableId: number | null;
-  category: string | null;
-  followingStops: {
-    stopName: string;
-    stopType: string;
-    arrivalLine?: string;
-    arrivalTime: number;
-    arrivalDelay: number;
-    departureLine?: string;
-    departureTime: number;
-    beginsHere: boolean;
-    terminatesHere: boolean;
-    departureDelay: number;
-    confirmed: boolean;
-    stopped: boolean;
-
-    stopTime: number;
-
-    arrivalScenery?: string;
-    departureScenery?: string;
-  }[];
-  TWR: boolean | null;
-  SKR: boolean | null;
-  noTimetable: boolean;
   locoURL: string;
   locoType: string;
-  routeDistance: number;
   online: boolean;
+
+  timetableData?: {
+    timetableId: number;
+    category: string;
+    route: string;
+    followingStops: {
+      stopName: string;
+      stopType: string;
+      arrivalLine?: string;
+      arrivalTime: number;
+      arrivalDelay: number;
+      departureLine?: string;
+      departureTime: number;
+      beginsHere: boolean;
+      terminatesHere: boolean;
+      departureDelay: number;
+      confirmed: boolean;
+      stopped: boolean;
+      stopTime: number;
+    }[];
+    TWR: boolean;
+    SKR: boolean;
+    routeDistance: number;
+  };
 }