gtfs 4.15.11 → 4.15.13

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Options } from 'csv-parse';
 import Database$1, { Database } from 'better-sqlite3';
 import { FeatureCollection } from 'geojson';
 
+type UnixTimestamp = number;
 interface ConfigAgency {
     exclude?: string[];
     url?: string;
@@ -36,7 +37,7 @@ interface Config {
 }
 interface ModelColumn {
     name: string;
-    type: string;
+    type: 'text' | 'integer' | 'real' | 'json' | 'date' | 'time';
     min?: number;
     max?: number;
     required?: boolean;
@@ -103,10 +104,10 @@ interface BookingRule {
     prior_notice_duration_max?: number;
     prior_notice_last_day?: number;
     prior_notice_last_time?: string;
-    prior_notice_last_timestamp?: number;
+    prior_notice_last_timestamp?: UnixTimestamp;
     prior_notice_start_day?: number;
     prior_notice_start_time?: string;
-    prior_notice_start_timestamp?: number;
+    prior_notice_start_timestamp?: UnixTimestamp;
     prior_notice_service_id?: string;
     message?: string;
     pickup_message?: string;
@@ -194,9 +195,9 @@ interface FeedInfo {
 interface Frequency {
     trip_id: string;
     start_time: string;
-    start_timestamp: number;
+    start_timestamp: UnixTimestamp;
     end_time: string;
-    end_timestamp: number;
+    end_timestamp: UnixTimestamp;
     headway_secs: number;
     exact_times?: 0 | 1;
 }
@@ -267,16 +268,16 @@ interface StopArea {
 interface StopTime {
     trip_id: string;
     arrival_time?: string;
-    arrival_timestamp?: number;
+    arrival_timestamp?: UnixTimestamp;
     departure_time?: string;
-    departure_timestamp?: number;
+    departure_timestamp?: UnixTimestamp;
     location_group_id?: string;
     location_id?: string;
     stop_id?: string;
     stop_sequence: number;
     stop_headsign?: string;
     start_pickup_drop_off_window?: string;
-    start_pickup_drop_off_window_timestamp?: number;
+    start_pickup_drop_off_window_timestamp?: UnixTimestamp;
     pickup_type?: 0 | 1 | 2 | 3;
     drop_off_type?: 0 | 1 | 2 | 3;
     continuous_pickup?: 0 | 1 | 2 | 3;
@@ -354,9 +355,9 @@ interface Timetable {
     saturday: 0 | 1;
     sunday: 0 | 1;
     start_time?: string;
-    start_timestamp?: number;
+    start_timestamp?: UnixTimestamp;
     end_time?: string;
-    end_timestamp?: number;
+    end_timestamp?: UnixTimestamp;
     timetable_label?: string;
     service_notes?: string;
     orientation?: string;
@@ -382,6 +383,7 @@ interface TimetableNote {
     note: string;
 }
 interface TimetableNotesReference {
+    note_id: string;
     timetable_id: string;
     route_id?: string;
     trip_id?: string;
@@ -398,9 +400,9 @@ interface TripsDatedVehicleJourney {
 interface DeadheadTime {
     deadhead_id: string;
     arrival_time: string;
-    arrival_timestamp: number;
+    arrival_timestamp: UnixTimestamp;
     departure_time: string;
-    departure_timestamp: number;
+    departure_timestamp: UnixTimestamp;
     ops_location_id?: string;
     stop_id?: string;
     location_sequence: number;
@@ -452,8 +454,8 @@ interface ServiceAlert {
     end_time: string;
     headline: string;
     description: string;
-    created_timestamp: number;
-    expiration_timestamp: number;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
 }
 interface StopTimeUpdate {
     trip_id?: string;
@@ -464,11 +466,11 @@ interface StopTimeUpdate {
     stop_sequence?: number;
     arrival_delay?: number;
     departure_delay?: number;
-    departure_timestamp?: string;
-    arrival_timestamp?: string;
+    departure_timestamp?: UnixTimestamp;
+    arrival_timestamp?: UnixTimestamp;
     schedule_relationship?: string;
-    created_timestamp: number;
-    expiration_timestamp: number;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
 }
 interface TripUpdate {
     update_id: string;
@@ -478,10 +480,10 @@ interface TripUpdate {
     direction_id?: 0 | 1;
     route_id?: string;
     start_date?: number;
-    timestamp?: string;
+    timestamp?: UnixTimestamp;
     schedule_relationship?: string;
-    created_timestamp: number;
-    expiration_timestamp: number;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
 }
 interface VehiclePosition {
     update_id: string;
@@ -501,9 +503,9 @@ interface VehiclePosition {
     vehicle_label?: string;
     vehicle_license_plate?: string;
     vehicle_wheelchair_accessible?: number;
-    timestamp?: string;
-    created_timestamp: number;
-    expiration_timestamp: number;
+    timestamp?: UnixTimestamp;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
 }
 interface BoardAlight {
     trip_id: string;
@@ -524,9 +526,9 @@ interface BoardAlight {
     ramp_alightings?: number;
     service_date?: number;
     service_arrival_time?: string;
-    service_arrival_timestamp?: number;
+    service_arrival_timestamp?: UnixTimestamp;
     service_departure_time?: string;
-    service_departure_timestamp?: number;
+    service_departure_timestamp?: UnixTimestamp;
     source?: 0 | 1 | 2 | 3 | 4;
 }
 interface RideFeedInfo {
@@ -547,9 +549,9 @@ interface RiderTrip {
     alighting_stop_sequence?: number;
     service_date?: number;
     boarding_time?: string;
-    boarding_timestamp?: number;
+    boarding_timestamp?: UnixTimestamp;
     alighting_time?: string;
-    alighting_timestamp?: number;
+    alighting_timestamp?: UnixTimestamp;
     rider_type?: number;
     rider_type_description?: string;
     fare_paid?: number;
@@ -564,9 +566,9 @@ interface Ridership {
     ridership_start_date?: number;
     ridership_end_date?: number;
     ridership_start_time?: string;
-    ridership_start_timestamp?: number;
+    ridership_start_timestamp?: UnixTimestamp;
     ridership_end_time?: string;
-    ridership_end_timestamp?: number;
+    ridership_end_timestamp?: UnixTimestamp;
     service_id?: string;
     monday?: 0 | 1;
     tuesday?: 0 | 1;
@@ -747,4 +749,4 @@ declare function getRunEvents<Fields extends keyof RunEvent>(query?: SqlWhere, f
 
 declare function getRunsPieces<Fields extends keyof RunPiece>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<RunPiece, Fields>[];
 
-export { type Agency, type Area, type Attribution, type BoardAlight, type BookingRule, type Calendar, type CalendarAttribute, type CalendarDate, type Config, type ConfigAgency, type Deadhead, type DeadheadTime, type Direction, type FareAttribute, type FareLegRule, type FareMedia, type FareProduct, type FareRule, type FareTransferRule, type FeedInfo, type Frequency, type JoinOptions, type Level, type Location, type LocationGroup, type LocationGroupStop, type Model, type ModelColumn, type Network, type OpsLocation, type Pathway, type QueryOptions, type QueryResult, type RideFeedInfo, type RiderTrip, type Ridership, type Route, type RouteAttribute, type RouteNetwork, type RunEvent, type RunPiece, type ServiceAlert, type Shape, type SqlOrderBy, type SqlValue, type SqlWhere, type Stop, type StopArea, type StopAttribute, type StopTime, type StopTimeUpdate, type Timeframe, type Timetable, type TimetableNote, type TimetableNotesReference, type TimetablePage, type TimetableStopOrder, type Transfer, type Translation, type Trip, type TripCapacity, type TripUpdate, type TripsDatedVehicleJourney, type VehiclePosition, advancedQuery, closeDb, deleteDb, exportGtfs, getAgencies, getAreas, getAttributions, getBoardAlights, getBookingRules, getCalendarAttributes, getCalendarDates, getCalendars, getDeadheadTimes, getDeadheads, getDirections, getFareAttributes, getFareLegRules, getFareMedia, getFareProducts, getFareRules, getFareTransferRules, getFeedInfo, getFrequencies, getLevels, getLocationGroupStops, getLocationGroups, getLocations, getNetworks, getOpsLocations, getPathways, getRideFeedInfo, getRiderTrips, getRidership, getRouteAttributes, getRouteNetworks, getRoutes, getRunEvents, getRunsPieces, getServiceAlerts, getServiceIdsByDate, getShapes, getShapesAsGeoJSON, getStopAreas, getStopAttributes, getStopTimeUpdates, getStops, getStopsAsGeoJSON, getStoptimes, getTimeframes, getTimetableNotes, getTimetableNotesReferences, getTimetablePages, getTimetableStopOrders, getTimetables, getTransfers, getTranslations, getTripCapacities, getTripUpdates, getTrips, getTripsDatedVehicleJourneys, getVehiclePositions, importGtfs, openDb, updateGtfsRealtime };
+export { type Agency, type Area, type Attribution, type BoardAlight, type BookingRule, type Calendar, type CalendarAttribute, type CalendarDate, type Config, type ConfigAgency, type Deadhead, type DeadheadTime, type Direction, type FareAttribute, type FareLegRule, type FareMedia, type FareProduct, type FareRule, type FareTransferRule, type FeedInfo, type Frequency, type JoinOptions, type Level, type Location, type LocationGroup, type LocationGroupStop, type Model, type ModelColumn, type Network, type OpsLocation, type Pathway, type QueryOptions, type QueryResult, type RideFeedInfo, type RiderTrip, type Ridership, type Route, type RouteAttribute, type RouteNetwork, type RunEvent, type RunPiece, type ServiceAlert, type Shape, type SqlOrderBy, type SqlValue, type SqlWhere, type Stop, type StopArea, type StopAttribute, type StopTime, type StopTimeUpdate, type Timeframe, type Timetable, type TimetableNote, type TimetableNotesReference, type TimetablePage, type TimetableStopOrder, type Transfer, type Translation, type Trip, type TripCapacity, type TripUpdate, type TripsDatedVehicleJourney, type UnixTimestamp, type VehiclePosition, advancedQuery, closeDb, deleteDb, exportGtfs, getAgencies, getAreas, getAttributions, getBoardAlights, getBookingRules, getCalendarAttributes, getCalendarDates, getCalendars, getDeadheadTimes, getDeadheads, getDirections, getFareAttributes, getFareLegRules, getFareMedia, getFareProducts, getFareRules, getFareTransferRules, getFeedInfo, getFrequencies, getLevels, getLocationGroupStops, getLocationGroups, getLocations, getNetworks, getOpsLocations, getPathways, getRideFeedInfo, getRiderTrips, getRidership, getRouteAttributes, getRouteNetworks, getRoutes, getRunEvents, getRunsPieces, getServiceAlerts, getServiceIdsByDate, getShapes, getShapesAsGeoJSON, getStopAreas, getStopAttributes, getStopTimeUpdates, getStops, getStopsAsGeoJSON, getStoptimes, getTimeframes, getTimetableNotes, getTimetableNotesReferences, getTimetablePages, getTimetableStopOrders, getTimetables, getTransfers, getTranslations, getTripCapacities, getTripUpdates, getTrips, getTripsDatedVehicleJourneys, getVehiclePositions, importGtfs, openDb, updateGtfsRealtime };

package/dist/index.js

@@ -2647,6 +2647,11 @@ var serviceAlerts = {
       index: true,
       source: "id"
     },
+    {
+      name: "active_period",
+      type: "json",
+      source: "alert.activePeriod"
+    },
     {
       name: "cause",
       type: "text",
@@ -2660,7 +2665,7 @@ var serviceAlerts = {
     {
       name: "url",
       type: "text",
-      source: "alert.url",
+      source: "alert.url.translation[0].text",
       default: ""
     },
     {
@@ -2678,31 +2683,31 @@ var serviceAlerts = {
       default: ""
     },
     {
-      name: "headerText",
+      name: "header_text",
       type: "text",
       required: true,
       source: "alert.headerText.translation[0].text",
       default: ""
     },
     {
-      name: "descriptionText",
+      name: "description_text",
       type: "text",
       required: true,
       source: "alert.descriptionText.translation[0].text",
       default: ""
     },
     {
-      name: "ttsHeaderText",
+      name: "tts_header_text",
       type: "text",
       source: "alert.ttsHeaderText.translation[0].text"
     },
     {
-      name: "ttsDescriptionText",
+      name: "tts_description_text",
       type: "text",
       source: "alert.ttsDescriptionText.translation[0].text"
     },
     {
-      name: "severityLevel",
+      name: "severity_level",
       type: "text",
       source: "alert.severityLevel"
     },
@@ -3359,9 +3364,11 @@ function convertLongTimeToDate(longDate) {
   ).toISOString();
 }
 function calculateSecondsFromMidnight(time) {
-  if (!time || typeof time !== "string") return null;
+  if (!time || typeof time !== "string") {
+    return null;
+  }
   const [hours, minutes, seconds] = time.split(":").map(Number);
-  if ([hours, minutes, seconds].some(isNaN) || hours >= 24 || minutes >= 60 || seconds >= 60) {
+  if ([hours, minutes, seconds].some(isNaN) || minutes >= 60 || seconds >= 60) {
     return null;
   }
   return hours * 3600 + minutes * 60 + seconds;
@@ -3570,9 +3577,11 @@ function prepareRealtimeFieldValue(entity, column, task) {
   if (column.name === "expiration_timestamp") {
     return task.currentTimestamp + task.gtfsRealtimeExpirationSeconds;
   }
-  return sqlString2.escape(
-    getNestedProperty(entity, column.default, column.source)
-  );
+  const value = getNestedProperty(entity, column.default, column.source);
+  if (column.type === "json") {
+    return sqlString2.escape(JSON.stringify(value));
+  }
+  return sqlString2.escape(value);
 }
 async function processRealtimeAlerts(db, gtfsRealtimeData, task) {
   task.log(`Download successful`);
@@ -3965,6 +3974,9 @@ var formatGtfsLine = (line, model, totalLineCount) => {
       value = timeAsString;
       formattedLine[getTimestampColumnName(name)] = timeAsSecondsFromMidnight ?? null;
     }
+    if (type === "json") {
+      value = JSON.stringify(value);
+    }
     formattedLine[name] = value;
   }
   return formattedLine;
@@ -4778,7 +4790,7 @@ function getStops(query = {}, fields = [], orderBy2 = [], options = {}) {
   const tableName = "stops";
   const selectClause = formatSelectClause(fields);
   let whereClause = "";
-  const orderByClause = formatOrderByClause(orderBy2);
+  let orderByClause = formatOrderByClause(orderBy2);
   const stopQueryOmitKeys = [
     "route_id",
     "trip_id",
@@ -4808,6 +4820,9 @@ function getStops(query = {}, fields = [], orderBy2 = [], options = {}) {
         options.bounding_box_side_m
       )
     );
+    if (orderBy2.length === 0) {
+      orderByClause = `ORDER BY (((stop_lat - ${query.stop_lat}) * (stop_lat - ${query.stop_lat})) + ((stop_lon - ${query.stop_lon}) * (stop_lon - ${query.stop_lon}))) ASC`;
+    }
   }
   if (Object.values(tripQuery).length > 0) {
     whereClauses.push(`stop_id IN (${buildStoptimeSubquery2(tripQuery)})`);