chore: tweak amey timings

davwheat · Mar 22, 2024 · 3030836 · 3030836
1 parent 3f36ffe
commit 3030836
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/announcement-data/systems/stations/AmeyCelia.tsx b/src/announcement-data/systems/stations/AmeyCelia.tsx
@@ -10,7 +10,7 @@ export default class AmeyCelia extends AmeyPhil {
   readonly SYSTEM_TYPE = 'station'
 
   protected readonly BEFORE_TOC_DELAY: number = 30
-  protected readonly BEFORE_SECTION_DELAY: number = 520
+  protected readonly BEFORE_SECTION_DELAY: number = 550
   protected readonly SHORT_DELAY: number = 500
 
   readonly DelayCodeMapping = DelayCodeMapping
@@ -22,7 +22,7 @@ export default class AmeyCelia extends AmeyPhil {
   }
 
   protected readonly callingPointsOptions = {
-    beforeCallingAtDelay: this.BEFORE_SECTION_DELAY,
+    beforeCallingAtDelay: 650,
     afterCallingAtDelay: 0,
     betweenStopsDelay: 220,
     aroundAndDelay: 0,

diff --git a/src/announcement-data/systems/stations/AmeyPhil.tsx b/src/announcement-data/systems/stations/AmeyPhil.tsx
@@ -120,7 +120,7 @@ export default class AmeyPhil extends StationAnnouncementSystem {
   readonly SYSTEM_TYPE = 'station'
 
   protected readonly BEFORE_TOC_DELAY: number = 150
-  protected readonly BEFORE_SECTION_DELAY: number = 870
+  protected readonly BEFORE_SECTION_DELAY: number = 550
   protected readonly SHORT_DELAY: number = 500
 
   readonly DelayCodeMapping: Record<string, { e: string; m: string }> = DelayCodeMapping
@@ -133,7 +133,7 @@ export default class AmeyPhil extends StationAnnouncementSystem {
   }
 
   protected readonly callingPointsOptions = {
-    beforeCallingAtDelay: this.BEFORE_SECTION_DELAY,
+    beforeCallingAtDelay: 870,
     afterCallingAtDelay: 0,
     betweenStopsDelay: 320,
     aroundAndDelay: 100,
@@ -4528,13 +4528,6 @@ export default class AmeyPhil extends StationAnnouncementSystem {
         options.coaches ? parseInt(options.coaches.split(' ')[0]) : null,
       )),
     )
-    files.push(
-      ...(await this.getRequestStops(
-        options.callingAt,
-        options.terminatingStationCode,
-        options.coaches ? parseInt(options.coaches.split(' ')[0]) : null,
-      )),
-    )
 
     if (options.coaches) {
       const coaches = options.coaches.split(' ')[0]
@@ -4546,6 +4539,14 @@ export default class AmeyPhil extends StationAnnouncementSystem {
         `e.${coaches === '1' ? 'coach' : 'coaches'}`,
       )
     }
+
+    files.push(
+      ...(await this.getRequestStops(
+        options.callingAt,
+        options.terminatingStationCode,
+        options.coaches ? parseInt(options.coaches.split(' ')[0]) : null,
+      )),
+    )
 
     files.push(
       ...getPlatFiles(this.BEFORE_SECTION_DELAY),