Fix linter warnings

This commit is contained in:
2026-02-06 23:54:50 +00:00
parent 46c897efcf
commit 6c10cb628e
8 changed files with 447 additions and 381 deletions

View File

@@ -23,11 +23,11 @@ fs.readdirSync(inputDir).forEach((file) => {
routeStart: content.routeStart || null, routeStart: content.routeStart || null,
routeEnd: content.routeEnd || null, routeEnd: content.routeEnd || null,
created: content.created || null, created: content.created || null,
checked: content.checked || null, checked: content.checked || null
}); });
} }
}); });
fs.writeFileSync(indexFile, JSON.stringify(mapList)); fs.writeFileSync(indexFile, JSON.stringify(mapList));
console.log(`Generated ${mapList.length} map files and index.`) console.log(`Generated ${mapList.length} map files and index.`);

View File

@@ -1,4 +1,4 @@
import { type HandleFetch } from "@sveltejs/kit"; import { type HandleFetch } from '@sveltejs/kit';
export const handleFetch: HandleFetch = async ({ request, fetch }) => { export const handleFetch: HandleFetch = async ({ request, fetch }) => {
if (request.url.startsWith('https://maps.owlboard.info')) { if (request.url.startsWith('https://maps.owlboard.info')) {
@@ -11,10 +11,10 @@ export const handleFetch: HandleFetch = async ({ request, fetch }) => {
method: request.method, method: request.method,
headers: headers, headers: headers,
body: request.body, body: request.body,
// @ts-ignore - 'duplex' is needed for node fetch with bodies // @ts-expect-error - 'duplex' is needed for node fetch with bodies
duplex: 'half' duplex: 'half'
}); });
} }
return fetch(request); return fetch(request);
} };

View File

