gtfs 4.13.1 → 4.13.3

package/dist/index.js

@@ -255,7 +255,7 @@ var model5 = {
     },
     {
       name: "date",
-      type: "integer",
+      type: "date",
       required: true,
       primary: true
     },
@@ -339,13 +339,13 @@ var model6 = {
     },
     {
       name: "start_date",
-      type: "integer",
+      type: "date",
       required: true,
       index: true
     },
     {
       name: "end_date",
-      type: "integer",
+      type: "date",
       required: true,
       index: true
     }
@@ -641,11 +641,11 @@ var model13 = {
     },
     {
       name: "feed_start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "feed_version",
@@ -1498,11 +1498,11 @@ var model31 = {
     },
     {
       name: "start_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "end_date",
-      type: "integer"
+      type: "date"
     },
     {
       name: "monday",
@@ -2007,7 +2007,7 @@ var model41 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2089,7 +2089,7 @@ var model42 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2173,12 +2173,12 @@ var model43 = {
     },
     {
       name: "ridership_start_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "ridership_end_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2301,7 +2301,7 @@ var model44 = {
     },
     {
       name: "service_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -2348,17 +2348,17 @@ var model45 = {
     },
     {
       name: "ride_start_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "ride_end_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
       name: "gtfs_feed_date",
-      type: "integer",
+      type: "date",
       index: true
     },
     {
@@ -3313,11 +3313,17 @@ function formatHexColor(color) {
   return `#${color}`;
 }
 function formatProperties(properties) {
-  const formattedProperties = {
-    ...cloneDeep(omitBy(properties, (value) => value === null)),
-    route_color: formatHexColor(properties.route_color),
-    route_text_color: formatHexColor(properties.route_text_color)
-  };
+  const formattedProperties = cloneDeep(
+    omitBy(properties, (value) => value === null || value === void 0)
+  );
+  const formattedRouteColor = formatHexColor(properties.route_color);
+  const formattedRouteTextColor = formatHexColor(properties.route_text_color);
+  if (formattedRouteColor) {
+    formattedProperties.route_color = formattedRouteColor;
+  }
+  if (formattedRouteTextColor) {
+    formattedProperties.route_text_color = formattedRouteTextColor;
+  }
   if (properties.routes) {
     formattedProperties.routes = properties.routes.map(
       (route) => formatProperties(route)
@@ -3325,22 +3331,20 @@ function formatProperties(properties) {
   }
   return formattedProperties;
 }
-function shapesToGeoJSONFeatures(shapes, properties = {}) {
+function shapesToGeoJSONFeature(shapes, properties = {}) {
   const shapeGroups = Object.values(groupBy(shapes, "shape_id")).map(
     (shapeGroup) => sortBy(shapeGroup, "shape_pt_sequence")
   );
   const lineStrings = consolidateShapes(shapeGroups);
-  return lineStrings.map(
-    (lineString) => feature(
-      {
-        type: "LineString",
-        coordinates: lineString
-      },
-      formatProperties(properties)
-    )
+  return feature(
+    {
+      type: "MultiLineString",
+      coordinates: lineStrings
+    },
+    formatProperties(properties)
   );
 }
-function stopsToGeoJSON(stops) {
+function stopsToGeoJSONFeatureCollection(stops) {
   const features = stops.map(
     (stop) => feature(
       {
@@ -3825,7 +3829,17 @@ var formatLine = (line, model56, totalLineCount) => {
   const formattedLine = {};
   for (const columnSchema of model56.schema) {
     const lineValue = line[columnSchema.name];
-    if (columnSchema.type === "integer") {
+    if (columnSchema.type === "date") {
+      if (lineValue !== "" && lineValue !== void 0) {
+        const dateValue = lineValue.replace(/-/g, "");
+        if (dateValue.length !== 8) {
+          throw new Error(
+            `Invalid date in ${model56.filenameBase}.${model56.filenameExtension} for ${columnSchema.name} on line ${lineNumber}.`
+          );
+        }
+        formattedLine[columnSchema.name] = Number.parseInt(dateValue, 10);
+      }
+    } else if (columnSchema.type === "integer") {
       formattedLine[columnSchema.name] = Number.parseInt(lineValue, 10);
     } else if (columnSchema.type === "real") {
       formattedLine[columnSchema.name] = Number.parseFloat(lineValue);
@@ -4591,7 +4605,7 @@ function getRoutes(query = {}, fields = [], orderBy2 = [], options = {}) {
 }
 
 // src/lib/gtfs/shapes.ts
-import { omit as omit4, pick as pick2 } from "lodash-es";
+import { compact as compact2, omit as omit4, pick as pick2 } from "lodash-es";
 import sqlString28 from "sqlstring-sqlite";
 import { featureCollection as featureCollection2 } from "@turf/helpers";
 
@@ -4643,35 +4657,39 @@ function getShapesAsGeoJSON(query = {}, options = {}) {
   const agencies = getAgencies2({}, [], [], options);
   const routeQuery = pick2(query, ["route_id"]);
   const routes = getRoutes(routeQuery, [], [], options);
-  const features = [];
-  for (const route of routes) {
-    const shapeQuery = {
-      route_id: route.route_id,
-      ...omit4(query, "route_id")
-    };
-    const shapes = getShapes(
-      shapeQuery,
-      ["shape_id", "shape_pt_sequence", "shape_pt_lon", "shape_pt_lat"],
-      [],
-      options
-    );
-    const routeAttributes = getRouteAttributes(
-      { route_id: route.route_id },
-      [],
-      [],
-      options
-    );
-    const agency = agencies.find(
-      (agency2) => agency2.agency_id === route.agency_id
-    );
-    const geojsonProperties = {
-      agency_name: agency ? agency.agency_name : void 0,
-      shape_id: query.shape_id,
-      ...route,
-      ...routeAttributes?.[0] || []
-    };
-    features.push(...shapesToGeoJSONFeatures(shapes, geojsonProperties));
-  }
+  const features = compact2(
+    routes.map((route) => {
+      const shapeQuery = {
+        route_id: route.route_id,
+        ...omit4(query, "route_id")
+      };
+      const shapes = getShapes(
+        shapeQuery,
+        ["shape_id", "shape_pt_sequence", "shape_pt_lon", "shape_pt_lat"],
+        [],
+        options
+      );
+      if (shapes.length === 0) {
+        return;
+      }
+      const routeAttributes = getRouteAttributes(
+        { route_id: route.route_id },
+        [],
+        [],
+        options
+      );
+      const agency = agencies.find(
+        (agency2) => agency2.agency_id === route.agency_id
+      );
+      const geojsonProperties = {
+        agency_name: agency ? agency.agency_name : void 0,
+        shape_id: query.shape_id,
+        ...route,
+        ...routeAttributes?.[0] || []
+      };
+      return shapesToGeoJSONFeature(shapes, geojsonProperties);
+    })
+  );
   return featureCollection2(features);
 }
 
@@ -4780,7 +4798,7 @@ function getStopsAsGeoJSON(query = {}, options = {}) {
     };
   });
   const filteredStops = preparedStops.filter((stop) => stop.routes.length > 0);
-  return stopsToGeoJSON(filteredStops);
+  return stopsToGeoJSONFeatureCollection(filteredStops);
 }
 
 // src/lib/gtfs/stop-times.ts