gtfs-to-html 2.11.5 → 2.12.1

package/views/default/js/timetable-menu.js

@@ -1,62 +1,86 @@
-/* global jQuery */
-/* eslint no-unused-vars: "off" */
+/* global toggleMap */
 
 function showSelectedTimetable() {
-  if (jQuery('.timetable').length === 1) {
-    showTimetable(jQuery('.timetable').data('timetable-id'));
-    return false;
+  const timetables = document.querySelectorAll('.timetable');
+
+  if (timetables.length === 1) {
+    showTimetable(timetables[0].dataset.timetableId);
+    return;
   }
 
-  jQuery('#day_list_selector input[name="dayList"]').each((index, element) => {
-    jQuery(element)
-      .parents('label')
-      .toggleClass('btn-blue', jQuery(element).is(':checked'));
-    jQuery(element)
-      .parents('label')
-      .toggleClass('btn-gray', jQuery(element).is(':not(:checked)'));
-  });
+  document
+    .querySelectorAll('#day_list_selector input[name="dayList"]')
+    .forEach((element) => {
+      const label = element.closest('label');
+      if (label) {
+        label.classList.toggle('btn-active', element.checked);
+        label.classList.toggle('btn-inactive', !element.checked);
+      }
+    });
 
-  jQuery('#direction_name_selector input[name="directionId"]').each(
-    (index, element) => {
-      jQuery(element)
-        .parents('label')
-        .toggleClass('btn-blue', jQuery(element).is(':checked'));
-      jQuery(element)
-        .parents('label')
-        .toggleClass('btn-gray', jQuery(element).is(':not(:checked)'));
-    },
-  );
+  document
+    .querySelectorAll('#direction_name_selector input[name="directionId"]')
+    .forEach((element) => {
+      const label = element.closest('label');
+      if (label) {
+        label.classList.toggle('btn-active', element.checked);
+        label.classList.toggle('btn-inactive', !element.checked);
+      }
+    });
 
-  const dayList = jQuery(
+  const dayListInput = document.querySelector(
     '#day_list_selector input[name="dayList"]:checked',
-  ).val();
+  );
+  const dayList = dayListInput ? dayListInput.value : null;
 
-  const directionId = jQuery(
+  const directionIdInput = document.querySelector(
     '#direction_name_selector input[name="directionId"]:checked',
-  ).val();
+  );
+  const directionId = directionIdInput ? directionIdInput.value : null;
 
-  jQuery('.timetable').hide();
+  timetables.forEach((timetable) => {
+    timetable.style.display = 'none';
+  });
 
-  const id = jQuery(
+  const selectedTimetable = document.querySelector(
     `.timetable[data-day-list="${dayList}"][data-direction-id="${directionId}"]`,
-  ).data('timetable-id');
+  );
 
-  showTimetable(id);
+  if (selectedTimetable) {
+    const id = selectedTimetable.dataset.timetableId;
+    showTimetable(id);
+  }
 }
 
 function showTimetable(id) {
-  jQuery(`#timetable_id_${id}`).show();
-  toggleMap(id);
+  const timetable = document.querySelector(
+    `.timetable[data-timetable-id="${id}"]`,
+  );
+  if (timetable) {
+    timetable.style.display = 'block';
+  }
+  // Check if toggleMap is defined
+  if (typeof toggleMap === 'function') {
+    toggleMap(id);
+  }
 }
 
-jQuery(() => {
+document.addEventListener('DOMContentLoaded', () => {
   showSelectedTimetable();
 
-  jQuery('#day_list_selector input[name="dayList"]').change(() => {
-    showSelectedTimetable();
-  });
+  document
+    .querySelectorAll('#day_list_selector input[name="dayList"]')
+    .forEach((input) => {
+      input.addEventListener('change', () => {
+        showSelectedTimetable();
+      });
+    });
 
-  jQuery('#direction_name_selector input[name="directionId"]').change(() => {
-    showSelectedTimetable();
-  });
+  document
+    .querySelectorAll('#direction_name_selector input[name="directionId"]')
+    .forEach((input) => {
+      input.addEventListener('change', () => {
+        showSelectedTimetable();
+      });
+    });
 });

package/views/default/overview.pug

@@ -10,7 +10,7 @@ include formatting_functions.pug
         each timetablePage in sortTimetablePages(timetablePageGroup.timetablePages)
           if config.allowEmptyTimetables || timetablePage.consolidatedTimetables.length > 0
             - const timetableRoutes = _.uniqBy(_.flatMap(timetablePage.consolidatedTimetables, timetable => timetable.routes), 'route_id')
-            a.timetable-page-link(href=`${timetablePage.relativePath}` data-route-ids=`${timetableRoutes.map((route) => route.route_id).join(',')}`)
+            a.timetable-page-link(href=timetablePage.relativePath data-route-ids=timetableRoutes.map((route) => route.route_id).join(','))
               each route in timetableRoutes
                 .route-color-swatch-large(style=`background-color: ${formatRouteColor(route)}; color: ${formatRouteTextColor(route)};`)= route.route_short_name || ''
               div

package/views/default/overview_full.pug

@@ -4,13 +4,11 @@ block content
 
 block extraHeader
   if config.showMap
-    script(src="https://unpkg.com/jquery@3.7.1/dist/jquery.min.js" crossorigin="anonymous")
-    script(src="https://unpkg.com/lodash@4.17.21/lodash.min.js" crossorigin="anonymous")
-    script(src="https://unpkg.com/maplibre-gl@^5.7.0/dist/maplibre-gl.js")
-    script(src="https://unpkg.com/@maplibre/maplibre-gl-geocoder@1.9.0/dist/maplibre-gl-geocoder.js")
+    script(src=`${config.assetPath}js/maplibre-gl.js`)
+    script(src=`${config.assetPath}js/maplibre-gl-geocoder.js`)
     script(src=`${config.assetPath}js/system-map.js`)
 
-    link(href="https://unpkg.com/maplibre-gl@^5.7.0/dist/maplibre-gl.css" rel="stylesheet")
-    link(href="https://unpkg.com/@maplibre/maplibre-gl-geocoder@1.9.0/dist/maplibre-gl-geocoder.css" rel="stylesheet")
+    link(href=`${config.assetPath}css/maplibre-gl.css` rel="stylesheet")
+    link(href=`${config.assetPath}css/maplibre-gl-geocoder.css` rel="stylesheet")
 
   link(rel="stylesheet" href=`${config.assetPath}css/overview_styles.css`)

package/views/default/timetable_continuation_as.pug

@@ -2,6 +2,6 @@
 td.run-footer(style=routeColorCss)
   if trip.continues_as_route
     if trip.continues_as_route.route.route_url
-      a.continues-as-route(href=`${trip.continues_as_route.route.route_url}` style=routeColorCss data-trip-id=trip.continues_as_route.trip_id)= trip.continues_as_route.route.route_short_name
+      a.continues-as-route(href=trip.continues_as_route.route.route_url style=routeColorCss data-trip-id=trip.continues_as_route.trip_id)= trip.continues_as_route.route.route_short_name
     else
       .continues-as-route(data-trip-id=trip.continues_as_route.trip_id)= trip.continues_as_route.route.route_short_name

package/views/default/timetable_continuation_from.pug

@@ -2,6 +2,6 @@
 td.run-footer(style=routeColorCss)
   if trip.continues_from_route
     if trip.continues_from_route.route.route_url
-      a.continues-from-route(href=`${trip.continues_from_route.route.route_url}` style=routeColorCss data-trip-id=trip.continues_from_route.trip_id)= trip.continues_from_route.route.route_short_name
+      a.continues-from-route(href=trip.continues_from_route.route.route_url style=routeColorCss data-trip-id=trip.continues_from_route.trip_id)= trip.continues_from_route.route.route_short_name
     else
       .continues-from-route(data-trip-id=trip.continues_from_route.trip_id)= trip.continues_from_route.route.route_short_name

package/views/default/timetable_horizontal.pug

@@ -4,7 +4,7 @@
     colgroup
       col
       each trip, idx in timetable.orderedTrips
-        col(id=`trip_id_${formatHtmlId(trip.trip_id)}` class=`run_${idx} ${(trip.trip_short_name) ? 'trip_short_name_' + trip.trip_short_name : ''}`)
+        col(class=`run_${idx} ${(trip.trip_short_name) ? 'trip_short_name_' + trip.trip_short_name : ''}` data-trip-id=trip.trip_id)
     thead
       tr
         th.stop-header(scope="col") Stop
@@ -29,7 +29,7 @@
             th(scope="row" colspan=`${stop.trips.length + 1}`)= stop.stop_city
           - previousCity = stop.stop_city
 
-        tr.stop-row(id=`stop_id_${formatHtmlId(stop.stop_id)}` data-stop-id=`${stop.stop_id}` data-is-timepoint=`${stop.is_timepoint}`)
+        tr.stop-row(data-stop-id=stop.stop_id data-is-timepoint=stop.is_timepoint.toString())
           th.stop-name-container(scope="row")
             include timetable_stop_name.pug
 

package/views/default/timetable_hourly.pug

@@ -17,7 +17,7 @@
             th(scope="row" colspan="2")= stop.stop_city
         - previousCity = stop.stop_city
 
-        tr.stop-row(id=`stop_id_${formatHtmlId(stop.stop_id)}` data-stop-id=`${stop.stop_id}`)
+        tr.stop-row(data-stop-id=stop.stop_id)
           th.stop-name-container(scope="row")
             include timetable_stop_name.pug
 

package/views/default/timetable_map.pug

@@ -1,5 +1,5 @@
 .map-container
-  .map(id=`map_timetable_id_${formatHtmlId(timetable.timetable_id)}`)
+  .map(data-timetable-id=timetable.timetable_id)
   .map-legend
     .legend-item
       .legend-icon

package/views/default/timetable_menu.pug

@@ -5,7 +5,7 @@ if timetablePage.consolidatedTimetables.length > 1
       - const showDayList = timetablePageHasDifferentDays(timetablePage);
       each timetable in timetablePage.consolidatedTimetables
         li
-          a(href=`#timetable_id_${formatHtmlId(timetable.timetable_id)}`)
+          a(href=`#${cssEscape(`timetable_id_${timetable.timetable_id}`)}`)
             if showTimetableLabel
               span= timetable.timetable_label
             if showTimetableLabel && showDayList
@@ -27,7 +27,7 @@ if timetablePage.consolidatedTimetables.length > 1
         div
           h3= dayList
           each timetable in group
-            a.btn-blue(href=`#timetable_id_${formatHtmlId(timetable.timetable_id)}`)= timetable.timetable_label
+            a.btn-active(href=`#${cssEscape(`timetable_id_${timetable.timetable_id}`)}`)= timetable.timetable_label
 
   if config.menuType === 'radio'
     .timetable-radio-menu
@@ -36,13 +36,13 @@ if timetablePage.consolidatedTimetables.length > 1
         #direction_name_selector
           h3 Service Direction
           each timetable, idx in uniqueDirectionTimetables
-            label(class=idx === 0 ? 'btn-blue' : 'btn-gray')
+            label(class=idx === 0 ? 'btn-active' : 'btn-inactive')
               input.hidden(type="radio" name="directionId" autocomplete="off" value=timetable.direction_id checked=(idx === 0))
               span= timetable.direction_name || timetable.timetable_label
       div(hidden=timetablePage.dayLists.length <= 1)
         #day_list_selector
           h3 Day of Week
           each dayList, idx in timetablePage.dayLists
-            label(class=idx === 0 ? 'btn-blue' : 'btn-gray')
+            label(class=idx === 0 ? 'btn-active' : 'btn-inactive')
               input.hidden(type="radio" name="dayList" autocomplete="off" value=dayList checked=(idx === 0))
               span= dayList

package/views/default/timetable_note_symbol.pug

@@ -1,4 +1,4 @@
-a(href=`#note-${timetable.timetable_id}-${note.note_id}` class=`timetable-note-${note.note_id}`).symbol
+a(href=`#${cssEscape(`note-${timetable.timetable_id}-${note.note_id}`)}` data-note-id=note.note_id).symbol
   if timetable.routes.length <= 1 && timetable.orientation === 'vertical'
     span= note.symbol
   else

package/views/default/timetable_stop_name.pug

@@ -1,7 +1,7 @@
 - const stopName = `${stop.stop_name}${stop.type === 'arrival' ? ' (Arrival)' : stop.type === 'departure' ? ' (Departure)' : ''}`;
 
 if config.linkStopUrls && stop.stop_url
-  a.stop-name(href=`${stop.stop_url}`)= stopName
+  a.stop-name(href=stop.stop_url)= stopName
     each note in getNotesForStop(timetable.notes, stop)
       include timetable_note_symbol.pug
 else

package/views/default/timetable_stoptime.pug

@@ -1,17 +1,17 @@
-td.stop-time(class=`${stoptime.classes.join(' ')}`)
+td.stop-time(class=stoptime.classes.join(' '))
   if config.showStoptimesForRequestStops || (!stoptime.requestDropoff && !stoptime.requestPickup)
     span.stop-time-text!= stoptime.formatted_time
   if stoptime.skipped && timetable.noServiceSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-no-service`).symbol= timetable.noServiceSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-no-service`)}`).symbol= timetable.noServiceSymbol
   if stoptime.interpolated && timetable.interpolatedStopSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-interpolated-stop`).symbol= timetable.interpolatedStopSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-interpolated-stop`)}`).symbol= timetable.interpolatedStopSymbol
   if stoptime.requestPickup && timetable.requestPickupSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-request-pickup`).symbol= timetable.requestPickupSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-request-pickup`)}`).symbol= timetable.requestPickupSymbol
   if stoptime.noPickup && timetable.noPickupSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-no-pickup`).symbol= timetable.noPickupSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-no-pickup`)}`).symbol= timetable.noPickupSymbol
   if stoptime.requestDropoff && timetable.requestDropoffSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-request-dropoff`).symbol= timetable.requestDropoffSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-request-dropoff`)}`).symbol= timetable.requestDropoffSymbol
   if stoptime.noDropoff && timetable.noDropoffSymbol !== null
-    a(href=`#note-${timetable.timetable_id}-no-dropoff`).symbol= timetable.noDropoffSymbol
+    a(href=`#${cssEscape(`note-${timetable.timetable_id}-no-dropoff`)}`).symbol= timetable.noDropoffSymbol
   each note in getNotesForStoptime(timetable.notes, stoptime)
     include timetable_note_symbol.pug

