gtfs 4.15.8 → 4.15.9

package/dist/bin/gtfs-import.js

@@ -360,12 +360,7 @@ var bookingRules = {
     },
     {
       name: "prior_notice_last_time",
-      type: "text"
-    },
-    {
-      name: "prior_notice_last_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "prior_notice_start_day",
@@ -374,12 +369,7 @@ var bookingRules = {
     },
     {
       name: "prior_notice_start_time",
-      type: "text"
-    },
-    {
-      name: "prior_notice_start_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "prior_notice_service_id",
@@ -845,23 +835,15 @@ var frequencies = {
     },
     {
       name: "start_time",
-      type: "text",
+      type: "time",
       required: true,
       primary: true
     },
-    {
-      name: "start_timestamp",
-      type: "integer"
-    },
     {
       name: "end_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "end_timestamp",
-      type: "integer"
-    },
     {
       name: "headway_secs",
       type: "integer",
@@ -1228,21 +1210,11 @@ var stopTimes = {
     },
     {
       name: "arrival_time",
-      type: "text"
-    },
-    {
-      name: "arrival_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "departure_time",
-      type: "text"
-    },
-    {
-      name: "departure_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "location_group_id",
@@ -1277,12 +1249,7 @@ var stopTimes = {
     },
     {
       name: "start_pickup_drop_off_window",
-      type: "text"
-    },
-    {
-      name: "start_pickup_drop_off_window_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "pickup_type",
@@ -1432,12 +1399,12 @@ var timeframes = {
     },
     {
       name: "start_time",
-      type: "text",
+      type: "time",
       primary: true
     },
     {
       name: "end_time",
-      type: "text",
+      type: "time",
       primary: true
     },
     {
@@ -1710,19 +1677,11 @@ var timetables = {
     },
     {
       name: "start_time",
-      type: "text"
-    },
-    {
-      name: "start_timestamp",
-      type: "integer"
+      type: "time"
     },
     {
       name: "end_time",
-      type: "text"
-    },
-    {
-      name: "end_timestamp",
-      type: "integer"
+      type: "time"
     },
     {
       name: "timetable_label",
@@ -2162,21 +2121,11 @@ var boardAlight = {
     },
     {
       name: "service_arrival_time",
-      type: "text"
-    },
-    {
-      name: "service_arrival_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "service_departure_time",
-      type: "text"
-    },
-    {
-      name: "service_departure_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "source",
@@ -2243,21 +2192,11 @@ var riderTrip = {
     },
     {
       name: "boarding_time",
-      type: "text"
-    },
-    {
-      name: "boarding_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "alighting_time",
-      type: "text"
-    },
-    {
-      name: "alighting_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "rider_type",
@@ -2331,21 +2270,11 @@ var ridership = {
     },
     {
       name: "ridership_start_time",
-      type: "text"
-    },
-    {
-      name: "ridership_start_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "ridership_end_time",
-      type: "text"
-    },
-    {
-      name: "ridership_end_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "service_id",
@@ -2937,24 +2866,14 @@ var deadheadTimes = {
     },
     {
       name: "arrival_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "arrival_timestamp",
-      type: "integer",
-      index: true
-    },
     {
       name: "departure_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "departure_timestamp",
-      type: "integer",
-      index: true
-    },
     {
       name: "ops_location_id",
       type: "text",
@@ -3348,6 +3267,9 @@ function padLeadingZeros(time) {
   }
   return split.join(":");
 }
+function getTimestampColumnName(columnName) {
+  return columnName.endsWith("time") ? `${columnName}stamp` : `${columnName}_timestamp`;
+}
 
 // src/lib/import-gtfs-realtime.ts
 function getNestedProperty(obj, defaultValue, path3) {
@@ -3562,35 +3484,22 @@ async function updateGtfsRealtimeData(task) {
 }
 
 // src/lib/import-gtfs.ts
-var dateCache = {};
-var calculateAndCacheDate = (value) => {
-  const cached = dateCache[value];
-  if (cached != null) {
+var timeCache = {};
+var formatAndCacheTime = (value) => {
+  const cached = timeCache[value];
+  if (cached !== void 0) {
     return cached;
   }
-  const seconds = calculateSecondsFromMidnight(value);
-  const date = padLeadingZeros(value);
-  const computed = [seconds, date];
-  dateCache[value] = computed;
+  const timeAsSecondsFromMidnight = calculateSecondsFromMidnight(value);
+  const timeAsString = padLeadingZeros(value);
+  const computed = [timeAsSecondsFromMidnight, timeAsString];
+  timeCache[value] = computed;
   return computed;
 };
 var getTextFiles = async (folderPath) => {
   const files = await readdir(folderPath);
   return files.filter((filename) => filename.slice(-3) === "txt");
 };
-var TIME_COLUMN_NAMES = [
-  "start_time",
-  "end_time",
-  "arrival_time",
-  "departure_time",
-  "prior_notice_last_time",
-  "prior_notice_start_time",
-  "start_pickup_drop_off_window"
-];
-var TIME_COLUMN_PAIRS = TIME_COLUMN_NAMES.map((name) => [
-  name,
-  name.endsWith("time") ? `${name}stamp` : `${name}_timestamp`
-]);
 var downloadGtfsFiles = async (task) => {
   if (!task.url) {
     throw new Error("No `url` specified in config");
@@ -3668,7 +3577,8 @@ var createGtfsTables = (db) => {
     if (!model.schema) {
       return;
     }
-    const columns = model.schema.map((column) => {
+    const sqlColumnCreateStatements = [];
+    for (const column of model.schema) {
       const checks = [];
       if (column.min !== void 0 && column.max) {
         checks.push(
@@ -3683,8 +3593,7 @@ var createGtfsTables = (db) => {
         checks.push(
           `(TYPEOF(${column.name}) = 'integer' OR ${column.name} IS NULL)`
         );
-      }
-      if (column.type === "real") {
+      } else if (column.type === "real") {
         checks.push(
           `(TYPEOF(${column.name}) = 'real' OR ${column.name} IS NULL)`
         );
@@ -3693,17 +3602,24 @@ var createGtfsTables = (db) => {
       const columnDefault = column.default ? "DEFAULT " + column.default : "";
       const columnCollation = column.nocase ? "COLLATE NOCASE" : "";
       const checkClause = checks.length > 0 ? `CHECK(${checks.join(" AND ")})` : "";
-      return `${column.name} ${column.type} ${checkClause} ${required} ${columnDefault} ${columnCollation}`;
-    });
+      sqlColumnCreateStatements.push(
+        `${column.name} ${column.type} ${checkClause} ${required} ${columnDefault} ${columnCollation}`
+      );
+      if (column.type === "time") {
+        sqlColumnCreateStatements.push(
+          `${getTimestampColumnName(column.name)} INTEGER`
+        );
+      }
+    }
     const primaryColumns = model.schema.filter((column) => column.primary);
     if (primaryColumns.length > 0) {
-      columns.push(
-        `PRIMARY KEY (${primaryColumns.map((column) => column.name).join(", ")})`
+      sqlColumnCreateStatements.push(
+        `PRIMARY KEY (${primaryColumns.map(({ name }) => name).join(", ")})`
       );
     }
     db.prepare(`DROP TABLE IF EXISTS ${model.filenameBase};`).run();
     db.prepare(
-      `CREATE TABLE ${model.filenameBase} (${columns.join(", ")});`
+      `CREATE TABLE ${model.filenameBase} (${sqlColumnCreateStatements.join(", ")});`
     ).run();
   }
 };
@@ -3712,10 +3628,18 @@ var createGtfsIndexes = (db) => {
     if (!model.schema) {
       return;
     }
-    for (const column of model.schema.filter((column2) => column2.index)) {
-      db.prepare(
-        `CREATE INDEX idx_${model.filenameBase}_${column.name} ON ${model.filenameBase} (${column.name});`
-      ).run();
+    for (const column of model.schema) {
+      if (column.index) {
+        db.prepare(
+          `CREATE INDEX idx_${model.filenameBase}_${column.name} ON ${model.filenameBase} (${column.name});`
+        ).run();
+      }
+      if (column.type === "time") {
+        const timestampColumnName = getTimestampColumnName(column.name);
+        db.prepare(
+          `CREATE INDEX idx_${model.filenameBase}_${timestampColumnName} ON ${model.filenameBase} (${timestampColumnName});`
+        ).run();
+      }
     }
   }
 };
@@ -3724,11 +3648,13 @@ var formatGtfsLine = (line, model, totalLineCount) => {
   const formattedLine = {};
   const filenameBase = model.filenameBase;
   const filenameExtension = model.filenameExtension;
-  for (const columnSchema of model.schema) {
-    const { name, type, required, min, max } = columnSchema;
+  for (const { name, type, required } of model.schema) {
     let value = line[name];
     if (value === "" || value === void 0 || value === null) {
       formattedLine[name] = null;
+      if (type === "time") {
+        formattedLine[getTimestampColumnName(name)] = null;
+      }
       if (required) {
         throw new Error(
           `Missing required value in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}.`
@@ -3743,17 +3669,13 @@ var formatGtfsLine = (line, model, totalLineCount) => {
           `Invalid date in ${filenameBase}.${filenameExtension} for ${name} on line ${lineNumber}.`
         );
       }
+    } else if (type === "time") {
+      const [timeAsSecondsFromMidnight, timeAsString] = formatAndCacheTime(value);
+      value = timeAsString;
+      formattedLine[getTimestampColumnName(name)] = timeAsSecondsFromMidnight ?? null;
     }
     formattedLine[name] = value;
   }
-  for (const [timeColumnName, timestampColumnName] of TIME_COLUMN_PAIRS) {
-    const value = formattedLine[timeColumnName];
-    if (value) {
-      const [seconds, date] = calculateAndCacheDate(value);
-      formattedLine[timestampColumnName] = seconds;
-      formattedLine[timeColumnName] = date;
-    }
-  }
   return formattedLine;
 };
 var BATCH_SIZE = 1e5;
@@ -3780,11 +3702,23 @@ var importGtfsFiles = (db, task) => mapSeries2(
       return;
     }
     task.log(`Importing - ${filename}\r`);
-    const placeholder = model.schema.map(({ name }) => `@${name}`).join(", ");
+    const columns = model.schema.flatMap((column) => {
+      if (column.type === "time") {
+        return [
+          column,
+          {
+            name: getTimestampColumnName(column.name),
+            type: "integer",
+            index: true
+          }
+        ];
+      }
+      return column;
+    });
     const prefixedColumns = new Set(
-      model.schema.filter((column) => column.prefix).map((column) => column.name)
+      columns.filter((column) => column.prefix).map((column) => column.name)
     );
-    const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${model.schema.map((column) => column.name).join(", ")}) VALUES (${placeholder})`;
+    const prepareStatement = `INSERT ${task.ignoreDuplicates ? "OR IGNORE" : ""} INTO ${model.filenameBase} (${columns.map(({ name }) => name).join(", ")}) VALUES (${columns.map(({ name }) => `@${name}`).join(", ")})`;
     const insert = db.prepare(prepareStatement);
     const insertLines = db.transaction((lines) => {
       for (const [rowNumber, line] of Object.entries(lines)) {
@@ -3804,7 +3738,7 @@ var importGtfsFiles = (db, task) => mapSeries2(
           }
         } catch (error) {
           if (error.code === "SQLITE_CONSTRAINT_PRIMARYKEY") {
-            const primaryColumns = model.schema.filter(
+            const primaryColumns = columns.filter(
               (column) => column.primary
             );
             task.logWarning(