@@ -4,7 +4,15 @@
export let feature: { export let feature: {
position: 'over' | 'under'; position: 'over' | 'under';
category: 'rail' |'stream'| 'foot' | 'aroad' | 'minorRoad' | 'motorway' | 'waterway' | 'pipeline'; category:
| 'rail'
| 'stream'
| 'foot'
| 'aroad'
| 'minorRoad'
| 'motorway'
| 'waterway'
| 'pipeline';
roadName?: string; roadName?: string;
}; };
export let activeElec: ElecType; export let activeElec: ElecType;
@@ -98,11 +106,10 @@
{#if isOver} {#if isOver}
<BaseTrack {activeElec} height={64} /> <BaseTrack {activeElec} height={64} />
<!-- White edge, to provide separation between abutment line and bridge content --> <!-- White edge, to provide separation between abutment line and bridge content -->
<rect x=0 y={32 - (s.width / 2) - 4} width="64" height="{s.width + 8}" fill="white" /> <rect x="0" y={32 - s.width / 2 - 4} width="64" height={s.width + 8} fill="white" />
<rect x="6" y={32 - (s.width / 2)} width="52" height={s.width} fill={s.bg} /> <rect x="6" y={32 - s.width / 2} width="52" height={s.width} fill={s.bg} />
{#if s.type === 'road'} {#if s.type === 'road'}
<line <line
@@ -121,14 +128,16 @@
{/if} {/if}
<g fill="none" stroke={s.stroke} stroke-width="2.5" stroke-linecap="square"> <g fill="none" stroke={s.stroke} stroke-width="2.5" stroke-linecap="square">
<path d={`M 20 ${32 - s.width / 2 - 6} L 20 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 6}`} /> <path
d={`M 20 ${32 - s.width / 2 - 6} L 20 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 4} L 44 ${32 - s.width / 2 - 6}`}
/>
<path d={`M 20 ${32 + s.width / 2 + 6} L 20 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 6}`} /> <path
d={`M 20 ${32 + s.width / 2 + 6} L 20 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 4} L 44 ${32 + s.width / 2 + 6}`}
/>
</g> </g>
{:else} {:else}
<rect x="6" y={32 - s.width / 2} width="52" height={s.width} fill={s.bg} />
<rect x="6" y={32 - (s.width / 2)} width="52" height={s.width} fill={s.bg} />
{#if s.type === 'road'} {#if s.type === 'road'}
<line <line
@@ -148,9 +157,13 @@
<rect x="26" y={yTop} width="12" height="64" fill="white" /> <rect x="26" y={yTop} width="12" height="64" fill="white" />
<g stroke={s.stroke} stroke-width="2.5" fill="none" stroke-linecap="square"> <g stroke={s.stroke} stroke-width="2.5" fill="none" stroke-linecap="square">
<path d={`M 24 ${(32 - (s.width / 2)) - 5} L 25 ${(32 - (s.width / 2)) - 5} L 25 ${(32 - (s.width / 2)) + s.width + 5} L 24 ${(32 - (s.width / 2)) + s.width + 5}`} /> <path
d={`M 24 ${32 - s.width / 2 - 5} L 25 ${32 - s.width / 2 - 5} L 25 ${32 - s.width / 2 + s.width + 5} L 24 ${32 - s.width / 2 + s.width + 5}`}
/>
<path d={`M 40 ${(32 - (s.width / 2)) - 5} L 39 ${(32 - (s.width / 2)) - 5} L 39 ${(32 - (s.width / 2)) + s.width + 5} L 40 ${(32 - (s.width / 2)) + s.width + 5}`} /> <path
d={`M 40 ${32 - s.width / 2 - 5} L 39 ${32 - s.width / 2 - 5} L 39 ${32 - s.width / 2 + s.width + 5} L 40 ${32 - s.width / 2 + s.width + 5}`}
/>
</g> </g>
<BaseTrack {activeElec} height={64} /> <BaseTrack {activeElec} height={64} />

View File

@@ -18,7 +18,7 @@
}; };
const getPath = (side: 'left' | 'right') => { const getPath = (side: 'left' | 'right') => {
const yStart = visualUp ? 64 : 0; const yStart = visualUp ? 64 : 8;
const yEnd = visualUp ? 8 : 56; const yEnd = visualUp ? 8 : 56;
const xEnd = side === 'right' ? 56 : 8; const xEnd = side === 'right' ? 56 : 8;
return `M 32 ${yStart} Q 32 32 ${xEnd} ${yEnd}`; return `M 32 ${yStart} Q 32 32 ${xEnd} ${yEnd}`;
@@ -34,7 +34,7 @@
</script> </script>
<svg viewBox="0 0 64 64" width="64" height="64" class="junction"> <svg viewBox="0 0 64 64" width="64" height="64" class="junction">
{#each paths as d} {#each paths as d (d)}
<path {d} fill="none" stroke={branchColour} stroke-width="5" stroke-linecap="round" /> <path {d} fill="none" stroke={branchColour} stroke-width="5" stroke-linecap="round" />
{/each} {/each}
<BaseTrack {activeElec} height={64} /> <BaseTrack {activeElec} height={64} />

View File

@@ -1,5 +1,6 @@
<script lang="ts"> <script lang="ts">
import type { PageData } from './$types'; import type { PageData } from './$types';
import { base } from '$app/paths';
export let data: PageData; export let data: PageData;
let searchTerm = ''; let searchTerm = '';
@@ -10,7 +11,8 @@
return d.toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: '2-digit' }); return d.toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: '2-digit' });
}; };
$: filteredMaps = data.maps.filter(m => $: filteredMaps = data.maps.filter(
(m) =>
m.routeId.toString().includes(searchTerm) || m.routeId.toString().includes(searchTerm) ||
m.routeStart.toLowerCase().includes(searchTerm.toLowerCase()) || m.routeStart.toLowerCase().includes(searchTerm.toLowerCase()) ||
m.routeEnd.toLowerCase().includes(searchTerm.toLowerCase()) m.routeEnd.toLowerCase().includes(searchTerm.toLowerCase())
@@ -20,7 +22,7 @@ const isVerifiedRecently = (dateVal: string | null) => {
if (!dateVal) return 'draft'; if (!dateVal) return 'draft';
const checkedDate = new Date(dateVal).getTime(); const checkedDate = new Date(dateVal).getTime();
const oneYearAgo = Date.now() - (365 * 24 * 60 * 60 * 1000); const oneYearAgo = Date.now() - 365 * 24 * 60 * 60 * 1000;
return checkedDate > oneYearAgo ? 'verified' : 'stale'; return checkedDate > oneYearAgo ? 'verified' : 'stale';
}; };
@@ -29,10 +31,13 @@ const isVerifiedRecently = (dateVal: string | null) => {
<div class="page-wrapper"> <div class="page-wrapper">
<header class="main-header"> <header class="main-header">
<div class="brand-container"> <div class="brand-container">
<img src="https://owlboard.info/images/logo/wide_logo.svg" alt="OwlBoard Logo" class="main-logo" /> <img
src="https://owlboard.info/images/logo/wide_logo.svg"
alt="OwlBoard Logo"
class="main-logo"
/>
<div class="brand-text"> <div class="brand-text">
<h1>Routes</h1> <h1>Routes</h1>
<p class="sub-brand">by OwlBoard</p>
</div> </div>
<div class="search-container"> <div class="search-container">
<input <input
@@ -42,11 +47,30 @@ const isVerifiedRecently = (dateVal: string | null) => {
class="search-input" class="search-input"
/> />
</div> </div>
</div>
</header> </header>
<div class="list-container"> <div class="list-container">
{#each filteredMaps as map} <a
<a href="/map/{map.routeId.toString().padStart(4, '0')}" class="card"> href="https://owlboard.info"
class="card external-card"
target="_blank"
rel="noopener noreferrer"
>
<div class="card-top">
<span class="route-id system-tag">OWL</span>
<span class="status-badge external">External Tool</span>
</div>
<div class="card-body">
<div class="location">OwlBoard</div>
<p class="description">Live Departure Boards and PIS Codes</p>
</div>
<div class="card-footer">
<span>Visit owlboard.info ↗</span>
</div>
</a>
{#each filteredMaps as map (map.routeId)}
<a href="{base}/map/{map.routeId.toString().padStart(4, '0')}" class="card">
<div class="card-top"> <div class="card-top">
<span class="route-id">{map.routeId.toString().padStart(4, '0')}</span> <span class="route-id">{map.routeId.toString().padStart(4, '0')}</span>
<span class="status-badge {isVerifiedRecently(map.checked)}"> <span class="status-badge {isVerifiedRecently(map.checked)}">
@@ -62,7 +86,7 @@ const isVerifiedRecently = (dateVal: string | null) => {
<div class="card-body"> <div class="card-body">
<div class="location origin">{map.routeStart}</div> <div class="location origin">{map.routeStart}</div>
<div class="path-arrow"></div> <div class="path-arrow">to</div>
<div class="location destination">{map.routeEnd}</div> <div class="location destination">{map.routeEnd}</div>
</div> </div>
@@ -85,7 +109,7 @@ const isVerifiedRecently = (dateVal: string | null) => {
margin: 0; margin: 0;
background-color: #f8fafc; background-color: #f8fafc;
color: #0f172a; color: #0f172a;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
} }
.page-wrapper { .page-wrapper {
@@ -179,6 +203,7 @@ const isVerifiedRecently = (dateVal: string | null) => {
border: 1px solid #e2e8f0; border: 1px solid #e2e8f0;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
transition: transform 0.1s ease; transition: transform 0.1s ease;
cursor: pointer;
} }
.card:active { .card:active {
@@ -212,7 +237,7 @@ const isVerifiedRecently = (dateVal: string | null) => {
} }
.path-arrow { .path-arrow {
color: #cbd5e1; color: #acc7e8;
font-size: 0.9rem; font-size: 0.9rem;
margin: 0.2rem 0; margin: 0.2rem 0;
} }
@@ -227,14 +252,13 @@ const isVerifiedRecently = (dateVal: string | null) => {
padding-top: 0.75rem; padding-top: 0.75rem;
} }
/* Update your existing badge styles */
.status-badge { .status-badge {
font-size: 0.65rem; font-size: 0.65rem;
font-weight: 800; font-weight: 800;
text-transform: uppercase; text-transform: uppercase;
padding: 0.3rem 0.6rem; padding: 0.3rem 0.6rem;
border-radius: 999px; border-radius: 999px;
white-space: nowrap; /* Prevents label snapping on small screens */ white-space: nowrap;
} }
.verified { .verified {
@@ -243,8 +267,8 @@ const isVerifiedRecently = (dateVal: string | null) => {
} }
.stale { .stale {
background: #fef3c7; /* Amber/Yellow background */ background: #fef3c7;
color: #92400e; /* Dark brown/gold text */ color: #92400e;
border: 1px solid #fcd34d; border: 1px solid #fcd34d;
} }
@@ -253,7 +277,6 @@ const isVerifiedRecently = (dateVal: string | null) => {
color: #475569; color: #475569;
} }
/* Desktop Adjustments */
@media (min-width: 640px) { @media (min-width: 640px) {
.page-wrapper { .page-wrapper {
padding: 3rem 1.5rem; padding: 3rem 1.5rem;
@@ -272,7 +295,6 @@ const isVerifiedRecently = (dateVal: string | null) => {
.path-arrow { .path-arrow {
display: inline-block; display: inline-block;
margin: 0 0.5rem; margin: 0 0.5rem;
transform: rotate(-90deg); /* Turn down arrow into right arrow */
} }
.card-body { .card-body {
@@ -280,4 +302,31 @@ const isVerifiedRecently = (dateVal: string | null) => {
align-items: center; align-items: center;
} }
} }
.external-card {
border-left: 4px solid #6366f1;
background: linear-gradient(to right, #ffffff, #f5f3ff);
}
.system-tag {
background: #eef2ff !important;
color: #4338ca !important;
}
.status-badge.external {
background: #6366f1;
color: white;
}
.description {
margin: 0.25rem 0 0 0;
font-size: 0.9rem;
color: #64748b;
font-weight: 500;
}
.external-card:hover {
border-color: #4338ca;
background: #f5f3ff;
}
</style> </style>

View File

@@ -1,4 +1,4 @@
import type { PageLoad } from "./$types"; import type { PageLoad } from './$types';
export const load: PageLoad = async ({ fetch }) => { export const load: PageLoad = async ({ fetch }) => {
const response = await fetch('map-index.json'); const response = await fetch('map-index.json');

View File

@@ -2,6 +2,7 @@
import RouteRow from '$lib/components/RouteRow.svelte'; import RouteRow from '$lib/components/RouteRow.svelte';
import RouteEndLink from '$lib/components/mapIcons/RouteEndLink.svelte'; import RouteEndLink from '$lib/components/mapIcons/RouteEndLink.svelte';
import { slide } from 'svelte/transition'; import { slide } from 'svelte/transition';
import { base } from '$app/paths';
// data.route contains: routeStart, routeEnd, routeId, elecStart, elecEnd, routeDetail[] // data.route contains: routeStart, routeEnd, routeId, elecStart, elecEnd, routeDetail[]
export let data; export let data;
@@ -60,7 +61,7 @@
<div class="map-layout"> <div class="map-layout">
<header class="top-nav"> <header class="top-nav">
<div class="nav-cluster"> <div class="nav-cluster">
<a href="/" class="home-link" title="Back to Index"> <a href="{base}/" class="home-link" title="Back to Index">
<span class="home-icon"></span> <span class="home-icon"></span>
</a> </a>
@@ -106,7 +107,7 @@
<div class="drawer-content"> <div class="drawer-content">
<div class="filter-flex"> <div class="filter-flex">
{#each Object.keys(visibleTypes) as type} {#each Object.keys(visibleTypes) as type (type)}
<button <button
class="filter-chip" class="filter-chip"
class:active={visibleTypes[type]} class:active={visibleTypes[type]}

View File

@@ -11,6 +11,9 @@ elecStart:
elecEnd: elecEnd:
elec: none elec: none
routeDetail: routeDetail:
- type: continues
routeName: Paddington - Reading West Jn
routeId: "0001"
- type: crossovers - type: crossovers
name: Scours Lane Junction name: Scours Lane Junction
description: Line diverges description: Line diverges