package/views/default/timetable_vertical.pug

@@ -15,7 +15,7 @@
       if timetable.has_continues_from_route
         col
       each stop, idx in timetable.stops
-        col(id=`stop_id_${formatHtmlId(stop.stop_id)}` class=`stop-${idx}` data-stop-id=`${stop.stop_id}` data-is-timepoint=`${stop.is_timepoint}`)
+        col(class=`stop-${idx}` data-stop-id=stop.stop_id data-is-timepoint=stop.is_timepoint.toString())
       if timetable.has_continues_as_route
         col
     thead
@@ -45,12 +45,12 @@
           if timetable.has_continues_from_route
             td
 
-          td.trip-frequency(colspan=`${columnCount}`)!= formatFrequencyWarning(timetable.frequencies)
+          td.trip-frequency(colspan=columnCount)!= formatFrequencyWarning(timetable.frequencies)
             
           if timetable.has_continues_as_route
             td
       each trip, idx in timetable.orderedTrips
-        tr.trip-row(id=`trip_id_${formatHtmlId(trip.trip_id)}`)
+        tr.trip-row(data-trip-id=trip.trip_id)
           if timetableHasTripNotes || timetable.routes.length > 1
             td.trip-notes
               .trip-name= formatTripName(trip, idx, timetable)

