gtfs-to-html 2.12.2 → 2.12.3

package/dist/index.js

@@ -61,11 +61,11 @@ function fromGTFSTime(timeString) {
 function toGTFSTime(time) {
   return time.format("HH:mm:ss");
 }
-function calendarToCalendarCode(c) {
-  if (Object.values(c).every((value) => value === null)) {
+function calendarToCalendarCode(calendar) {
+  if (Object.values(calendar).every((value) => value === null)) {
     return "";
   }
-  return `${c.monday}${c.tuesday}${c.wednesday}${c.thursday}${c.friday}${c.saturday}${c.sunday}`;
+  return `${calendar.monday ?? "0"}${calendar.tuesday ?? "0"}${calendar.wednesday ?? "0"}${calendar.thursday ?? "0"}${calendar.friday ?? "0"}${calendar.saturday ?? "0"}${calendar.sunday ?? "0"}`;
 }
 function calendarCodeToCalendar(code) {
   const days2 = [
@@ -83,6 +83,35 @@ function calendarCodeToCalendar(code) {
   }
   return calendar;
 }
+function calendarToDateList(calendar, startDate, endDate) {
+  if (!startDate || !endDate) {
+    return [];
+  }
+  const activeWeekdays = [
+    calendar.monday === 1 ? 1 : null,
+    calendar.tuesday === 1 ? 2 : null,
+    calendar.wednesday === 1 ? 3 : null,
+    calendar.thursday === 1 ? 4 : null,
+    calendar.friday === 1 ? 5 : null,
+    calendar.saturday === 1 ? 6 : null,
+    calendar.sunday === 1 ? 7 : null
+  ].filter((weekday) => weekday !== null);
+  if (activeWeekdays.length === 0) {
+    return [];
+  }
+  const activeWeekdaySet = new Set(activeWeekdays);
+  const dates = /* @__PURE__ */ new Set();
+  const date = moment(startDate.toString(), "YYYYMMDD");
+  const endDateMoment = moment(endDate.toString(), "YYYYMMDD");
+  while (date.isSameOrBefore(endDateMoment)) {
+    const isoWeekday = date.isoWeekday();
+    if (activeWeekdaySet.has(isoWeekday)) {
+      dates.add(parseInt(date.format("YYYYMMDD"), 10));
+    }
+    date.add(1, "day");
+  }
+  return Array.from(dates);
+}
 function secondsAfterMidnight(timeString) {
   return moment.duration(timeString).asSeconds();
 }
@@ -493,7 +522,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.2",
+  version: "2.12.3",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -1251,9 +1280,9 @@ var getCalendarsFromTimetable = (timetable) => {
   }
   return db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
 };
-var getCalendarDatesServiceIds = (startDate, endDate) => {
+var getCalendarDatesForDateRange = (startDate, endDate) => {
   const db = openDb();
-  const whereClauses = ["exception_type = 1"];
+  const whereClauses = [];
   if (endDate) {
     whereClauses.push(`date <= ${sqlString.escape(endDate)}`);
   }
@@ -1261,11 +1290,11 @@ var getCalendarDatesServiceIds = (startDate, endDate) => {
     whereClauses.push(`date >= ${sqlString.escape(startDate)}`);
   }
   const calendarDates = db.prepare(
-    `SELECT DISTINCT service_id FROM calendar_dates WHERE ${whereClauses.join(
+    `SELECT service_id, date, exception_type FROM calendar_dates WHERE ${whereClauses.join(
       " AND "
     )}`
   ).all();
-  return calendarDates.map((calendarDate) => calendarDate.service_id);
+  return calendarDates;
 };
 var getAllStationStopIds = (stopId) => {
   const stops = getStops({
@@ -1476,13 +1505,49 @@ var formatTimetables = (timetables, config) => {
     timetable.warnings = [];
     const dayList = formatDays(timetable, config);
     const calendars = getCalendarsFromTimetable(timetable);
-    let serviceIds = calendars.map((calendar) => calendar.service_id);
+    const serviceIds = /* @__PURE__ */ new Set();
+    for (const calendar of calendars) {
+      serviceIds.add(calendar.service_id);
+    }
     if (timetable.include_exceptions === 1) {
-      const calendarDatesServiceIds = getCalendarDatesServiceIds(
+      const calendarDates = getCalendarDatesForDateRange(
         timetable.start_date,
         timetable.end_date
       );
-      serviceIds = uniq([...serviceIds, ...calendarDatesServiceIds]);
+      const calendarDateGroups = groupBy(calendarDates, "service_id");
+      for (const [serviceId, calendarDateGroup] of Object.entries(
+        calendarDateGroups
+      )) {
+        const calendar = calendars.find(
+          (c) => c.service_id === serviceId
+        );
+        if (calendarDateGroup.some(
+          (calendarDate) => calendarDate.exception_type === 1
+        )) {
+          serviceIds.add(serviceId);
+        }
+        const calendarDateGroupExceptionType2 = calendarDateGroup.filter(
+          (calendarDate) => calendarDate.exception_type === 2
+        );
+        if (timetable.start_date && timetable.end_date && calendar && calendarDateGroupExceptionType2.length > 0) {
+          const datesDuringDateRange = calendarToDateList(
+            calendar,
+            timetable.start_date,
+            timetable.end_date
+          );
+          if (datesDuringDateRange.length === 0) {
+            serviceIds.delete(serviceId);
+          }
+          const everyDateIsExcluded = datesDuringDateRange.every(
+            (dateDuringDateRange) => calendarDateGroupExceptionType2.some(
+              (calendarDate) => calendarDate.date === dateDuringDateRange
+            )
+          );
+          if (everyDateIsExcluded) {
+            serviceIds.delete(serviceId);
+          }
+        }
+      }
     }
     Object.assign(timetable, {
       noServiceSymbolUsed: false,
@@ -1500,7 +1565,7 @@ var formatTimetables = (timetables, config) => {
       noPickupSymbol: config.noPickupSymbol,
       interpolatedStopSymbol: config.interpolatedStopSymbol,
       orientation: timetable.orientation || config.defaultOrientation,
-      service_ids: serviceIds,
+      service_ids: Array.from(serviceIds),
       dayList,
       dayListLong: formatDaysLong(dayList, config)
     });