fix(utils/viewer): Format time with timezone suffix.

opentripplanner · Dec 22, 2020 · 8ebacce · 8ebacce
1 parent edd5a4b
commit 8ebacce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/components/viewers/stop-schedule-table.js b/lib/components/viewers/stop-schedule-table.js
@@ -38,6 +38,9 @@ const TimeCell = styled.td`
   text-align: right;
   white-space: nowrap;
 `
+const TimeHeader = styled.th`
+  text-align: right;
+`
 
 /**
  * Table showing scheduled departure times for the specified stop organized
@@ -85,7 +88,7 @@ class StopScheduleTable extends Component {
             <th>Block</th>
             <th>Route</th>
             <th>To</th>
-            <th>Departure</th>
+            <TimeHeader>Departure</TimeHeader>
           </tr>
         </thead>
         <tbody>

diff --git a/lib/util/viewer.js b/lib/util/viewer.js
@@ -1,11 +1,12 @@
+import moment from 'moment'
+import 'moment-timezone'
 import coreUtils from '@opentripplanner/core-utils'
 import React from 'react'
 
 import { isBlank } from './ui'
 
 const {
   formatDuration,
-  formatSecondsAfterMidnight,
   getUserTimezone
 } = coreUtils.time
 
@@ -221,5 +222,10 @@ export function formatDepartureTime (departureTime, timeFormat, homeTimezone) {
   const inHomeTimezone = homeTimezone && homeTimezone === userTimeZone
   const format = inHomeTimezone ? timeFormat : `${timeFormat} z`
 
-  return formatSecondsAfterMidnight(departureTime, format)
+  // FIXME: fix OTP-UI's formatSecondsAfterMidnight method per below.
+  return moment()
+    .tz(homeTimezone)
+    .startOf('day')
+    .seconds(departureTime)
+    .format(format)
 }