index.ts

@@ -3,7 +3,7 @@ export { Corpus } from './src/database/corpus'
 export { Pis } from './src/database/pis'
 export { ReasonCode } from './src/database/reasonCode'
 export { Station } from './src/database/station'
-export { Service, Stop, SimpleService, ServiceDetail } from './src/database/timetable'
+export { Service, Stop, SimpleService } from './src/database/timetable'
 export { User } from './src/database/user'
 
 // Downstream API

src/database/timetable.ts

@@ -31,15 +31,10 @@ interface Service {
     scheduleEndDate:   Date;
     daysRun:           string[];
     stops:             Stop[];
-    serviceDetail:     ServiceDetail;
+    vstp:              boolean;
+    firstClass:        boolean;
+    catering:          boolean;
+    sleeper:           boolean;
 }
 
-interface ServiceDetail {
-    firstClass: boolean;
-    catering: boolean;
-    sleeper: boolean;
-    vstp: boolean;
-    guard: boolean
-}
-
-export { Stop, Service, SimpleService, ServiceDetail }
+export { Stop, Service, SimpleService }

src/owlboardApi/trainTimetable.ts

@@ -1,5 +1,4 @@
 import type { OB_Pis_SimpleObject } from "./pis";
-import type { ServiceDetail } from "../database/timetable";
 
 export interface OB_TrainTT_service {
     stpIndicator: string;
@@ -13,7 +12,10 @@ export interface OB_TrainTT_service {
     daysRun: string[];
     stops: OB_TrainTT_stopDetail[];
     pis?: OB_Pis_SimpleObject;
-    serviceDetail: ServiceDetail;
+    vstp: boolean;
+    firstClass: boolean;
+    catering: boolean;
+    sleeper: boolean;
 }
 
 export interface OB_TrainTT_stopDetail {