Skip to content

Commit de1aca9

Browse files
committed
remove all uses of normalizeBuildingSchedule
1 parent a04f88d commit de1aca9

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

source/views/building-hours/building-hours-helpers.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export function getDetailedBuildingStatus(
146146

147147
let dayOfWeek = getDayOfWeek(m)
148148

149-
let schedules = normalizeBuildingSchedule(info)
149+
let schedules = info.schedule || []
150150
if (!schedules.length) {
151151
return [{isActive: false, label: null, status: 'Hours unknown'}]
152152
}
@@ -186,7 +186,7 @@ export function getDetailedBuildingStatus(
186186
export function getShortBuildingStatus(info: BuildingType, m: momentT): string {
187187
let dayOfWeek = getDayOfWeek(m)
188188

189-
let schedules = normalizeBuildingSchedule(info)
189+
let schedules = info.schedule || []
190190
if (!schedules.length) {
191191
return 'Closed'
192192
}
@@ -218,7 +218,7 @@ export function getShortBuildingStatus(info: BuildingType, m: momentT): string {
218218
export function isBuildingOpen(info: BuildingType, m: momentT): boolean {
219219
let dayOfWeek = getDayOfWeek(m)
220220

221-
let schedules = normalizeBuildingSchedule(info)
221+
let schedules = info.schedule || []
222222
if (!schedules.length) {
223223
return false
224224
}
@@ -300,14 +300,3 @@ export function summarizeDays(days: DayOfWeekEnumType[]): string {
300300

301301
return `${start}${end}`
302302
}
303-
304-
export function normalizeBuildingSchedule(
305-
info: BuildingType,
306-
): NamedBuildingScheduleType[] {
307-
let schedules = info.schedule
308-
if (!schedules) {
309-
return []
310-
}
311-
312-
return schedules
313-
}

source/views/building-hours/detail.android.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import ParallaxView from 'react-native-parallax-view'
1313
import moment from 'moment-timezone'
1414
import * as c from '../components/colors'
1515
import {
16-
normalizeBuildingSchedule,
1716
formatBuildingTimes,
1817
summarizeDays,
1918
getShortBuildingStatus,
@@ -116,7 +115,7 @@ export class BuildingHoursDetailView extends React.Component {
116115
? buildingImages[this.props.image]
117116
: transparentPixel
118117
const openStatus = getShortBuildingStatus(this.props, this.state.now)
119-
const schedules = normalizeBuildingSchedule(this.props, this.state.now)
118+
const schedules = this.props.schedule || []
120119
const dayOfWeek = ((this.state.now.format('dd'): any): DayOfWeekEnumType)
121120

122121
const abbr = this.props.abbreviation

source/views/building-hours/detail.ios.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {TableView, Section, Cell} from 'react-native-tableview-simple'
1010
import ParallaxView from 'react-native-parallax-view'
1111
import * as c from '../components/colors'
1212
import {
13-
normalizeBuildingSchedule,
1413
formatBuildingTimes,
1514
summarizeDays,
1615
getShortBuildingStatus,
@@ -91,7 +90,7 @@ export class BuildingHoursDetailView extends React.Component {
9190
? buildingImages[this.props.image]
9291
: transparentPixel
9392
const openStatus = getShortBuildingStatus(this.props, this.state.now)
94-
const schedules = normalizeBuildingSchedule(this.props, this.state.now)
93+
const schedules = this.props.schedule || []
9594
const dayOfWeek = ((this.state.now.format('dd'): any): DayOfWeekEnumType)
9695

9796
const abbr = this.props.abbreviation

0 commit comments

Comments
 (0)