From b54b99aa21342759c66f084bbc44f8d8c8bfb7af Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Wed, 21 Jun 2023 16:04:58 +0100 Subject: [PATCH] Fix public-ldb for multiple origin/destination --- src/lib/ldb/public-ldb.svelte | 20 ++++++++++++++++++-- src/lib/navigation/header.svelte | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/lib/ldb/public-ldb.svelte b/src/lib/ldb/public-ldb.svelte index 6f0a7cf..8090204 100644 --- a/src/lib/ldb/public-ldb.svelte +++ b/src/lib/ldb/public-ldb.svelte @@ -125,8 +125,24 @@ {#each services as service} - {service.origin?.location?.locationName || ''} - {service.destination?.location?.locationName || ''} + + {#if Array.isArray(service.origin?.location)} + {service.origin.location[0]['locationName'] + + " & " + + service.origin.location[1]['locationName']} + {:else} + {service.origin?.location?.locationName || ''} + {/if} + + + {#if Array.isArray(service.destination?.location)} + {service.destination.location[0]['locationName'] + + " & " + + service.destination.location[0]['locationName']} + {:else} + {service.destination?.location?.locationName || ''} + {/if} + {service.platform || '-'} {parseTime(service.sta).data} {parseTime(service.eta).data} diff --git a/src/lib/navigation/header.svelte b/src/lib/navigation/header.svelte index bec170d..96369fa 100644 --- a/src/lib/navigation/header.svelte +++ b/src/lib/navigation/header.svelte @@ -38,9 +38,9 @@ header { top: 3px; font-family: urwgothic, sans-serif; font-weight: 600; - margin-top: 6px; + margin-top: 7px; margin-left: 20px; - font-size: 17pt; + font-size: 15pt; } .headerBlock {