Ładowanie danych nt pociągów i rozkładów jazdy z API Stacjownika

src/scripts/interfaces/Station.ts

@@ -46,7 +46,7 @@ export default interface Station {
     dispatcherIsSupporter: boolean;
 
     statusTimestamp: number;
-    statusTimeString: string;
+    // statusTimeString: string;
     statusID: string;
 
     stationTrains?: {

src/scripts/interfaces/StoreData.ts

@@ -6,13 +6,8 @@ export interface StoreData {
   stationList: Station[];
   trainList: Train[];
 
-  activeTrainCount: number;
-  activeStationCount: number;
 
-  dataConnectionStatus: DataStatus;
-
-  timetableDataStatus: DataStatus;
   sceneryDataStatus: DataStatus;
   dispatcherDataStatus: DataStatus;
-  trainsDataStatus: DataStatus;
+  trainsDataStatus: DataStatus;  
 }

src/scripts/interfaces/Train.ts

@@ -27,8 +27,6 @@ export default interface Train {
     TWR: boolean;
     SKR: boolean;
     routeDistance: number;
+    sceneries: string[];
   };
-
-  stopStatus: string;
-  stopLabel: string;
 }

src/scripts/interfaces/TrainStop.ts

@@ -1,4 +1,4 @@
-export default interface TrainStop {
+export default interface  TrainStop {
   stopName: string;
   stopNameRAW: string;
   stopType: string;
@@ -6,19 +6,19 @@ export default interface TrainStop {
   mainStop: boolean;
 
   arrivalLine: string | null;
-  arrivalTimeString: string | null;
+  // arrivalTimeString: string | null;
   arrivalTimestamp: number;
-  arrivalRealTimeString: string | null;
+  // arrivalRealTimeString: string | null;
   arrivalRealTimestamp: number;
   arrivalDelay: number;
 
   departureLine: string | null;
-  departureTimeString: string | null;
+  // departureTimeString: string | null;
   departureTimestamp: number;
-  departureRealTimeString: string | null;
+  // departureRealTimeString: string | null;
   departureRealTimestamp: number;
   departureDelay: number;
-  pointId: string;
+  pointId: number;
 
   comments?: any;
 

src/scripts/interfaces/api/TrainAPIData.ts

@@ -1,19 +1,62 @@
-import StationAPIData from "./StationAPIData";
-
 export default interface TrainAPIData {
   trainNo: number;
-  driverId: number;
+
+  mass: number;
+  length: number;
+  speed: number;
+  stockString: string;
+
+  signal: string;
+  distance: number;
+  connectedTrack: string;
+
   driverName: string;
+  driverId: number;
   driverIsSupporter: boolean;
-  station: StationAPIData;
-  dataSignal: string;
-  dataSceneryConnection: string;
-  dataDistance: number;
-  dataCon: string;
-  dataSpeed: number;
-  dataMass: number;
-  dataLength: number;
-  region: string;
-  isOnline: boolean;
+
+  currentStationName: string;
+  currentStationHash: string;
+
+  online: boolean;
   lastSeen: number;
+
+  region: string;
+
+  timetable?: {
+    timetableId: number;
+    category: string;
+    route: string;
+
+    stopList: {
+      stopName: string;
+      stopNameRAW: string;
+      stopType: string;
+      stopDistance: number;
+      pointId: number;
+
+      mainStop: boolean;
+
+      arrivalLine: string;
+      arrivalTimestamp: number;
+      arrivalRealTimestamp: number;
+      arrivalDelay: number;
+
+      departureLine: string;
+      departureTimestamp: number;
+      departureRealTimestamp: number;
+      departureDelay: number;
+
+      comments?: any;
+
+      beginsHere: boolean;
+      terminatesHere: boolean;
+      confirmed: boolean;
+      stopped: boolean;
+      stopTime: number;
+    }[];
+
+    TWR: boolean;
+    SKR: boolean;
+    sceneries: string[];
+  };
 }