package/views/default/timetablepage.pug

@@ -21,7 +21,7 @@ include formatting_functions.pug
           | There are no service alerts at this time.
 
   each timetable in timetablePage.consolidatedTimetables
-    .timetable(id=`timetable_id_${formatHtmlId(timetable.timetable_id)}` data-day-list=timetable.dayList data-direction-name=timetable.direction_name || timetable.timetable_label data-timetable-id=`${formatHtmlId(timetable.timetable_id)}` data-direction-id=timetable.direction_id data-route-id=timetable.route_ids.join('_'))
+    .timetable(id=cssEscape(`timetable_id_${timetable.timetable_id}`) data-day-list=timetable.dayList data-direction-name=timetable.direction_name || timetable.timetable_label data-timetable-id=timetable.timetable_id data-direction-id=timetable.direction_id data-route-id=timetable.route_ids.join('_'))
       if config.showRouteTitle
         .timetable-label
           h2= `${timetable.timetable_label} | ${timetable.dayListLong}`
@@ -43,19 +43,19 @@ include formatting_functions.pug
         if hasNotesOrNotices(timetable)
           .notes
             if timetable.requestPickupSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-request-pickup`)= `${config.requestPickupSymbol} = ${config.requestPickupText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-request-pickup`))= `${config.requestPickupSymbol} = ${config.requestPickupText}`
             if timetable.noPickupSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-no-pickup`)= `${config.noPickupSymbol} = ${config.noPickupText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-no-pickup`))= `${config.noPickupSymbol} = ${config.noPickupText}`
             if timetable.requestDropoffSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-request-dropoff`)= `${config.requestDropoffSymbol} = ${config.requestDropoffText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-request-dropoff`))= `${config.requestDropoffSymbol} = ${config.requestDropoffText}`
             if timetable.noDropoffSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-no-dropoff`)= `${config.noDropoffSymbol} = ${config.noDropoffText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-no-dropoff`))= `${config.noDropoffSymbol} = ${config.noDropoffText}`
             if timetable.noServiceSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-no-service`)= `${config.noServiceSymbol} = ${config.noServiceText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-no-service`))= `${config.noServiceSymbol} = ${config.noServiceText}`
             if timetable.interpolatedStopSymbolUsed
-              .note(id=`note-${timetable.timetable_id}-interpolated-stop`)= `${config.interpolatedStopSymbol} = ${config.interpolatedStopText}`
+              .note(id=cssEscape(`note-${timetable.timetable_id}-interpolated-stop`))= `${config.interpolatedStopSymbol} = ${config.interpolatedStopText}`
             each note in _.uniqBy(timetable.notes, 'note_id')
-              .note(id=`note-${timetable.timetable_id}-${note.note_id}`)
+              .note(id=cssEscape(`note-${timetable.timetable_id}-${note.note_id}`))
                 span= note.symbol 
                 span  = 
                 span!= md(note.note)

package/views/default/timetablepage_full.pug

@@ -3,8 +3,6 @@ block content
   include timetablepage.pug
 
 block extraHeader
-  script(src="https://unpkg.com/jquery@3.7.1/dist/jquery.min.js" crossorigin="anonymous")
-
   if config.menuType === 'radio'
     script(src=`${config.assetPath}js/timetable-menu.js`)
 
@@ -13,8 +11,8 @@ block extraHeader
     script(src=`${config.assetPath}js/gtfs-realtime.browser.proto.js`)
 
   if config.showMap
-    link(href="https://unpkg.com/maplibre-gl@^5.7.0/dist/maplibre-gl.css" rel="stylesheet")
-    script(src="https://unpkg.com/maplibre-gl@^5.7.0/dist/maplibre-gl.js")
+    link(href=`${config.assetPath}css/maplibre-gl.css` rel="stylesheet")
+    script(src=`${config.assetPath}js/maplibre-gl.js`)
     script(src=`${config.assetPath}js/timetable-map.js`)
 
   if config.hasGtfsRealtimeAlerts