gtfs 4.14.0 → 4.14.1

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import CsvParse from 'csv-parse';
 import Database from 'better-sqlite3';
 import { FeatureCollection } from 'geojson';
 
-interface IAgency {
+interface ConfigAgency {
     exclude?: string[];
     url?: string;
     path?: string;
@@ -21,7 +21,7 @@ interface IAgency {
     };
     prefix?: string;
 }
-interface IConfig {
+interface Config {
     db?: Database.Database;
     sqlitePath?: string;
     ignoreDuplicates?: boolean;
@@ -30,7 +30,7 @@ interface IConfig {
     csvOptions?: CsvParse.Options;
     exportPath?: string;
     ignoreErrors?: boolean;
-    agencies: IAgency[];
+    agencies: ConfigAgency[];
     verbose?: boolean;
     logFunction?: (message: string) => void;
 }
@@ -48,11 +48,282 @@ interface QueryOptions {
     bounding_box_side_m?: number;
 }
 type SqlResults = Array<Record<string, any>>;
+interface Agency {
+    agency_id?: string;
+    agency_name: string;
+    agency_url: string;
+    agency_timezone: string;
+    agency_lang?: string;
+    agency_phone?: string;
+    agency_fare_url?: string;
+    agency_email?: string;
+}
+interface Area {
+    area_id: string;
+    area_name?: string;
+}
+interface Attribution {
+    attribution_id?: string;
+    agency_id?: string;
+    route_id?: string;
+    trip_id?: string;
+    organization_name: string;
+    is_producer?: 0 | 1;
+    is_operator?: 0 | 1;
+    is_authority?: 0 | 1;
+    attribution_url?: string;
+    attribution_email?: string;
+    attribution_phone?: string;
+}
+interface BookingRule {
+    booking_rule_id: string;
+    booking_type: 0 | 1 | 2;
+    prior_notice_duration_min?: number;
+    prior_notice_duration_max?: number;
+    prior_notice_last_day?: number;
+    prior_notice_last_time?: string;
+    prior_notice_last_timestamp?: number;
+    prior_notice_start_day?: number;
+    prior_notice_start_time?: string;
+    prior_notice_start_timestamp?: number;
+    prior_notice_service_id?: string;
+    message?: string;
+    pickup_message?: string;
+    drop_off_message?: string;
+    phone_number?: string;
+    info_url?: string;
+    booking_url?: string;
+}
+interface Calendar {
+    service_id: string;
+    monday: 0 | 1;
+    tuesday: 0 | 1;
+    wednesday: 0 | 1;
+    thursday: 0 | 1;
+    friday: 0 | 1;
+    saturday: 0 | 1;
+    sunday: 0 | 1;
+    start_date: number;
+    end_date: number;
+}
+interface CalendarDate {
+    service_id: string;
+    date: number;
+    exception_type: 1 | 2;
+    holiday_name?: string;
+}
+interface FareAttribute {
+    fare_id: string;
+    price: number;
+    currency_type: string;
+    payment_method: 0 | 1;
+    transfers: 0 | 1 | 2;
+    agency_id?: string;
+    transfer_duration?: number;
+}
+interface FareLegRule {
+    leg_group_id?: string;
+    network_id?: string;
+    from_area_id?: string;
+    to_area_id?: string;
+    from_timeframe_group_id?: string;
+    to_timeframe_group_id?: string;
+    fare_product_id: string;
+    rule_priority?: number;
+}
+interface FareMedia {
+    fare_media_id: string;
+    fare_media_name?: string;
+    fare_media_type: 0 | 1 | 2 | 3 | 4;
+}
+interface FareProduct {
+    fare_product_id: string;
+    fare_product_name?: string;
+    fare_media_id?: string;
+    amount: number;
+    currency: string;
+}
+interface FareRule {
+    fare_id: string;
+    route_id?: string;
+    origin_id?: string;
+    destination_id?: string;
+    contains_id?: string;
+}
+interface FareTransferRule {
+    from_leg_group_id?: string;
+    to_leg_group_id?: string;
+    transfer_count?: number;
+    duration_limit: number;
+    duration_limit_type?: 0 | 1 | 2 | 3;
+    fare_transfer_type: 0 | 1 | 2;
+    fare_product_id?: string;
+}
+interface FeedInfo {
+    feed_publisher_name: string;
+    feed_publisher_url: string;
+    feed_lang: string;
+    default_lang?: string;
+    feed_start_date?: number;
+    feed_end_date?: number;
+    feed_version?: string;
+    feed_contact_email?: string;
+    feed_contact_url?: string;
+}
+interface Frequency {
+    trip_id: string;
+    start_time: string;
+    start_timestamp: number;
+    end_time: string;
+    end_timestamp: number;
+    headway_secs: number;
+    exact_times?: 0 | 1;
+}
+interface Level {
+    level_id: string;
+    level_index: number;
+    level_name?: string;
+}
+interface LocationGroupStop {
+    location_group_id: string;
+    stop_id: string;
+}
+interface LocationGroup {
+    location_group_id: string;
+    location_group_name?: string;
+}
+interface Location {
+    geojson: string;
+}
+interface Network {
+    network_id: string;
+    network_name?: string;
+}
+interface Pathway {
+    pathway_id: string;
+    from_stop_id: string;
+    to_stop_id: string;
+    pathway_mode: 1 | 2 | 3 | 4 | 5 | 6 | 7;
+    is_bidirectional: 0 | 1;
+    length?: number;
+    traversal_time?: number;
+    stair_count?: number;
+    max_slope?: number;
+    min_width?: number;
+    signposted_as?: string;
+    reversed_signposted_as?: string;
+}
+interface RouteNetwork {
+    network_id: string;
+    route_id: string;
+}
+interface Route {
+    route_id: string;
+    agency_id?: string;
+    route_short_name?: string;
+    route_long_name?: string;
+    route_desc?: string;
+    route_type: number;
+    route_url?: string;
+    route_color?: string;
+    route_text_color?: string;
+    route_sort_order?: number;
+    continuous_pickup?: 0 | 1 | 2 | 3;
+    continuous_drop_off?: 0 | 1 | 2 | 3;
+    network_id?: string;
+}
+interface Shape {
+    shape_id: string;
+    shape_pt_lat: number;
+    shape_pt_lon: number;
+    shape_pt_sequence: number;
+    shape_dist_traveled?: number;
+}
+interface StopArea {
+    area_id: string;
+    stop_id: string;
+}
+interface StopTime {
+    trip_id: string;
+    arrival_time?: string;
+    arrival_timestamp?: number;
+    departure_time?: string;
+    departure_timestamp?: number;
+    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;
+    pickup_type?: 0 | 1 | 2 | 3;
+    drop_off_type?: 0 | 1 | 2 | 3;
+    continuous_pickup?: 0 | 1 | 2 | 3;
+    continuous_drop_off?: 0 | 1 | 2 | 3;
+    shape_dist_traveled?: number;
+    timepoint?: 0 | 1;
+    pickup_booking_rule_id?: string;
+    drop_off_booking_rule_id?: string;
+}
+interface Stop {
+    stop_id: string;
+    stop_code?: string;
+    stop_name?: string;
+    tts_stop_name?: string;
+    stop_desc?: string;
+    stop_lat?: number;
+    stop_lon?: number;
+    zone_id?: string;
+    stop_url?: string;
+    location_type?: 0 | 1 | 2 | 3 | 4;
+    parent_station?: string;
+    stop_timezone?: string;
+    wheelchair_boarding?: 0 | 1 | 2;
+    level_id?: string;
+    platform_code?: string;
+}
+interface Timeframe {
+    timeframe_group_id: string;
+    start_time?: string;
+    end_time?: string;
+    service_id: string;
+}
+interface Transfer {
+    from_stop_id?: string;
+    to_stop_id?: string;
+    from_route_id?: string;
+    to_route_id?: string;
+    from_trip_id?: string;
+    to_trip_id?: string;
+    transfer_type: 0 | 1 | 2 | 3 | 4 | 5;
+    min_transfer_time?: number;
+}
+interface Translation {
+    table_name: string;
+    field_name: string;
+    language: string;
+    translation: string;
+    record_id?: string;
+    record_sub_id?: string;
+    field_value?: string;
+}
+interface Trip {
+    route_id: string;
+    service_id: string;
+    trip_id: string;
+    trip_headsign?: string;
+    trip_short_name?: string;
+    direction_id?: 0 | 1;
+    block_id?: string;
+    shape_id?: string;
+    wheelchair_accessible?: 0 | 1 | 2;
+    bikes_allowed?: 0 | 1 | 2;
+}
 
-declare function importGtfs(initialConfig: IConfig): Promise<void>;
-declare function updateGtfsRealtime(initialConfig: IConfig): Promise<void>;
+declare function importGtfs(initialConfig: Config): Promise<void>;
+declare function updateGtfsRealtime(initialConfig: Config): Promise<void>;
 
-declare const exportGtfs: (initialConfig: IConfig) => Promise<void>;
+declare const exportGtfs: (initialConfig: Config) => Promise<void>;
 
 declare function openDb(config?: {
     db?: Database.Database;
@@ -70,67 +341,67 @@ declare function advancedQuery(table: string, advancedQueryOptions: {
     options?: QueryOptions;
 }): Array<Record<string, any>>;
 
-declare function getAgencies(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getAgencies(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Agency[];
 
-declare function getAreas(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getAreas(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Area[];
 
-declare function getAttributions(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getAttributions(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Attribution[];
 
-declare function getBookingRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getBookingRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): BookingRule[];
 
-declare function getCalendarDates(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getCalendarDates(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): CalendarDate[];
 
-declare function getCalendars(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getCalendars(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Calendar[];
 
-declare function getFareAttributes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareAttributes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareAttribute[];
 
-declare function getFareLegRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareLegRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareLegRule[];
 
-declare function getFareMedia(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareMedia(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareMedia[];
 
-declare function getFareProducts(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareProducts(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareProduct[];
 
-declare function getFareRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareRule[];
 
-declare function getFareTransferRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFareTransferRules(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FareTransferRule[];
 
-declare function getFeedInfo(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFeedInfo(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): FeedInfo[];
 
-declare function getFrequencies(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getFrequencies(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Frequency[];
 
-declare function getLevels(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getLevels(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Level[];
 
-declare function getLocationGroups(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getLocationGroups(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): LocationGroup[];
 
-declare function getLocationGroupStops(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getLocationGroupStops(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): LocationGroupStop[];
 
-declare function getLocations(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getLocations(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Location[];
 
-declare function getNetworks(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getNetworks(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Network[];
 
-declare function getPathways(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getPathways(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Pathway[];
 
-declare function getRouteNetworks(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getRouteNetworks(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): RouteNetwork[];
 
-declare function getRoutes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getRoutes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Route[];
 
-declare function getShapes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getShapes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Shape[];
 declare function getShapesAsGeoJSON(query?: SqlWhere, options?: QueryOptions): FeatureCollection;
 
-declare function getStopAreas(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getStopAreas(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): StopArea[];
 
-declare function getStops(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getStops(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Stop[];
 declare function getStopsAsGeoJSON(query?: SqlWhere, options?: QueryOptions): FeatureCollection;
 
-declare function getStoptimes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getStoptimes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): StopTime[];
 
-declare function getTimeframes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getTimeframes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Timeframe[];
 
-declare function getTransfers(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getTransfers(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Transfer[];
 
-declare function getTranslations(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getTranslations(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Translation[];
 
-declare function getTrips(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
+declare function getTrips(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): Trip[];
 
 declare function getCalendarAttributes(query?: SqlWhere, fields?: SqlSelect, orderBy?: SqlOrderBy, options?: QueryOptions): SqlResults;
 

package/dist/index.js

@@ -634,11 +634,6 @@ var fareTransferRules = {
       min: -1,
       primary: true
     },
-    {
-      name: "transfer_id",
-      type: "text",
-      prefix: true
-    },
     {
       name: "duration_limit",
       type: "integer",
@@ -3192,6 +3187,7 @@ function generateFolderName(folderName) {
 // src/lib/geojson-utils.ts
 import {
   cloneDeep,
+  compact,
   filter,
   groupBy,
   last,
@@ -3220,14 +3216,14 @@ function isValidLineString(lineString) {
   }
   return true;
 }
-function consolidateShapes(shapes2) {
+function consolidateShapes(shapeGroups) {
   const keys = /* @__PURE__ */ new Set();
-  const segmentsArray = shapes2.map(
-    (shape) => shape.reduce(
+  const segmentsArray = shapeGroups.map(
+    (shapes2) => shapes2.reduce(
       (memo, point, idx) => {
         if (idx > 0) {
           memo.push([
-            [shape[idx - 1].shape_pt_lon, shape[idx - 1].shape_pt_lat],
+            [shapes2[idx - 1].shape_pt_lon, shapes2[idx - 1].shape_pt_lat],
             [point.shape_pt_lon, point.shape_pt_lat]
           ]);
         }
@@ -3296,15 +3292,18 @@ function shapesToGeoJSONFeature(shapes2, properties = {}) {
   );
 }
 function stopsToGeoJSONFeatureCollection(stops2) {
-  const features = stops2.map(
-    (stop) => feature(
+  const features = compact(stops2.map((stop) => {
+    if (!stop.stop_lon || !stop.stop_lat) {
+      return;
+    }
+    return feature(
       {
         type: "Point",
         coordinates: [stop.stop_lon, stop.stop_lat]
       },
       formatProperties(omit2(stop, ["stop_lat", "stop_lon"]))
-    )
-  );
+    );
+  }));
   return featureCollection(features);
 }
 
@@ -4107,7 +4106,7 @@ async function updateGtfsRealtime(initialConfig) {
 // src/lib/export.ts
 import path2 from "node:path";
 import { writeFile as writeFile2 } from "node:fs/promises";
-import { without, compact } from "lodash-es";
+import { without, compact as compact2 } from "lodash-es";
 import pluralize2 from "pluralize";
 import { stringify } from "csv-stringify";
 import sqlString3 from "sqlstring-sqlite";
@@ -4214,7 +4213,7 @@ var exportGtfs = async (initialConfig) => {
       return `${model.filenameBase}.${model.filenameExtension}`;
     }
   );
-  if (compact(exportedFiles).length === 0) {
+  if (compact2(exportedFiles).length === 0) {
     log2("No GTFS data exported. Be sure to first import data into SQLite.");
     return;
   }
@@ -4544,7 +4543,7 @@ function getRoutes(query = {}, fields = [], orderBy2 = [], options = {}) {
 }
 
 // src/lib/gtfs/shapes.ts
-import { compact as compact2, omit as omit4, pick as pick2 } from "lodash-es";
+import { compact as compact3, omit as omit4, pick as pick2 } from "lodash-es";
 import { featureCollection as featureCollection2 } from "@turf/helpers";
 
 // src/lib/gtfs-plus/route-attributes.ts
@@ -4594,7 +4593,7 @@ function getShapesAsGeoJSON(query = {}, options = {}) {
   const agencies = getAgencies2({}, [], [], options);
   const routeQuery = pick2(query, ["route_id"]);
   const routes2 = getRoutes(routeQuery, [], [], options);
-  const features = compact2(
+  const features = compact3(
     routes2.map((route) => {
       const shapeQuery = {
         route_id: route.route_id,
@@ -4721,14 +4720,14 @@ function getStopsAsGeoJSON(query = {}, options = {}) {
     const routeSubquery = "SELECT DISTINCT route_id FROM trips WHERE trip_id IN (SELECT DISTINCT trip_id FROM stop_times WHERE stop_id = ?)";
     const routes2 = db.prepare(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`).all(stop.stop_id);
     const stopAttributes2 = getStopAttributes({ stop_id: stop.stop_id });
-    stop.routes = orderBy(
-      routes2,
-      (route) => route?.route_short_name ? Number.parseInt(route.route_short_name, 10) : 0
-    );
-    stop.agency_name = agencies[0].agency_name;
     return {
       ...stop,
-      ...stopAttributes2?.[0] || []
+      ...stopAttributes2?.[0] || [],
+      routes: orderBy(
+        routes2,
+        (route) => route?.route_short_name ? Number.parseInt(route.route_short_name, 10) : 0
+      ),
+      agency_name: agencies[0].agency_name
     };
   });
   const filteredStops = preparedStops.filter((stop) => stop.routes.length > 0);