18223916783

Committed 03 Oct 2025 01:38PM UTC coverage: 73.928% (-0.8%) from 74.699%

Build # 18223916783

Build Type

Pull #273

github

Committed by

web-flow

Commit Message

Merge 4b63c554d into b0a407d37

Pull Request Pull Request #273: Refactor/map-state-simplification

Coverage Stats

839 of 957 branches covered (87.67%)

Branch coverage included in aggregate %.

4 of 151 new or added lines in 9 files covered. (2.65%)

9 existing lines in 4 files now uncovered.

6681 of 9215 relevant lines covered (72.5%)

1.9 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/components/map/MapView.svelte

<script>
        import { browser } from '$app/environment';
        import { onMount, onDestroy } from 'svelte';
        import {
                PUBLIC_OBA_REGION_CENTER_LAT as initialLat,
                PUBLIC_OBA_REGION_CENTER_LNG as initialLng
        } from '$env/static/public';

        import { debounce } from '$lib/utils';
        import LocationButton from '$lib/LocationButton/LocationButton.svelte';
        import RouteMap from './RouteMap.svelte';

        import { isMapLoaded } from '$src/stores/mapStore';
        import { userLocation } from '$src/stores/userLocationStore';
        /**
         * @typedef {Object} Props
         * @property {any} [selectedTrip]
         * @property {any} [selectedRoute]
         * @property {boolean} [showRoute]
         * @property {boolean} [showRouteMap]
         * @property {any} [mapProvider]
         * @property {any} [stop] - Currently selected stop to preserve visual context
         */

        /** @type {Props} */
        let {
                handleStopMarkerSelect,
                selectedTrip = null,
                selectedRoute = null,
                isRouteSelected = false,
                showRouteMap = false,
                mapProvider = null,
                stop = null
        } = $props();

        let isTripPlanModeActive = $state(false);
        let mapInstance = $state(null);
        let mapElement = $state();
        let allStops = $state([]);
        // O(1) lookup for existing stops
        let allStopsMap = new Map();
        let stopsCache = new Map();

        const Modes = {
                NORMAL: 'normal',
                TRIP_PLAN: 'tripPlan',
                ROUTE: 'route'
        };

        let mapMode = $state(Modes.NORMAL);
        let modeChangeTimeout = null;

        $effect(() => {
                let newMode;
                if (isTripPlanModeActive) {
                        newMode = Modes.TRIP_PLAN;
                } else if (selectedRoute || isRouteSelected || showRouteMap || selectedTrip) {
                        newMode = Modes.ROUTE;
                } else {
                        newMode = Modes.NORMAL;
                }
                if (modeChangeTimeout) {
                        clearTimeout(modeChangeTimeout);
                }
                if (mapMode === Modes.ROUTE && newMode === Modes.NORMAL) {
                        modeChangeTimeout = setTimeout(() => {
                                mapMode = newMode;
                        }, 100);
                } else if (mapMode !== newMode) {
                        mapMode = newMode;
                }
        });

        $effect(() => {
                if (!mapInstance) return;
                if (mapMode === Modes.NORMAL) {
                        batchAddMarkers(allStops);
                } else {
                        clearAllMarkers();
                }
        });

        function cacheKey(zoomLevel, boundingBox) {
                const multiplier = 100; // 2 decimal places
                const north = Math.round(boundingBox.north * multiplier);
                const south = Math.round(boundingBox.south * multiplier);
                const east = Math.round(boundingBox.east * multiplier);
                const west = Math.round(boundingBox.west * multiplier);

                return `${north}_${south}_${east}_${west}_${zoomLevel}`;
        }

        function getBoundingBox() {
                if (!mapProvider) {
                        throw new Error('Map provider is not initialized');
                }
                return mapProvider.getBoundingBox();
        }

        async function loadStopsForLocation(lat, lng, zoomLevel, firstCall = false) {
                if (firstCall) {
                        const response = await fetch(`/api/oba/stops-for-location?lat=${lat}&lng=${lng}&radius=2500`);
                        if (!response.ok) {
                                throw new Error('Failed to fetch locations');
                        }
                        return await response.json();
                }

                const boundingBox = getBoundingBox();
                const key = cacheKey(zoomLevel, boundingBox);

                if (stopsCache.has(key)) {
                        console.debug('Stop cache hit: ', key);
                        return stopsCache.get(key);
                } else {
                        console.debug('Stop cache miss: ', key);
                }

                const response = await fetch(
                        `/api/oba/stops-for-location?lat=${lat}&lng=${lng}&latSpan=${boundingBox.north - boundingBox.south}&lngSpan=${boundingBox.east - boundingBox.west}&radius=1500`
                );

                if (!response.ok) {
                        throw new Error('Failed to fetch locations');
                }

                const stopsForLocation = await response.json();
                stopsCache.set(key, stopsForLocation);

                return stopsForLocation;
        }

        async function initMap() {
                try {
                        await mapProvider.initMap(mapElement, {
                                lat: Number(initialLat),
                                lng: Number(initialLng)
                        });

                        mapInstance = mapProvider;

                        await loadStopsAndAddMarkers(initialLat, initialLng, true);

                        const debouncedLoadMarkers = debounce(async () => {
                                if (mapMode !== Modes.NORMAL) {
                                        return;
                                }

                                const center = mapInstance.getCenter();
                                const zoomLevel = mapInstance.map.getZoom();
                                await loadStopsAndAddMarkers(center.lat, center.lng, false, zoomLevel);
                        }, 300);

                        mapProvider.eventListeners(mapInstance, debouncedLoadMarkers);

                        if (browser) {
                                window.addEventListener('themeChange', handleThemeChange);
                        }
                } catch (error) {
                        console.error('Error initializing map:', error);
                }
        }

        async function loadStopsAndAddMarkers(lat, lng, firstCall = false, zoomLevel = 15) {
                const stopsData = await loadStopsForLocation(lat, lng, zoomLevel, firstCall);
                const newStops = stopsData.data.list;
                const routeReference = stopsData.data.references.routes || [];

                const routeLookup = new Map(routeReference.map((route) => [route.id, route]));

                // merge the stops routeIds with the route data and deduplicate efficiently
                newStops.forEach((stop) => {
                        if (!allStopsMap.has(stop.id)) {
                                stop.routes =
                                        stop.routeIds?.map((routeId) => routeLookup.get(routeId)).filter(Boolean) || [];
                                allStopsMap.set(stop.id, stop);
                        }
                });

                allStops = Array.from(allStopsMap.values());
        }

        function clearAllMarkers() {
                if (mapInstance && mapInstance.clearAllStopMarkers) {
                        mapInstance.clearAllStopMarkers();
                }
        }

        function updateMarkers() {
                if (!selectedRoute && !isTripPlanModeActive) {
                        batchAddMarkers(allStops);
                }
        }

        // Batch operation to add multiple markers efficiently
        function batchAddMarkers(stops) {
                const stopsToAdd = stops.filter((s) => !mapInstance.hasMarker(s.id));

                if (stopsToAdd.length === 0) {
                        return;
                }

                // Group DOM operations to minimize reflows/repaints
                requestAnimationFrame(() => {
                        stopsToAdd.forEach((s) => addMarker(s));
                });
        }

        function addMarker(s) {
                if (!mapInstance) {
                        console.error('Map not initialized yet');
                        return;
                }

                if (mapInstance.hasMarker(s.id)) {
                        return;
                }

                // Check if this marker should be highlighted (if it's the currently selected stop)
                const shouldHighlight = stop && s.id === stop.id;

                const markerObj = mapInstance.addMarker({
                        position: { lat: s.lat, lng: s.lon },
                        stop: s,
                        isHighlighted: shouldHighlight,
                        onClick: () => {
                                handleStopMarkerSelect(s);
                        }
                });

                return markerObj;
        }

        function handleThemeChange(event) {
                const { darkMode } = event.detail;
                mapInstance.setTheme(darkMode ? 'dark' : 'light');
        }

        function handleLocationObtained(latitude, longitude) {
                mapInstance.setCenter({ lat: latitude, lng: longitude });
                mapInstance.addUserLocationMarker({ lat: latitude, lng: longitude });
                userLocation.set({ lat: latitude, lng: longitude });
        }

        // Store event handlers for proper cleanup
        let planTripHandler, tabSwitchHandler;

        onMount(async () => {
                await initMap();
                isMapLoaded.set(true);
                if (browser) {
                        const darkMode = document.documentElement.classList.contains('dark');

                        // Store handlers for cleanup
                        planTripHandler = () => {
                                isTripPlanModeActive = true;
                        };
                        tabSwitchHandler = () => {
                                isTripPlanModeActive = false;
                        };

                        window.addEventListener('planTripTabClicked', planTripHandler);
                        window.addEventListener('tabSwitched', tabSwitchHandler);

                        const event = new CustomEvent('themeChange', { detail: { darkMode } });
                        window.dispatchEvent(event);
                }
        });

        onDestroy(() => {
                if (browser) {
                        window.removeEventListener('themeChange', handleThemeChange);

                        if (planTripHandler) window.removeEventListener('planTripTabClicked', planTripHandler);
                        if (tabSwitchHandler) window.removeEventListener('tabSwitched', tabSwitchHandler);
                }

                if (modeChangeTimeout) {
                        clearTimeout(modeChangeTimeout);
                }

                clearAllMarkers();

                allStopsMap.clear();
                stopsCache.clear();
        });
