diff options
author | 2025-07-21 21:50:47 +0000 | |
---|---|---|
committer | 2025-07-21 21:50:47 +0000 | |
commit | 400fb710078963a3ad48c5769f54119ab35c68c7 (patch) | |
tree | dec6e4296f6cdcf225a86b4f210bf6c7c549efb3 /src/lib | |
parent | 03cba83324bda8ca6222258dd92570456187d729 (diff) | |
download | fahrplan-400fb710078963a3ad48c5769f54119ab35c68c7.tar.gz fahrplan-400fb710078963a3ad48c5769f54119ab35c68c7.tar.bz2 fahrplan-400fb710078963a3ad48c5769f54119ab35c68c7.tar.lz fahrplan-400fb710078963a3ad48c5769f54119ab35c68c7.zip |
fix: meow
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Timetable.svelte | 22 | ||||
-rw-r--r-- | src/lib/assets/LineGlyph.svelte | 2 | ||||
-rw-r--r-- | src/lib/motis-api.ts | 5 |
3 files changed, 17 insertions, 12 deletions
diff --git a/src/lib/Timetable.svelte b/src/lib/Timetable.svelte index 4a17ca7..307b68b 100644 --- a/src/lib/Timetable.svelte +++ b/src/lib/Timetable.svelte @@ -1,5 +1,5 @@ <script lang="ts"> - import { browser, dev } from '$app/environment'; + import { browser, building, dev } from '$app/environment'; import { page } from '$app/state'; import { S } from '$lib'; import { operators } from './aliases'; @@ -10,12 +10,14 @@ let relativeSecondPrecision = $derived( ['seconds', 'second', 'sec', 'secs', 's', '2'].includes( - page.url.searchParams.get('relative')! + building ? null! : page.url.searchParams.get('relative')! ) ); let isRelativeTime = $derived( relativeSecondPrecision || - ['1', 'true'].includes(page.url.searchParams.get('relative')!) + ['1', 'true'].includes( + building ? null! : page.url.searchParams.get('relative')! + ) ); /** only if isRelativeTime is true */ let now = $state(0); @@ -96,7 +98,7 @@ ? 'relative-offset-time' : 'offset-time' ) ?? '0') - : ((await import('$env/dynamic/private')).env[ + : ((typeof process !== 'undefined' ? process.env : undefined)?.env[ isRelativeTime && !forceAbsolute ? 'PRIVATE_RELATIVE_TIME_OFFSET' : 'PRIVATE_SERVER_TIMEZONE' @@ -105,10 +107,12 @@ if (isRelativeTime && !forceAbsolute) { return timeRelative(time.getTime() - offset * 60 * 60 * 1000, relativeTo); } else { - const hours = time.getHours() + Math.floor(offset); + let hours = time.getHours() + Math.floor(offset); const minutes = time.getMinutes() + Math.floor((offset % 1) * 60); const seconds = time.getSeconds() + Math.floor(((offset % 1) * 60) % 1) * 60; + if (hours < 0) while (hours < 0) hours += 24; + else if (hours >= 24) while (hours >= 24) hours -= 24; return ( hours.toString().padStart(2, '0') + ':' + @@ -261,8 +265,12 @@ {#if pictogram} <Pictogram which={pictogram} /> {/if} - {#if ([Mode.NightRail || Mode.HighspeedRail || Mode.LongDistanceRail || Mode.RegionalFastRail || Mode.RegionalRail].includes(departure.mode) || (departure.mode === 'BUS' && routeShortName.startsWith('EV')) || (departure.mode === 'METRO' && departure.routeShortName.startsWith('S'))) && !avoidGlyph} - <LineGlyph currentColor="#fff" kind={routeShortName} /> + {#if ([Mode.NightRail, Mode.HighspeedRail, Mode.LongDistanceRail, Mode.RegionalFastRail, Mode.RegionalRail].includes(departure.mode) || (departure.mode === 'BUS' && routeShortName.startsWith('EV')) || (departure.mode === 'METRO' && departure.routeShortName.startsWith('S'))) && !avoidGlyph} + <LineGlyph + currentColor="#fff" + kind={routeShortName} + nightIsFilled={false} + /> {:else} <span class="ml-1 -mr-0.5 md:mt-0.5 font-sbb-typo text-nowrap font-bold" diff --git a/src/lib/assets/LineGlyph.svelte b/src/lib/assets/LineGlyph.svelte index 39447cf..ffc95de 100644 --- a/src/lib/assets/LineGlyph.svelte +++ b/src/lib/assets/LineGlyph.svelte @@ -67,7 +67,7 @@ isNightRendering = routeShortName.toUpperCase().startsWith('SN') || routeShortName.toUpperCase().startsWith('REN') || - routeShortName.startsWith('IRN'); + routeShortName.toUpperCase().startsWith('IRN'); let currentColor = $derived( _currentColor ?? (isRE ? '#eb0000' : 'currentColor') ); diff --git a/src/lib/motis-api.ts b/src/lib/motis-api.ts index 1d43eea..347c20a 100644 --- a/src/lib/motis-api.ts +++ b/src/lib/motis-api.ts @@ -20,10 +20,7 @@ export class MotisAPI { arrivals = false, limit = 128, time: Date | undefined = arrivals - ? new Date( - // '2025-07-19T02:03:11Z' - Date.now() - 1000 * 60 - ) + ? new Date(Date.now() - 1000 * 60) : undefined ) { const res = await this.fetch( |