1 files changed, 86 insertions, 64 deletions

diff --git a/src/data/StopDataProvider.ts b/src/data/StopDataProvider.ts
index 11674fd..55d0e78 100644
--- a/src/data/StopDataProvider.ts
+++ b/src/data/StopDataProvider.ts
@@ -3,91 +3,113 @@ export interface CachedStopList {
 	data: Stop[];
 }
 
+export type StopName = {
+	original: string;
+	intersect?: string;
+}
+
 export interface Stop {
-	stopId: number
-	name: string;
+	stopId: number;
+	name: StopName;
 	latitude?: number;
 	longitude?: number;
 	lines: string[];
 	favourite?: boolean;
 }
 
-export class StopDataProvider {
-	async getStops(): Promise<Stop[]> {
-		const rawFavouriteStops = localStorage.getItem('favouriteStops');
-		let favouriteStops: number[] = [];
-		if (rawFavouriteStops) {
-			favouriteStops = JSON.parse(rawFavouriteStops) as number[];
-		}
-
-		const response = await fetch('/api/GetStopList');
-		const stops = await response.json() as Stop[];
+export default {
+	getStops,
+	getDisplayName,
+	addFavourite,
+	removeFavourite,
+	isFavourite,
+	pushRecent,
+	getRecent
+};
 
-		return stops.map((stop: Stop) => {
-			return {
-				...stop,
-				favourite: favouriteStops.includes(stop.stopId)
-			};
-		});	
+async function getStops(): Promise<Stop[]> {
+	const rawFavouriteStops = localStorage.getItem('favouriteStops');
+	let favouriteStops: number[] = [];
+	if (rawFavouriteStops) {
+		favouriteStops = JSON.parse(rawFavouriteStops) as number[];
 	}
 
-	addFavourite(stopId: number) {
-		const rawFavouriteStops = localStorage.getItem('favouriteStops');
-		let favouriteStops: number[] = [];
-		if (rawFavouriteStops) {
-			favouriteStops = JSON.parse(rawFavouriteStops) as number[];
-		}
+	const response = await fetch('/stops.json');
+	const stops = await response.json() as Stop[];
+
+	return stops.map((stop: Stop) => {
+		return {
+			...stop,
+			favourite: favouriteStops.includes(stop.stopId)
+		};
+	});
+}
 
-		if (!favouriteStops.includes(stopId)) {
-			favouriteStops.push(stopId);
-			localStorage.setItem('favouriteStops', JSON.stringify(favouriteStops));
-		}
+// Get display name based on preferences or context
+function getDisplayName(stop: Stop): string {
+	if (typeof stop.name === 'string') {
+		return stop.name;
 	}
 
-	removeFavourite(stopId: number) {
-		const rawFavouriteStops = localStorage.getItem('favouriteStops');
-		let favouriteStops: number[] = [];
-		if (rawFavouriteStops) {
-			favouriteStops = JSON.parse(rawFavouriteStops) as number[];
-		}
+	return stop.name.intersect || stop.name.original;
+}
 
-		const newFavouriteStops = favouriteStops.filter(id => id !== stopId);
-		localStorage.setItem('favouriteStops', JSON.stringify(newFavouriteStops));
+function addFavourite(stopId: number) {
+	const rawFavouriteStops = localStorage.getItem('favouriteStops');
+	let favouriteStops: number[] = [];
+	if (rawFavouriteStops) {
+		favouriteStops = JSON.parse(rawFavouriteStops) as number[];
 	}
 
-	isFavourite(stopId: number): boolean {
-		const rawFavouriteStops = localStorage.getItem('favouriteStops');
-		if (rawFavouriteStops) {
-			const favouriteStops = JSON.parse(rawFavouriteStops) as number[];
-			return favouriteStops.includes(stopId);
-		}
-		return false;
+	if (!favouriteStops.includes(stopId)) {
+		favouriteStops.push(stopId);
+		localStorage.setItem('favouriteStops', JSON.stringify(favouriteStops));
 	}
+}
 
-	RECENT_STOPS_LIMIT = 10;
+function removeFavourite(stopId: number) {
+	const rawFavouriteStops = localStorage.getItem('favouriteStops');
+	let favouriteStops: number[] = [];
+	if (rawFavouriteStops) {
+		favouriteStops = JSON.parse(rawFavouriteStops) as number[];
+	}
 
-	pushRecent(stopId: number) {
-		const rawRecentStops = localStorage.getItem('recentStops');
-		let recentStops: Set<number> = new Set();
-		if (rawRecentStops) {
-			recentStops = new Set(JSON.parse(rawRecentStops) as number[]);
-		}
+	const newFavouriteStops = favouriteStops.filter(id => id !== stopId);
+	localStorage.setItem('favouriteStops', JSON.stringify(newFavouriteStops));
+}
 
-		recentStops.add(stopId);
-		if (recentStops.size > this.RECENT_STOPS_LIMIT) {
-			const iterator = recentStops.values();
-			const val = iterator.next().value as number;
-			recentStops.delete(val);
-		}
+function isFavourite(stopId: number): boolean {
+	const rawFavouriteStops = localStorage.getItem('favouriteStops');
+	if (rawFavouriteStops) {
+		const favouriteStops = JSON.parse(rawFavouriteStops) as number[];
+		return favouriteStops.includes(stopId);
+	}
+	return false;
+}
+
+const RECENT_STOPS_LIMIT = 10;
+
+function pushRecent(stopId: number) {
+	const rawRecentStops = localStorage.getItem('recentStops');
+	let recentStops: Set<number> = new Set();
+	if (rawRecentStops) {
+		recentStops = new Set(JSON.parse(rawRecentStops) as number[]);
+	}
 
-		localStorage.setItem('recentStops', JSON.stringify(Array.from(recentStops)));
+	recentStops.add(stopId);
+	if (recentStops.size > RECENT_STOPS_LIMIT) {
+		const iterator = recentStops.values();
+		const val = iterator.next().value as number;
+		recentStops.delete(val);
 	}
 
-	getRecent(): number[] {
-		const rawRecentStops = localStorage.getItem('recentStops');
-		if (rawRecentStops) {
-			return JSON.parse(rawRecentStops) as number[];
-		}
-		return [];
+	localStorage.setItem('recentStops', JSON.stringify(Array.from(recentStops)));
+}
+
+function getRecent(): number[] {
+	const rawRecentStops = localStorage.getItem('recentStops');
+	if (rawRecentStops) {
+		return JSON.parse(rawRecentStops) as number[];
 	}
-}
\ No newline at end of file
+	return [];
+}