Complete 2420 - Westerleigh - Gloucester and ensure linking is working.

Improve map loading functions
Relocate transpiles maps
2026-02-14 21:54:59 +00:00 · 2026-02-14 21:54:25 +00:00 · 2026-02-14 21:54:14 +00:00 · 2026-02-14 21:54:05 +00:00
7 changed files with 696 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ node_modules
 # Transpiled JSON
 /static/mapFiles/json/
 /static/map-index.json
+/src/lib/assets/route/*.json

 # Output
 .output
--- a/2
+++ b/2
@@ -6,7 +6,7 @@ RUN npm ci

 COPY . .
 RUN node ./scripts/parse-maps.js
-RUN rm -r ./static/mapFiles/yaml
+RUN rm -r ./static/mapFiles
 RUN npm run build
 RUN npm prune --production

--- a/scripts/parse-maps.js
+++ b/scripts/parse-maps.js
@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';

 const inputDir = './static/mapFiles/yaml';
-const outputDir = './static/mapFiles/json';
+const outputDir = './src/lib/assets/route';
 const indexFile = './static/map-index.json';

 const noiseRegex = /\s+(single line|junction|jn|junc|jct|gf|north|south|east|west)\.?$/i;
--- a/src/routes/map/[slug]/+page.ts
+++ b/src/routes/map/[slug]/+page.ts
@@ -1,27 +1,30 @@
 import type { PageLoad } from '/$types';
 import { error } from '@sveltejs/kit';

-export const load: PageLoad = async ({ params, fetch }) => {
+const mapDataFiles = import.meta.glob('$lib/assets/route/*.json', { query: '?json' });
+
+export const load: PageLoad = async ({ params }) => {
 	const { slug } = params;

+	const path = `/src/lib/assets/route/${slug}.json`;
+	console.log(`Finding path: ${path}`);
+
+	if (!(path in mapDataFiles)) {
+		throw error(404, {
+			message: `Route ${slug} not found`
+		});
+	}
+
 	try {
-		const res = await fetch(`/mapFiles/json/${slug}.json`);
-
-		if (!res.ok) {
-			throw error(404, {
-				message: `Route ${slug} not found`
-			});
-		}
-
-		const rawData = await res.json();
+		const rawData = await mapDataFiles[path]();

 		return {
 			route: rawData,
-			slug: slug
+			slug: slug,
 		};
+
 	} catch (err) {
 		console.error(`Error loading map ${slug}: `, err);
-
 		throw error(500, {
 			message: `Failed to parse map data for ${slug}`
 		});
--- a/static/mapFiles/yaml/0230.yaml
+++ b/static/mapFiles/yaml/0230.yaml
@@ -2,7 +2,7 @@ routeStart: Swindon Junction
 routeEnd: Standish Junction
 routeId: 0230
 updated: 2026-02-14
-checked: 2025-02-14
+checked: 2026-02-14
 signallerStart: TVSC Swindon WS
 signallerEnd: Gloucester PSB
 elecStart:
@@ -464,7 +464,7 @@ routeDetail:
    chains: 32

  - type: crossing
-    kins: foot
+    kind: foot
    name: Frampton Mansell Foot Crossing
    miles: 96
    chains: 43
@@ -571,7 +571,7 @@ routeDetail:
    miles: 100
    chains: 37

-  - type: crrossing
+  - type: crossing
    kind: MSL
    name: Ham Mill Foot Crossing
    miles: 100
@@ -729,7 +729,7 @@ routeDetail:
    chains: 35

  - type: crossing
-    category: foot
+    kind: foot
    name: Little Australia Foot Crossing
    miles: 105
    chains: 56
@@ -754,6 +754,8 @@ routeDetail:

  - type: junction
    name: Standish Jn
+    diverges: right
+    direction: up
    description: Up to Gloucester, Dn to Bristol
    miles: 106
    chains: 74
--- a/static/mapFiles/yaml/0240.yaml
+++ b/static/mapFiles/yaml/0240.yaml
@@ -489,6 +489,8 @@ routeDetail:
    diverges: left
    direction: up
    name: Westerleigh Jn
+    goto: '2420'
+    entryPoint: westerleigh-jn
    miles: 107
    chains: 14
    description: Up/Dn Charfield towards Gloucester
--- a/static/mapFiles/yaml/2420.yaml
+++ b/static/mapFiles/yaml/2420.yaml
@@ -9,4 +9,673 @@ elecStart:
  elec: 25kvac
  eco: Didcot (TVSC)
 elecEnd:
-  elec: none
+  elec: none
+
+routeDetail:
+
+  - type: junction
+    name: Westerleigh Jn
+    diverges: left
+    direction: down
+    goto: '0240'
+    entryPoint: westerleigh-jn
+    miles: 121
+    chains: 26
+
+  - type: bridge
+    name: Westerleigh Road
+    category: road
+    position: under
+    miles: 121
+    chains: 19
+
+  - type: minorBridge
+    position: under
+    name: Cattle Creep
+    miles: 121
+    chains: 20
+
+  - type: electrificationChange
+    from:
+      elec: 25kvac
+      eco: Didcot
+    to:
+      elec: none 
+    miles: 120
+    chains: 67
+
+  - type: minorBridge
+    name: Westerleigh Road
+    position: under
+    category: road
+    miles: 120
+    chains: 63
+
+  - type: minorBridge
+    name: Farm Bridge
+    position: under
+    miles: 120
+    chains: 36
+
+  - type: junction
+    diverges: right
+    direction: up
+    name: Yate South Jn
+    description: to Westerleigh Oil Terminal
+    miles: 120
+    chains: 3
+
+  - type: station
+    name: Yate
+    miles: 119
+    chains: 60
+
+  - type: minorBridge
+    category: aroad
+    position: over
+    description: Between platforms
+    roadName: A432
+    name: Station Road
+    miles: 119
+    chains: 59
+
+  - type: junction
+    diverges: right
+    direction: down
+    name: Yate Middle Junction
+    description: Diverges between platforms, to Tytherington
+    miles: 119
+    chains: 57
+
+  - type: minorBridge
+    name: Stream
+    category: Stream
+    miles: 119
+    chains: 23
+
+  - type: crossing
+    kind: foot
+    name: Celestine Road Foot Crossing
+    miles: 119
+    chains: 23
+
+  - type: minorBridge
+    name: Goose Green Way
+    category: road
+    roadName: B4059
+    position: over
+    miles: 119
+    chains: 6
+
+  - type: minorBridge
+    name: Broad Lane
+    category: road
+    position: over
+    miles: 119
+    chains: 3
+
+  - type: minorBridge
+    category: road
+    miles: 118
+    chains: 56
+    position: over
+
+  - type: minorBridge
+    name: Limekiln Road
+    position: over
+    miles: 117
+    chains: 37
+
+  - type: minorBridge
+    name: Hall End Lane
+    category: road
+    position: over
+    miles: 116
+    chains: 61
+
+  - type: minorBridge
+    name: Westend Road
+    category: road
+    position: over
+    miles: 116
+    chains: 36
+
+  - type: minorBridge
+    name: Aqueduct
+    category: stream
+    position: over
+    miles: 116
+    chains: 25
+
+  - type: tunnel
+    name: Wickwar Tunnel
+    tunnelType: whole
+    length: 0mi 1401yd
+    miles: 116
+    chains: 60
+
+  - type: siteof
+    name: Wickwar
+    description: Former station
+    miles: 115
+    chains: 9
+
+  - type: minorBridge
+    name: Station Road
+    category: road
+    position: under
+    miles: 114
+    chains: 79
+
+  - type: minorBridge
+    position: under
+    miles: 113
+    chains: 74
+
+  - type: siteof
+    name: Charfield
+    description: Former & Future Station
+    miles: 113
+    chains: 14
+
+  - type: minorBridge
+    name: Wooton Road
+    category: road
+    roadName: B4058
+    position: over
+    miles: 113
+    chains: 9
+
+  - type: loop
+    position: both
+    name: Charfield Loops
+    miles: 112
+    chains: 72
+
+  - type: crossing
+    kind: foot
+    name: Charfield 8 Foot Crossing
+    miles: 112
+    chains: 42
+
+  - type: minorBridge
+    name: Little Avon River
+    category: stream
+    position: under
+    miles: 112
+    chains: 38
+
+  - type: minorBridge
+    name: Charfield Meadow
+    category: road
+    position: under
+    miles: 112
+    chains: 21
+
+  - type: minorBridge
+    name: Huntingford Bridge
+    category: road
+    position: under
+    miles: 112
+    chains: 10
+
+  - type: minorBridge
+    position: under
+    miles: 111
+    chains: 49
+
+  - type: minorBridge
+    name: Foot Bridge
+    category: foot
+    position: over
+    miles: 111
+    chains: 1
+
+  - type: minorBridge
+    category: road
+    name: Wick Bridge
+    position: over
+    miles: 110
+    chains: 60
+
+  - type: bridge
+    name: Motorway
+    roadName: M5
+    category: motorway
+    position: over
+    miles: 110
+    chains: 48
+
+  - type: crossing
+    kind: foot
+    name: Wick Mill No.2 Foot Crossing
+    miles: 110
+    chains: 9
+
+  - type: crossing
+    kind: foot
+    name: Wick Mill No.1 Foot Crossing
+    miles: 109
+    chains: 79
+
+  - type: minorBridge
+    name: Crossways
+    category: road
+    position: over
+    miiles: 109
+    chains: 63
+
+  - type: signallerChange
+    from: TVSC Stoke Gifford WS (BL)
+    to: Gloucester PSB Panel C (G)
+    miles: 109
+    chains: 60
+
+  - type: crossing
+    name: Goldwick Foot Crossing
+    kind: foot
+    miles: 109
+    chains: 47
+
+  - type: crossing
+    name: Alkington 14 Foot Crossing
+    kind: foot
+    miles: 109
+    chains: 38
+
+  - type: minorBridge
+    position: under
+    miles: 109
+    chains: 15
+
+  - type: crossing
+    name: Stinchcombe 6 Foot Crossing
+    kind: foot
+    miles: 108
+    chains: 46
+
+  - type: minorBridge
+    name: Cattle Creep
+    position: under
+    miles: 108
+    chains: 53
+
+  - type: bridge
+    name: Bristol Road
+    position: over
+    category: aroad
+    roadName: A38
+    miles: 108
+    chains: 4
+
+  - type: crossing
+    kind: foot
+    name: Thornbury 45 Footpath
+    miles: 107
+    chains: 72
+
+  - type: junction
+    diverges: right
+    direction: Up
+    name: Berkeley Road Jn
+    description: to Sharpness Docks
+    miles: 107
+    chains: 70
+
+  - type: minorBridge
+    name: Cattle Creep
+    position: under
+    miles: 107
+    chains: 23
+  
+  - type: minorBridge
+    name: Tumpy Green
+    position: over
+    miles: 107
+    chains: 4
+
+  - type: crossing
+    name: Slimbridge 53 Foot Crossing
+    kind: foot
+    miles: 106
+    chains: 62
+
+  - type: crossing
+    name: Slimbridge 54 Foot Crossing
+    kind: foot
+    miles: 106
+    chains: 48
+
+  - type: bridge
+    name: Bristol Road
+    category: aroad
+    roadName: A38
+    position: over
+    miles: 106
+    chains: 24
+
+  - type: crossing
+    kind: foot
+    name: Slimbridge 46 Foot Crossing
+    miles: 105
+    chains: 79
+
+  - type: bridge
+    position: over
+    name: Motorway
+    roadName: M5
+    category: motorway
+    miles: 105
+    chains: 70
+
+  - type: minorBridge
+    position: over
+    category: aroad
+    roadName: A4135
+    miles: 105
+    chains: 57
+
+  - type: crossovers
+    name: Coaley GF
+    miles: 105
+    chains: 36
+
+  - type: station
+    name: Cam & Dursley
+    miles: 105
+    chains: 30
+
+  - type: minorBridge
+    name: Box Road
+    position: over
+    miles: 105
+    chains: 26
+
+  - type: crossing
+    name: Dursley Foot Crossing
+    kind: foot
+    miles: 105
+    chains: 14
+
+  - type: minorBridge
+    name: Westend
+    position: under
+    miles: 104
+    chains: 60
+
+  - type: crossing
+    name: Coaley 12 Foot Crossing
+    miles: 104
+    chains: 46
+    kind: foot
+
+  - type: minorBridge
+    name: Peter's Street
+    position: under
+    miles: 104
+    chains: 39
+
+  - type: crossing
+    name: Coaley 17 Foot Crossing
+    kind: foot
+    miles: 104
+    chains: 27
+
+  - type: crossing
+    name: Frocester 23 Foot Crossing
+    kind: foot
+    miles: 104
+    chains: 14
+
+  - type: siteof
+    name: Frocester
+    description: Former station
+    miles: 103
+    chains: 36
+
+  - type: minorBridge
+    name: Peter's Street
+    position: over
+    miles: 103
+    chains: 32
+
+  - type: minorBridge
+    name: Bath Road
+    position: over
+    miles: 103
+    chains: 16
+
+  - type: crossing
+    kind: foot
+    name: Leonard Stanley 4 Foot Crossing
+    miles: 102
+    chains: 60
+
+  - type: minorBridge
+    position: under
+    miles: 102
+    chains: 30
+
+  - type: bridge
+    name: Stonehouse Viaduct
+    position: under
+    miles: 102
+    chains: 9
+
+  - type: minorBridge
+    name: River Frome
+    category: waterway
+    position: under
+    miles: 101
+    chains: 75
+
+  - type: minorBridge
+    name: Bristol Road
+    roadName: A419
+    position: under
+    miles: 101
+    chains: 67
+
+  - type: minorBridge
+    name: Footbridge
+    category: foot
+    position: over
+    miles: 101
+    chains: 42
+
+  - type: crossing
+    name: Old Ends Level Crossing
+    kind: CCTV
+    description: CCTV by Gloucester
+    miles: 101
+    chains: 27
+
+  - type: crossing
+    kind: foot
+    name: Stonehouse 2 Foot Crossing
+    miles: 101
+    chains: 7
+
+  - type: minorBridge
+    name: Stagholt Farm
+    position: under
+    miles: 100
+    chains: 74
+
+  - type: crossing
+    kind: foot
+    name: Stagholt Foot Crossing
+    miles: 100
+    chains: 73
+
+  - type: minorBridge
+    name: Black Bridge
+    position: over
+    miles: 100
+    chains: 40
+
+  - type: minorBridge
+    name: Gloucester Road
+    category: road
+    roadName: B4008
+    miles: 100
+    chains: 2
+
+  - type: crossing
+    name: Standish 12 Footpath
+    kind: foot
+    miles: 99
+    chains: 71
+
+  - type: junction
+    name: Standish Jn
+    diverges: left
+    direction: up
+    goto: '0230'
+    entryPoint: standish-jn
+    miles: 99
+    chains: 69
+
+  - type: crossing
+    name: Standish 9 Foot Crossing
+    kind: foot
+    miles: 99
+    chains: 45
+
+  - type: minorBridge
+    name: Bridge Farm
+    position: over
+    miles: 99
+    chains: 29
+
+  - type: loop
+    name: Haresfield Down Goods Loop
+    position: left
+    miles: 99
+    chains: 0
+
+  - type: crossing
+    kind: R/G
+    name: Haresfield Foot Crossing
+    miles: 99
+    chains: 62
+
+  - type: loop
+    name: Haresfield Up Goods Loop
+    description: Exit signal usually blank
+    position: right
+    miles: 98
+    chains: 40
+
+  - type: minorBridge
+    position: over
+    miles: 98
+    chains: 38
+
+  - type: crossing
+    kind: foot
+    name: Brookthorpe Foot Crossing
+    miles: 97
+    chains: 01
+
+  - type: minorBridge
+    name: Grange Road
+    category: road
+    position: under
+    miles: 95
+    chains: 66
+
+  - type: minorBridge
+    name: Southern Avenue
+    category: aroad
+    roadName: A38
+    miles: 95
+    chains: 3
+    position: over
+
+  - type: crossovers
+    name: Tuffley Jn
+    description: Limit of bidirectional running from Gloucester
+    miles: 94
+    chains: 74
+
+  - type: minorBridge
+    name: Stroud Road
+    roadName: B4072
+    category: road
+    position: over
+    miles: 94
+    chains: 62
+
+  - type: minorBridge
+    name: Footbridge
+    position: over
+    miles: 93
+    chains: 72
+
+  - type: minorBridge
+    name: Tredworth Road
+    position: under
+    category: road
+    miles: 93
+    chains: 37
+
+  - type: minorBridge
+    name: Barton Street
+    category: road
+    position: under
+    roadName: B4073
+    miles: 93
+    chains: 10
+
+  - type: junction
+    name: Gloucester Yard Junction
+    diverges: left
+    direction: down
+    description: to Barnwood Junction
+    goto: "2422"
+    entryPoint: barnwood-jn
+    miles: 93
+    chains: 8
+
+  - type: loop
+    name: Curve Through Siding
+    position: left
+    miles: 113
+    chains: 20
+    description: Mileage Change from Gloucester Yard Jn
+
+  - type: bridge
+    name: Metz Way
+    category: aroad
+    roadName: A4032
+    position: over
+    miles: 113
+    chains: 24
+
+  - type: crossing
+    kind: MCB
+    name: Horton Road LC
+    description: Controlled by Gloucester PSB
+    miles: 113
+    chains: 56
+
+  - type: junction
+    diverges: left
+    direction: up
+    name: Horton Road Jn
+    description: to Barnwood Jn
+    goto: "2422"
+    entryPoint: horton-road-jn
+    miles: 113
+    chains: 61
+
+  - type: station
+    name: Gloucester
+    miles: 114
+    chains: 4
+
+  - type: continues
+    routeName: Gloucester - Severn Tunnel Jn
+    entryPoint: gloucester
+    routeId: '2421'
Author	SHA1	Message	Date
Fred Boniface	97703a081a	Complete `2420 - Westerleigh - Gloucester` and ensure linking is working.	2026-02-14 21:54:59 +00:00
Fred Boniface	e7530846f2	Improve map loading functions	2026-02-14 21:54:25 +00:00
Fred Boniface	660b38950f	Relocate transpiles maps	2026-02-14 21:54:14 +00:00
Fred Boniface	437ce6c3e0	Remove map files from build, relocate transpiled map files to $lib for cache improvements.	2026-02-14 21:54:05 +00:00