WIP fix when no departures

Author: avicarie

src/components/timetable/intervalTimetable.js

@@ -194,7 +194,7 @@ IntervalDisplay.defaultProps = {
   isCompact: false,
 };
 
-const partitionToIntervalAndNonIntervalRoutes = routeIdToModeMap => {
+export const partitionToIntervalAndNonIntervalRoutes = routeIdToModeMap => {
   const intervalRoutes = new Set();
   const normalBusRoutes = new Set();
 

src/components/timetable/timetable.js

@@ -7,7 +7,8 @@ import classNames from 'classnames';
 import TableHeader from './tableHeader';
 import TableRows from './tableRows';
 import SimpleRoutes from './simpleRoutes';
-import IntervalTimetable from './intervalTimetable';
+import IntervalTimetable, { partitionToIntervalAndNonIntervalRoutes } from './intervalTimetable';
+import { trimRouteId } from 'util/domain';
 
 import styles from './timetable.css';
 
@@ -81,6 +82,19 @@ class Timetable extends Component {
     if (!this.props.hasDepartures) {
       return null;
     }
+
+    // Only treat this as an interval timetable if there are actually interval departures.
+    // If intervalTimetable=true but all routes are normal buses, fall back to normal rendering.
+    const intervalRoutes = intervalTimetable
+      ? partitionToIntervalAndNonIntervalRoutes(routeIdToModeMap).intervalRoutes
+      : null;
+    const effectiveInterval =
+      intervalTimetable &&
+      Object.values(combinedDays).some(dayDepartures =>
+        dayDepartures.some(it =>
+          intervalRoutes.has(trimRouteId(it.routeId).replace(/[^0-9]/g, '')),
+        ),
+      );
     const opts = { year: 'numeric', month: 'numeric', day: 'numeric' };
     const today = new Date().toLocaleDateString('fi', opts);
     const address = this.props.addressFi ? ` ${this.props.addressFi},` : '';
@@ -107,7 +121,7 @@ class Timetable extends Component {
           [styles.printable]: this.props.printableAsA4,
           [styles.standalone]: this.props.standalone,
           [styles.greyscale]: this.props.greyscale,
-          [styles.interval]: this.props.intervalTimetable,
+          [styles.interval]: effectiveInterval,
         })}
         ref={ref => {
           this.content = ref;
@@ -144,7 +158,7 @@ class Timetable extends Component {
               {this.props.showPrintButton ? <PrintButton lang={this.props.lang} /> : ''}
             </div>
           )}
-          {this.props.showValidityPeriod && !intervalTimetable && (
+          {this.props.showValidityPeriod && !effectiveInterval && (
             <div
               className={classNames(styles.validity, {
                 [styles.coverPageMargin]: this.props.showCoverPage,
@@ -167,14 +181,14 @@ class Timetable extends Component {
             </div>
           )}
         </div>
-        {this.props.showComponentName && !intervalTimetable && (
+        {this.props.showComponentName && !effectiveInterval && (
           <div className={styles.componentName}>
             <div className={styles.title}>Pysäkkiaikataulu&nbsp;&nbsp;</div>
             <div className={styles.subtitle}>Hållplatstidtabell</div>
             <div className={styles.subtitle}>Stop timetable</div>
           </div>
         )}
-        {intervalTimetable && (
+        {effectiveInterval && (
           <div className={styles.validFrom}>
             Aikataulu alkaen {formatDate(date)} - / Tidtabeller fran {formatDate(date)} -
             /Timetables from {formatDate(date)} -
@@ -218,9 +232,12 @@ class Timetable extends Component {
                 subtitleEn={enTitle}
                 printingAsA4={this.props.printableAsA4}
                 useCompactLayout={this.props.useCompactLayout}
-                intervalTimetable={intervalTimetable}
+                intervalTimetable={effectiveInterval}
               />
-              {intervalTimetable ? (
+              {effectiveInterval &&
+              combinedDays[combinedDay].some(it =>
+                intervalRoutes.has(trimRouteId(it.routeId).replace(/[^0-9]/g, '')),
+              ) ? (
                 <IntervalTimetable
                   combinedDay={combinedDay}
                   routeIdToModeMap={routeIdToModeMap}