fix DST change issues (#94)

Co-authored-by: Michael Tsang <[email protected]>
planarnetwork · Jul 26, 2024 · a78992b · a78992b
1 parent e2d6a0c
commit a78992b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/src/gtfs/command/AddLateNightServices.ts b/src/gtfs/command/AddLateNightServices.ts
@@ -2,13 +2,19 @@ import {Schedule} from "../native/Schedule";
 import {IdGenerator} from "../native/OverlayRecord";
 
 /**
- * Loop through every schedule and add a copy of any early morning services to the previous day.
+ * Loop through every schedule and replace any early morning services with a copy on the previous day.
+ *
+ * GTFS specification defines "time" as starting from noon minus 12 hours, which is normally midnight
+ * but may be different by 1 hour on the day when the summer time zone changes, in order to avoid
+ * a DST change happening inside a service day.
+ *
+ * Therefore, trains which depart before the change on changeover days should be recorded as on the
+ * previous service day instead.
  */
 export function addLateNightServices(schedules: Schedule[], idGenerator: IdGenerator): Schedule[] {
   const result: Schedule[] = [];
 
   for (const schedule of schedules) {
-    result.push(schedule);
     const departureHour = parseInt(schedule.stopTimes[0].departure_time.substr(0, 2), 10);
 
     if (departureHour <= 1) {
@@ -20,6 +26,8 @@ export function addLateNightServices(schedules: Schedule[], idGenerator: IdGener
       }
 
       result.push(newSchedule);
+    } else {
+      result.push(schedule);
     }
   }
 

diff --git a/test/gtfs/command/AddLateNightServices.spec.ts b/test/gtfs/command/AddLateNightServices.spec.ts
@@ -24,19 +24,17 @@ describe("AddLateNightServices", () => {
 
     const schedules = addLateNightServices(baseSchedules, idGenerator());
 
-    chai.expect(schedules[0].calendar.runsFrom.isSame("20181001")).to.be.true;
-    chai.expect(schedules[0].calendar.runsTo.isSame("20181031")).to.be.true;
-    chai.expect(schedules[1].calendar.runsFrom.isSame("20180930")).to.be.true;
-    chai.expect(schedules[1].calendar.runsTo.isSame("20181030")).to.be.true;
-    chai.expect(schedules[1].calendar.days[0]).to.equal(1);
-    chai.expect(schedules[1].calendar.days[1]).to.equal(1);
-    chai.expect(schedules[1].calendar.days[2]).to.equal(1);
-    chai.expect(schedules[1].calendar.days[3]).to.equal(1);
-    chai.expect(schedules[1].calendar.days[4]).to.equal(0);
-    chai.expect(schedules[1].calendar.days[5]).to.equal(0);
-    chai.expect(schedules[1].calendar.days[6]).to.equal(1);
-    chai.expect(schedules[2].calendar.runsFrom.isSame("20181001")).to.be.true;
-    chai.expect(schedules[2].calendar.runsTo.isSame("20181031")).to.be.true;
+    chai.expect(schedules[0].calendar.runsFrom.isSame("20180930")).to.be.true;
+    chai.expect(schedules[0].calendar.runsTo.isSame("20181030")).to.be.true;
+    chai.expect(schedules[0].calendar.days[0]).to.equal(1);
+    chai.expect(schedules[0].calendar.days[1]).to.equal(1);
+    chai.expect(schedules[0].calendar.days[2]).to.equal(1);
+    chai.expect(schedules[0].calendar.days[3]).to.equal(1);
+    chai.expect(schedules[0].calendar.days[4]).to.equal(0);
+    chai.expect(schedules[0].calendar.days[5]).to.equal(0);
+    chai.expect(schedules[0].calendar.days[6]).to.equal(1);
+    chai.expect(schedules[1].calendar.runsFrom.isSame("20181001")).to.be.true;
+    chai.expect(schedules[1].calendar.runsTo.isSame("20181031")).to.be.true;
   });
 
 });