</script>

<div class="map-container">
        <div id="map" bind:this={mapElement}></div>

        {#if selectedTrip && showRouteMap}
                <RouteMap mapProvider={mapInstance} tripId={selectedTrip.tripId} currentSelectedStop={stop} />
        {/if}
</div>

<div class="controls">
        <LocationButton {handleLocationObtained} />
</div>

<style>
        .map-container {
                position: relative;
                height: 100%;
                width: 100%;
                z-index: 1;
        }
        #map {
                height: 100%;
                width: 100%;
        }
</style>

1	<script>	×
2	import { browser } from '$app/environment';
3	import { onMount, onDestroy } from 'svelte';
4	import {
5	PUBLIC_OBA_REGION_CENTER_LAT as initialLat,
6	PUBLIC_OBA_REGION_CENTER_LNG as initialLng
7	} from '$env/static/public';
8
9	import { debounce } from '$lib/utils';
10	import LocationButton from '$lib/LocationButton/LocationButton.svelte';
11	import RouteMap from './RouteMap.svelte';
12
13	import { isMapLoaded } from '$src/stores/mapStore';
14	import { userLocation } from '$src/stores/userLocationStore';
15	/**
16	* @typedef {Object} Props
17	* @property {any} [selectedTrip]
18	* @property {any} [selectedRoute]
19	* @property {boolean} [showRoute]
20	* @property {boolean} [showRouteMap]
21	* @property {any} [mapProvider]
22	* @property {any} [stop] - Currently selected stop to preserve visual context
23	*/
24
25	/** @type {Props} */
26	let {
27	handleStopMarkerSelect,
28	selectedTrip = null,	×
29	selectedRoute = null,	×
NEW 30	isRouteSelected = false,	×
31	showRouteMap = false,	×
NEW 32	mapProvider = null,	×
NEW 33	stop = null	×
34	} = $props();
35
36	let isTripPlanModeActive = $state(false);	×
37	let mapInstance = $state(null);	×
38	let mapElement = $state();	×
39	let allStops = $state([]);	×
40	// O(1) lookup for existing stops
41	let allStopsMap = new Map();	×
42	let stopsCache = new Map();	×
43
NEW 44	const Modes = {	×
NEW 45	NORMAL: 'normal',	×
NEW 46	TRIP_PLAN: 'tripPlan',	×
NEW 47	ROUTE: 'route'	×
48	};
49
NEW 50	let mapMode = $state(Modes.NORMAL);	×
NEW 51	let modeChangeTimeout = null;	×
52
NEW 53	$effect(() => {	×
NEW 54	let newMode;	×
NEW 55	if (isTripPlanModeActive) {	×
NEW 56	newMode = Modes.TRIP_PLAN;	×
NEW 57	} else if (selectedRoute \|\| isRouteSelected \|\| showRouteMap \|\| selectedTrip) {	×
NEW 58	newMode = Modes.ROUTE;	×
59	} else {
NEW 60	newMode = Modes.NORMAL;	×
61	}
NEW 62	if (modeChangeTimeout) {	×
NEW 63	clearTimeout(modeChangeTimeout);	×
64	}
NEW 65	if (mapMode === Modes.ROUTE && newMode === Modes.NORMAL) {	×
NEW 66	modeChangeTimeout = setTimeout(() => {	×
NEW 67	mapMode = newMode;	×
NEW 68	}, 100);	×
NEW 69	} else if (mapMode !== newMode) {	×
NEW 70	mapMode = newMode;	×
71	}
72	});
73
NEW 74	$effect(() => {	×
NEW 75	if (!mapInstance) return;	×
NEW 76	if (mapMode === Modes.NORMAL) {	×
NEW 77	batchAddMarkers(allStops);	×
78	} else {
NEW 79	clearAllMarkers();	×
80	}
81	});
82
83	function cacheKey(zoomLevel, boundingBox) {	×
84	const multiplier = 100; // 2 decimal places	×
85	const north = Math.round(boundingBox.north * multiplier);	×
86	const south = Math.round(boundingBox.south * multiplier);	×
87	const east = Math.round(boundingBox.east * multiplier);	×
88	const west = Math.round(boundingBox.west * multiplier);	×
89
90	return `${north}_${south}_${east}_${west}_${zoomLevel}`;	×
91	}
92
93	function getBoundingBox() {	×
94	if (!mapProvider) {	×
95	throw new Error('Map provider is not initialized');	×
96	}
97	return mapProvider.getBoundingBox();	×
98	}
99
100	async function loadStopsForLocation(lat, lng, zoomLevel, firstCall = false) {	×
101	if (firstCall) {	×
102	const response = await fetch(`/api/oba/stops-for-location?lat=${lat}&lng=${lng}&radius=2500`);	×
103	if (!response.ok) {	×
104	throw new Error('Failed to fetch locations');	×
105	}
106	return await response.json();	×
107	}
108
109	const boundingBox = getBoundingBox();	×
110	const key = cacheKey(zoomLevel, boundingBox);	×
111
112	if (stopsCache.has(key)) {	×
113	console.debug('Stop cache hit: ', key);	×
114	return stopsCache.get(key);	×
115	} else {
116	console.debug('Stop cache miss: ', key);	×
117	}
118
119	const response = await fetch(	×
120	`/api/oba/stops-for-location?lat=${lat}&lng=${lng}&latSpan=${boundingBox.north - boundingBox.south}&lngSpan=${boundingBox.east - boundingBox.west}&radius=1500`	×
121	);
122
123	if (!response.ok) {	×
124	throw new Error('Failed to fetch locations');	×
125	}
126
127	const stopsForLocation = await response.json();	×
128	stopsCache.set(key, stopsForLocation);	×
129
130	return stopsForLocation;	×
131	}
132
133	async function initMap() {	×
134	try {
135	await mapProvider.initMap(mapElement, {	×
136	lat: Number(initialLat),	×
137	lng: Number(initialLng)	×
138	});
139
140	mapInstance = mapProvider;	×
141
142	await loadStopsAndAddMarkers(initialLat, initialLng, true);	×
143
144	const debouncedLoadMarkers = debounce(async () => {	×
NEW 145	if (mapMode !== Modes.NORMAL) {	×
146	return;
147	}
148
NEW 149	const center = mapInstance.getCenter();	×
NEW 150	const zoomLevel = mapInstance.map.getZoom();	×
151	await loadStopsAndAddMarkers(center.lat, center.lng, false, zoomLevel);	×
152	}, 300);	×
153
154	mapProvider.eventListeners(mapInstance, debouncedLoadMarkers);	×
155
156	if (browser) {	×
157	window.addEventListener('themeChange', handleThemeChange);	×
158	}
159	} catch (error) {	×
160	console.error('Error initializing map:', error);	×
161	}
162	}
163
164	async function loadStopsAndAddMarkers(lat, lng, firstCall = false, zoomLevel = 15) {	×
165	const stopsData = await loadStopsForLocation(lat, lng, zoomLevel, firstCall);	×
166	const newStops = stopsData.data.list;	×
167	const routeReference = stopsData.data.references.routes \|\| [];	×
168
169	const routeLookup = new Map(routeReference.map((route) => [route.id, route]));	×
170
171	// merge the stops routeIds with the route data and deduplicate efficiently
172	newStops.forEach((stop) => {	×
173	if (!allStopsMap.has(stop.id)) {	×
174	stop.routes =	×
175	stop.routeIds?.map((routeId) => routeLookup.get(routeId)).filter(Boolean) \|\| [];	×
176	allStopsMap.set(stop.id, stop);	×
177	}
178	});
179
180	allStops = Array.from(allStopsMap.values());	×
181	}
182
183	function clearAllMarkers() {	×
184	if (mapInstance && mapInstance.clearAllStopMarkers) {	×
185	mapInstance.clearAllStopMarkers();	×
186	}
187	}
188
189	function updateMarkers() {	×
190	if (!selectedRoute && !isTripPlanModeActive) {	×
191	batchAddMarkers(allStops);	×
192	}
193	}
194
195	// Batch operation to add multiple markers efficiently
196	function batchAddMarkers(stops) {	×
197	const stopsToAdd = stops.filter((s) => !mapInstance.hasMarker(s.id));	×
198
NEW 199	if (stopsToAdd.length === 0) {	×
200	return;
201	}
202
203	// Group DOM operations to minimize reflows/repaints
204	requestAnimationFrame(() => {	×
205	stopsToAdd.forEach((s) => addMarker(s));	×
206	});
207	}
208
209	function addMarker(s) {	×
210	if (!mapInstance) {	×
211	console.error('Map not initialized yet');	×
212	return;
213	}
214
UNCOV 215	if (mapInstance.hasMarker(s.id)) {	×
216	return;
217	}
218
219	// Check if this marker should be highlighted (if it's the currently selected stop)
NEW 220	const shouldHighlight = stop && s.id === stop.id;	×
221
222	const markerObj = mapInstance.addMarker({	×
223	position: { lat: s.lat, lng: s.lon },	×
224	stop: s,	×
NEW 225	isHighlighted: shouldHighlight,	×
226	onClick: () => {	×
227	handleStopMarkerSelect(s);	×
228	}
229	});
230
231	return markerObj;	×
232	}
233
234	function handleThemeChange(event) {	×
235	const { darkMode } = event.detail;	×
236	mapInstance.setTheme(darkMode ? 'dark' : 'light');	×
237	}
238
239	function handleLocationObtained(latitude, longitude) {	×
240	mapInstance.setCenter({ lat: latitude, lng: longitude });	×
241	mapInstance.addUserLocationMarker({ lat: latitude, lng: longitude });	×
242	userLocation.set({ lat: latitude, lng: longitude });	×
243	}
244
245	// Store event handlers for proper cleanup
246	let planTripHandler, tabSwitchHandler;	×
247
248	onMount(async () => {	×
249	await initMap();	×
250	isMapLoaded.set(true);	×
251	if (browser) {	×
252	const darkMode = document.documentElement.classList.contains('dark');	×
253
254	// Store handlers for cleanup
255	planTripHandler = () => {	×
256	isTripPlanModeActive = true;	×
257	};
258	tabSwitchHandler = () => {	×
259	isTripPlanModeActive = false;	×
260	};
261
262	window.addEventListener('planTripTabClicked', planTripHandler);	×
263	window.addEventListener('tabSwitched', tabSwitchHandler);	×
264
265	const event = new CustomEvent('themeChange', { detail: { darkMode } });	×
266	window.dispatchEvent(event);	×
267	}
268	});
269
270	onDestroy(() => {	×
271	if (browser) {	×
272	window.removeEventListener('themeChange', handleThemeChange);	×
273
274	if (planTripHandler) window.removeEventListener('planTripTabClicked', planTripHandler);	×
275	if (tabSwitchHandler) window.removeEventListener('tabSwitched', tabSwitchHandler);	×
276	}
277
NEW 278	if (modeChangeTimeout) {	×
NEW 279	clearTimeout(modeChangeTimeout);	×
280	}
281
UNCOV 282	clearAllMarkers();	×
283
284	allStopsMap.clear();	×
285	stopsCache.clear();	×
286	});
287	</script>
288
289	<div class="map-container">
290	<div id="map" bind:this={mapElement}></div>	×
291
292	{#if selectedTrip && showRouteMap}	×
NEW 293	<RouteMap mapProvider={mapInstance} tripId={selectedTrip.tripId} currentSelectedStop={stop} />	×
294	{/if}
295	</div>
296
297	<div class="controls">
298	<LocationButton {handleLocationObtained} />
299	</div>
300
301	<style>
302	.map-container {
303	position: relative;
304	height: 100%;
305	width: 100%;
306	z-index: 1;
307	}
308	#map {
309	height: 100%;
310	width: 100%;
311	}
312	</style>

OneBusAway / wayfinder / 18223916783

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous