-
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FeaturePanel: implement a new library for opening hours (#330)
- Loading branch information
Showing
7 changed files
with
144 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/components/FeaturePanel/renderers/openingHours/complex.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import OpeningHours from 'opening_hours'; | ||
| import { isInRange } from './utils'; | ||
| import { Address, SimpleOpeningHoursTable } from './types'; | ||
| import { LonLat } from '../../../../services/types'; | ||
|
|
||
| type Weekday = keyof SimpleOpeningHoursTable; | ||
| const weekdays: Weekday[] = ['su', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'ph']; | ||
| const weekdayMappings: Record<string, Weekday> = { | ||
| Sun: 'su', | ||
| Mon: 'mo', | ||
| Tue: 'tu', | ||
| Wed: 'we', | ||
| Thu: 'th', | ||
| Fri: 'fr', | ||
| Sat: 'sa', | ||
| }; | ||
|
|
||
| const fmtDate = (d: Date) => | ||
| d.toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric' }); | ||
|
|
||
| export const parseComplexOpeningHours = ( | ||
| value: string, | ||
| [lon, lat]: LonLat, | ||
| address: Address, | ||
| ) => { | ||
| const oh = new OpeningHours(value, { | ||
| lat, | ||
| lon, | ||
| address, | ||
| }); | ||
|
|
||
| const today = new Date(); | ||
| today.setHours(0, 0, 0, 0); | ||
|
|
||
| const oneWeekLater = new Date(today); | ||
| oneWeekLater.setDate(oneWeekLater.getDate() + 7); | ||
|
|
||
| const intervals = oh.getOpenIntervals(today, oneWeekLater); | ||
| const grouped = weekdays.map((w) => { | ||
| const daysIntervals = intervals.filter( | ||
| ([from]) => | ||
| w === weekdayMappings[from.toLocaleString('en', { weekday: 'short' })], | ||
| ); | ||
|
|
||
| return [w, daysIntervals] as const; | ||
| }); | ||
|
|
||
| const daysTable = Object.fromEntries( | ||
| grouped.map((entry) => { | ||
| const strings = entry[1].map( | ||
| ([from, due]) => `${fmtDate(from)}-${fmtDate(due)}`, | ||
| ); | ||
|
|
||
| return [entry[0], strings] as const; | ||
| }), | ||
| ) as unknown as SimpleOpeningHoursTable; | ||
|
|
||
| return { | ||
| daysTable, | ||
| isOpen: intervals.some(([from, due]) => isInRange([from, due], new Date())), | ||
| }; | ||
| }; |
15 changes: 15 additions & 0 deletions
15
src/components/FeaturePanel/renderers/openingHours/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import { LonLat } from '../../../../services/types'; | ||
| import { parseComplexOpeningHours } from './complex'; | ||
| import { Address } from './types'; | ||
|
|
||
| export const parseOpeningHours = ( | ||
| value: string, | ||
| coords: LonLat, | ||
| address: Address, | ||
| ): ReturnType<typeof parseComplexOpeningHours> | null => { | ||
| try { | ||
| return parseComplexOpeningHours(value, coords, address); | ||
| } catch { | ||
| return null; | ||
| } | ||
| }; |
15 changes: 15 additions & 0 deletions
15
src/components/FeaturePanel/renderers/openingHours/types.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| export interface SimpleOpeningHoursTable { | ||
| su: string[]; | ||
| mo: string[]; | ||
| tu: string[]; | ||
| we: string[]; | ||
| th: string[]; | ||
| fr: string[]; | ||
| sa: string[]; | ||
| ph: string[]; | ||
| } | ||
|
|
||
| export type Address = { | ||
| country_code: string; | ||
| state: string; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export const isInRange = ([startDate, endDate]: [Date, Date], date: Date) => | ||
| date.getTime() >= startDate.getTime() && date.getTime() <= endDate.getTime(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters