version bump

Use gtfs 0.10.0

Author: brendannee

lib/formatters.js

@@ -12,6 +12,10 @@ function parseTime(timeStr) {
   return moment(timeStr, 'HH:mm:ss');
 }
 
+exports.msToSeconds = ms => {
+  return Math.round(ms / 1000);
+};
+
 exports.formatDate = date => {
   if (date.holiday_name) {
     return date.holiday_name;
@@ -31,8 +35,7 @@ exports.formatStopTime = (stoptime, timetable, config) => {
     stoptime = {
       classes: ['skipped'],
       arrival_formatted_time: config.noServiceSymbol,
-      departure_formatted_time: config.noServiceSymbol,
-
+      departure_formatted_time: config.noServiceSymbol
     };
     timetable.noServiceSymbolUsed = true;
   }

lib/gtfs-to-html.js

@@ -7,14 +7,18 @@ const sanitize = require('sanitize-filename');
 const Table = require('cli-table');
 const Timer = require('timer-machine');
 
-const fileUtils = require('../lib/file-utils');
-const utils = require('../lib/utils');
+const fileUtils = require('./file-utils');
+const formatters = require('./formatters');
+const utils = require('./utils');
 
 module.exports = selectedConfig => {
   const config = utils.setDefaultConfig(selectedConfig);
-
   const log = (config.verbose === false) ? _.noop : console.log;
 
+  if (!config.agencies || config.agencies.length === 0) {
+    throw new Error('No agencies defined in `config.json`');
+  }
+
   return Promise.all(config.agencies.map(agency => {
     const timer = new Timer();
     const agencyKey = agency.agency_key;
@@ -33,20 +37,17 @@ module.exports = selectedConfig => {
 
     log(`Generating HTML schedules for ${agencyKey}`);
 
-    return new Promise((resolve, reject) => {
+    return new Promise(resolve => {
       if (config.skipImport) {
         return resolve();
       }
 
       // Import GTFS
       const agencyConfig = _.clone(_.omit(config, 'agencies'));
       agencyConfig.agencies = [agency];
-      gtfs.import(agencyConfig, err => {
-        if (err) {
-          return reject(err);
-        }
-        resolve();
-      });
+
+      gtfs.import(agencyConfig)
+      .then(resolve);
     })
     .then(() => fileUtils.prepDirectory(exportPath, assetPath))
     .then(() => utils.getTimetablePages(agencyKey))
@@ -104,7 +105,7 @@ module.exports = selectedConfig => {
       );
 
       log(table.toString());
-      log(`Timetable generation required ${Math.round(timer.time() / 1000)} seconds`);
+      log(`Timetable generation required ${formatters.msToSeconds(timer.time())} seconds`);
     });
   }));
 };

lib/utils.js

@@ -47,7 +47,7 @@ function sortTrips(trips) {
   return _.sortBy(trips, trip => {
     let selectedStoptime;
     if (commonStoptime) {
-      selectedStoptime =  _.find(trip.stoptimes, {stop_id: commonStoptime.stop_id});
+      selectedStoptime = _.find(trip.stoptimes, {stop_id: commonStoptime.stop_id});
     } else {
       selectedStoptime = trip.stoptimes[0];
     }
@@ -96,7 +96,7 @@ function processStops(agencyKey, timetable, config) {
 
     let stopSequence = 0;
     timetable.stops.forEach(stop => {
-      // find a stoptime for the matching stop_id greater than the last stop_sequence
+      // Find a stoptime for the matching stop_id greater than the last stop_sequence
       const stoptime = _.find(trip.stoptimes, st => st.stop_id === stop.stop_id && st.stop_sequence >= stopSequence);
       if (stoptime) {
         stopSequence = stoptime.stop_sequence;
@@ -248,7 +248,7 @@ function getStops(timetableStopOrders, stoptimes) {
 
   // Convert stops to array of object
   const stops = stopIds.map((stopId, idx) => {
-    let stop = {
+    const stop = {
       stop_id: stopId,
       trips: []
     };
@@ -303,7 +303,7 @@ function formatTimetablePage(agencyKey, timetablePage) {
   return gtfs.getRoutesById(agencyKey, timetablePage.timetables[0].route_id)
   .then(route => {
     if (!route) {
-      throw new Error(`No route found for route_id=${timetable.route_id}, timetable_id=${timetable.timetable_id}`);
+      throw new Error(`No route found for route_id=${timetablePage.timetables[0].route_id}, timetable_id=${timetablePage.timetables[0].timetable_id}`);
     }
 
     timetablePage.timetable_page_label = `${route.route_short_name} ${route.route_long_name}`;
@@ -544,7 +544,7 @@ exports.getTimetablePages = agencyKey => {
       } else if (!timetablePages || timetablePages.length === 0) {
         // If no timetablepages, use timetables
         return Promise.all(timetables.map(timetable => {
-          return convertTimetableToTimetablePage(agencyKey, timetable)
+          return convertTimetableToTimetablePage(agencyKey, timetable);
         }));
       }