gtfs 4.10.3 → 4.11.0

package/lib/ods/deadheads.js

@@ -16,7 +16,7 @@ export function getDeadheads(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(deadheads.filenameBase);
@@ -26,7 +26,7 @@ export function getDeadheads(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/ops-locations.js

@@ -16,7 +16,7 @@ export function getOpsLocations(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(opsLocations.filenameBase);
@@ -26,7 +26,7 @@ export function getOpsLocations(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/run-events.js

@@ -16,7 +16,7 @@ export function getRunEvents(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(runEvents.filenameBase);
@@ -26,7 +26,7 @@ export function getRunEvents(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/runs-pieces.js

@@ -16,7 +16,7 @@ export function getRunsPieces(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(runsPieces.filenameBase);
@@ -26,7 +26,7 @@ export function getRunsPieces(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/models/gtfs/attributions.js

@@ -10,13 +10,13 @@ const model = {
     },
     {
       name: 'agency_id',
-      type: 'varchar(255)',      
+      type: 'varchar(255)',
       prefix: true,
     },
     {
       name: 'route_id',
       type: 'varchar(255)',
-      prefix: true,      
+      prefix: true,
     },
     {
       name: 'trip_id',

package/models/gtfs/booking-rules.js

@@ -0,0 +1,91 @@
+const model = {
+  filenameBase: 'booking_rules',
+  schema: [
+    {
+      name: 'booking_rule_id',
+      type: 'varchar(255)',
+      primary: true,
+      prefix: true,
+    },
+    {
+      name: 'booking_type',
+      type: 'integer',
+      required: true,
+      min: 0,
+      max: 2,
+    },
+    {
+      name: 'prior_notice_duration_min',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'prior_notice_duration_max',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'prior_notice_last_day',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'prior_notice_last_time',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'prior_notice_last_timestamp',
+      type: 'integer',
+      index: true,
+    },
+    {
+      name: 'prior_notice_start_day',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'prior_notice_start_time',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'prior_notice_start_timestamp',
+      type: 'integer',
+      index: true,
+    },
+    {
+      name: 'prior_notice_service_id',
+      type: 'varchar(255)',
+      prefix: true,
+    },
+    {
+      name: 'message',
+      type: 'varchar(2047)',
+      nocase: true,
+    },
+    {
+      name: 'pickup_message',
+      type: 'varchar(2047)',
+      nocase: true,
+    },
+    {
+      name: 'drop_off_message',
+      type: 'varchar(2047)',
+      nocase: true,
+    },
+    {
+      name: 'phone_number',
+      type: 'varchar(64)',
+      nocase: true,
+    },
+    {
+      name: 'info_url',
+      type: 'varchar(2047)',
+    },
+    {
+      name: 'booking_url',
+      type: 'varchar(2047)',
+    },
+  ],
+};
+
+export default model;

package/models/gtfs/fare-leg-rules.js

@@ -43,6 +43,11 @@ const model = {
       primary: true,
       prefix: true,
     },
+    {
+      name: 'rule_priority',
+      type: 'integer',
+      min: 0,
+    },
   ],
 };
 

package/models/gtfs/location-group-stops.js

@@ -0,0 +1,21 @@
+const model = {
+  filenameBase: 'location_group_stops',
+  schema: [
+    {
+      name: 'location_group_id',
+      type: 'varchar(255)',
+      prefix: true,
+      index: true,
+      required: true,
+    },
+    {
+      name: 'stop_id',
+      type: 'varchar(255)',
+      required: true,
+      prefix: true,
+      index: true,
+    },
+  ],
+};
+
+export default model;

package/models/gtfs/location-groups.js

@@ -0,0 +1,18 @@
+const model = {
+  filenameBase: 'location_groups',
+  schema: [
+    {
+      name: 'location_group_id',
+      type: 'varchar(255)',
+      primary: true,
+      prefix: true,
+    },
+    {
+      name: 'location_group_name',
+      type: 'varchar(255)',
+      nocase: true,
+    },
+  ],
+};
+
+export default model;

package/models/gtfs/stop-times.js

@@ -26,6 +26,18 @@ const model = {
       type: 'integer',
       index: true,
     },
+    {
+      name: 'location_group_id',
+      type: 'varchar(255)',
+      prefix: true,
+      index: true,
+    },
+    {
+      name: 'location_id',
+      type: 'varchar(255)',
+      prefix: true,
+      index: true,
+    },
     {
       name: 'stop_id',
       type: 'varchar(255)',
@@ -45,6 +57,15 @@ const model = {
       type: 'varchar(255)',
       nocase: true,
     },
+    {
+      name: 'start_pickup_drop_off_window',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'start_pickup_drop_off_window_timestamp',
+      type: 'integer',
+      index: true,
+    },
     {
       name: 'pickup_type',
       type: 'integer',
@@ -80,6 +101,18 @@ const model = {
       min: 0,
       max: 1,
     },
+    {
+      name: 'pickup_booking_rule_id',
+      type: 'varchar(255)',
+      prefix: true,
+      index: true,
+    },
+    {
+      name: 'drop_off_booking_rule_id',
+      type: 'varchar(255)',
+      prefix: true,
+      index: true,
+    },
   ],
 };
 

package/models/models.js

@@ -1,6 +1,7 @@
 import agency from '../models/gtfs/agency.js';
 import areas from '../models/gtfs/areas.js';
 import attributions from '../models/gtfs/attributions.js';
+import bookingRules from '../models/gtfs/booking-rules.js';
 import calendarDates from '../models/gtfs/calendar-dates.js';
 import calendar from '../models/gtfs/calendar.js';
 import fareAttributes from '../models/gtfs/fare-attributes.js';
@@ -12,6 +13,8 @@ import fareTransferRules from '../models/gtfs/fare-transfer-rules.js';
 import feedInfo from '../models/gtfs/feed-info.js';
 import frequencies from '../models/gtfs/frequencies.js';
 import levels from '../models/gtfs/levels.js';
+import locationGroups from '../models/gtfs/location-groups.js';
+import locationGroupStops from '../models/gtfs/location-group-stops.js';
 import networks from '../models/gtfs/networks.js';
 import pathways from '../models/gtfs/pathways.js';
 import routeNetworks from '../models/gtfs/route-networks.js';
@@ -59,6 +62,7 @@ const models = [
   agency,
   areas,
   attributions,
+  bookingRules,
   calendarDates,
   calendar,
   fareAttributes,
@@ -70,6 +74,8 @@ const models = [
   feedInfo,
   frequencies,
   levels,
+  locationGroups,
+  locationGroupStops,
   networks,
   pathways,
   routeNetworks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.10.3",
+  "version": "4.11.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -77,9 +77,9 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "better-sqlite3": "^10.0.0",
-    "csv-parse": "^5.5.5",
-    "csv-stringify": "^6.4.6",
+    "better-sqlite3": "^11.0.0",
+    "csv-parse": "^5.5.6",
+    "csv-stringify": "^6.5.0",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
     "long": "^5.2.3",
@@ -95,13 +95,13 @@
     "tmp-promise": "^3.0.3",
     "untildify": "^5.0.0",
     "yargs": "^17.7.2",
-    "yoctocolors": "^2.0.0"
+    "yoctocolors": "^2.0.2"
   },
   "devDependencies": {
     "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.5",
     "mocha": "^10.4.0",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.0",
     "should": "^13.2.3"
   },
   "engines": {

package/test/mocha/get-agencies.js

@@ -75,7 +75,7 @@ describe('getAgencies():', () => {
       {
         agency_id: agencyId,
       },
-      ['agency_url', 'agency_lang']
+      ['agency_url', 'agency_lang'],
     );
 
     const expectedResult = {

package/test/mocha/get-booking-rules.js

@@ -0,0 +1,28 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import { openDb, closeDb, importGtfs, getBookingRules } from '../../index.js';
+
+describe('getBookingRules():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no booking rules', () => {
+    const bookingRuleId = 'not_real';
+
+    const results = getBookingRules({
+      booking_rule_id: bookingRuleId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-calendar-dates.js

@@ -79,7 +79,7 @@ describe('getCalendarDates():', () => {
       [
         ['date', 'ASC'],
         ['service_id', 'ASC'],
-      ]
+      ],
     );
 
     const expectedResults = [

package/test/mocha/get-fare-rules.js

@@ -33,7 +33,7 @@ describe('getFareRules():', () => {
       {
         route_id: routeId,
       },
-      ['fare_id', 'route_id', 'origin_id', 'destination_id']
+      ['fare_id', 'route_id', 'origin_id', 'destination_id'],
     );
 
     const expectedResult = {

package/test/mocha/get-location-group-stops.js

@@ -0,0 +1,33 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  closeDb,
+  importGtfs,
+  getLocationGroupStops,
+} from '../../index.js';
+
+describe('getLocationGroupStops():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no location group stops', () => {
+    const locationGroupId = 'not_real';
+
+    const results = getLocationGroupStops({
+      location_group_id: locationGroupId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-location-groups.js

@@ -0,0 +1,28 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import { openDb, closeDb, importGtfs, getLocationGroups } from '../../index.js';
+
+describe('getLocationGroups():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no location groups', () => {
+    const locationGroupId = 'not_real';
+
+    const results = getLocationGroups({
+      location_group_id: locationGroupId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-routes.js

@@ -101,7 +101,7 @@ describe('getRoutes():', () => {
     const results = getRoutes(
       { stop_id: '70321' },
       [],
-      [['route_long_name', 'ASC']]
+      [['route_long_name', 'ASC']],
     );
 
     const expectedResults = [
@@ -131,7 +131,7 @@ describe('getRoutes():', () => {
     const results = getRoutes(
       { stop_id: 'not-valid' },
       [],
-      [['route_long_name', 'ASC']]
+      [['route_long_name', 'ASC']],
     );
 
     const expectedResults = [];

package/test/mocha/get-shapes.js

@@ -72,7 +72,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {
@@ -99,7 +99,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {
@@ -138,7 +138,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {
@@ -166,7 +166,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {
@@ -194,7 +194,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {
@@ -222,7 +222,7 @@ describe('getShapes():', () => {
         'shape_pt_lon',
         'shape_pt_sequence',
         'shape_dist_traveled',
-      ]
+      ],
     );
 
     const expectedResult = {

package/test/mocha/get-stoptimes.js

@@ -48,7 +48,7 @@ describe('getStoptimes():', () => {
         trip_id: tripId,
       },
       [],
-      [['stop_sequence', 'ASC']]
+      [['stop_sequence', 'ASC']],
     );
 
     should.exist(results);