gtfs 4.17.1 → 4.17.3

package/dist/bin/gtfs-import.js

@@ -1059,7 +1059,6 @@ var riderCategories = {
     {
       name: "is_default_fare_category",
       type: "integer",
-      required: true,
       min: 0,
       max: 1
     },
@@ -3354,16 +3353,6 @@ function convertLongTimeToDate(longDate) {
     Long.fromBits(low, high, unsigned).toNumber() * 1e3
   ).toISOString();
 }
-function calculateSecondsFromMidnight(time) {
-  if (!time || typeof time !== "string") {
-    return null;
-  }
-  const [hours, minutes, seconds] = time.split(":").map(Number);
-  if ([hours, minutes, seconds].some(isNaN) || minutes >= 60 || seconds >= 60) {
-    return null;
-  }
-  return hours * 3600 + minutes * 60 + seconds;
-}
 function padLeadingZeros(time) {
   const split = time.split(":").map((d) => String(Number(d)).padStart(2, "0"));
   if (split.length !== 3) {
@@ -3588,18 +3577,6 @@ async function updateGtfsRealtimeData(task) {
 }
 
 // src/lib/import-gtfs.ts
-var timeCache = {};
-var formatAndCacheTime = (value) => {
-  const cached = timeCache[value];
-  if (cached !== void 0) {
-    return cached;
-  }
-  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");
@@ -3711,7 +3688,16 @@ var createGtfsTables = (db) => {
       );
       if (column.type === "time") {
         sqlColumnCreateStatements.push(
-          `${getTimestampColumnName(column.name)} INTEGER`
+          `${getTimestampColumnName(column.name)} INTEGER GENERATED ALWAYS AS (
+            CASE 
+              WHEN ${column.name} IS NULL OR ${column.name} = '' THEN NULL 
+              ELSE CAST(
+                substr(${column.name}, 1, instr(${column.name}, ':') - 1) * 3600 + 
+                substr(${column.name}, instr(${column.name}, ':') + 1, 2) * 60 + 
+                substr(${column.name}, -2) AS INTEGER
+              )
+            END
+          ) STORED`
         );
       }
     }
@@ -3756,9 +3742,6 @@ var formatGtfsLine = (line, model, totalLineCount) => {
     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}.`
@@ -3774,9 +3757,7 @@ var formatGtfsLine = (line, model, totalLineCount) => {
         );
       }
     } else if (type === "time") {
-      const [timeAsSecondsFromMidnight, timeAsString] = formatAndCacheTime(value);
-      value = timeAsString;
-      formattedLine[getTimestampColumnName(name)] = timeAsSecondsFromMidnight ?? null;
+      value = padLeadingZeros(value);
     }
     if (type === "json") {
       value = JSON.stringify(value);
@@ -3809,19 +3790,7 @@ var importGtfsFiles = (db, task) => mapSeries2(
       return;
     }
     task.log(`Importing - ${filename}\r`);
-    const columns = model.schema.flatMap((column) => {
-      if (column.type === "time") {
-        return [
-          column,
-          {
-            name: getTimestampColumnName(column.name),
-            type: "integer",
-            index: true
-          }
-        ];
-      }
-      return column;
-    });
+    const columns = model.schema;
     const prefixedColumns = new Set(
       columns.filter((column) => column.prefix).map((column) => column.name)
     );