@transportme/load-ptv-gtfs 1.3.10 → 1.3.11

package/lib/gtfs-parser/GTFSCalendar.mjs

@@ -1,6 +1,6 @@
 import { CALENDAR_DATES } from '../constants.mjs'
-import { parseDate, toGTFSDate } from '../utils.mjs'
 import GTFSCalendarDate from './GTFSCalendarDate.mjs'
+import { dateUtils } from '@transportme/transportvic-utils' 
 
 export default class GTFSCalendar {
 
@@ -27,8 +27,8 @@ export default class GTFSCalendar {
   constructor({ id, daysOfWeek, startDay, endDay }, calendarDates = []) {
     this.id = id
     this.daysOfWeek = daysOfWeek.map(day => day === '1')
-    this.startDay = parseDate(startDay)
-    this.endDay = parseDate(endDay)
+    this.startDay = dateUtils.parseDate(startDay)
+    this.endDay = dateUtils.parseDate(endDay)
 
     for (let date of calendarDates) {
       if (date.type === CALENDAR_DATES.ADDED) this.#operationDays.push(date.date)
@@ -57,7 +57,7 @@ export default class GTFSCalendar {
    * @returns {string[]} A string array of GTFS formatted dates
    */
   getOperationDays() {
-    return this.#operationDays.sort((a, b) => a - b).map(day => toGTFSDate(day)).filter((date, i, arr) => i === 0 || arr[i - 1] != date)
+    return this.#operationDays.sort((a, b) => a - b).map(day => dateUtils.toGTFSDate(day)).filter((date, i, arr) => i === 0 || arr[i - 1] != date)
   }
 
 }

package/lib/gtfs-parser/GTFSCalendarDate.mjs

@@ -1,4 +1,4 @@
-import { parseDate } from '../utils.mjs'
+import { dateUtils } from '@transportme/transportvic-utils' 
 
 export default class GTFSCalendarDate {
 
@@ -8,7 +8,7 @@ export default class GTFSCalendarDate {
 
   constructor({ id, date, type }) {
     this.id = id
-    this.date = parseDate(date)
+    this.date = dateUtils.parseDate(date)
     this.type = type
   }
 

package/lib/utils.mjs

@@ -1,15 +1,3 @@
-import { DateTime } from 'luxon'
-import { TIMEZONES } from './constants.mjs'
-
-// Note: Need to allow for SA time as PTV does not handle cross border times well... or at all
-export function parseDate(date) {
-  return DateTime.fromFormat(date, 'yyyyMMdd', { zone: TIMEZONES.melbourne })
-}
-
-export function toGTFSDate(date) {
-  return date.toFormat('yyyyMMdd')
-}
-
 export function minutesPastMidnightToHHMM(time) {
   let hours = Math.floor(time / 60)
   let min = time % 60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transportme/load-ptv-gtfs",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "",
   "main": "index.mjs",
   "scripts": {
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@transportme/database": "^1.0.27",
-    "@transportme/transportvic-utils": "^1.0.2",
+    "@transportme/transportvic-utils": "^1.0.4",
     "@turf/boolean-point-in-polygon": "^7.1.0",
     "adm-zip": "^0.5.14",
     "async": "^3.2.6",

package/test/gtfs-calendar.test.mjs

@@ -6,7 +6,7 @@ import GTFSCalendarDate from '../lib/gtfs-parser/GTFSCalendarDate.mjs'
 import path from 'path'
 import url from 'url'
 import { CALENDAR_DATES } from '../lib/constants.mjs'
-import { toGTFSDate } from '../lib/utils.mjs'
+import { dateUtils } from '@transportme/transportvic-utils'
 
 const __filename = url.fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -151,12 +151,12 @@ describe('The GTFSCalendarDatesReader class', () => {
 
     let date = await reader.getNextEntity()
     expect(date.id).to.equal('T3_2')
-    expect(toGTFSDate(date.date)).to.equal('20250126')
+    expect(dateUtils.toGTFSDate(date.date)).to.equal('20250126')
     expect(date.type).to.equal(CALENDAR_DATES.REMOVED)
 
     let date2 = await reader.getNextEntity()
     expect(date2.id).to.equal('T5_2')
-    expect(toGTFSDate(date2.date)).to.equal('20241225')
+    expect(dateUtils.toGTFSDate(date2.date)).to.equal('20241225')
     expect(date2.type).to.equal(CALENDAR_DATES.REMOVED)
   })
 })

package/test/utils-test.mjs

@@ -1,21 +1,7 @@
 import { expect } from 'chai'
-import { hhmmToMinutesPastMidnight, parseDate, toGTFSDate } from '../lib/utils.mjs'
+import { hhmmToMinutesPastMidnight } from '../lib/utils.mjs'
 
 describe('The utils class', () => {
-  describe('The parseDate function', () => {
-    it('Should convert a GTFS date to a Melbourne timezoned date', () => {
-      expect(parseDate('20241122').toUTC().toISO()).to.equal('2024-11-21T13:00:00.000Z')
-    })
-  })
-
-
-  describe('The toGTFSDate function', () => {
-    it('Should convert a Luxon date back into a GTFS date', () => {
-      let date = parseDate('20241122')
-      expect(toGTFSDate(date.plus({ day: 3 }))).to.equal('20241125')
-    })
-  })
-
   describe('The hhmmToMinutesPastMidnight function', () => {
     it('Should convert a HH:MM timestamp into the minutes past midnight', () => {
       expect(hhmmToMinutesPastMidnight('06:05')).to.equal(6 * 60 + 5)