mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
refactor: separate traffic and bikeshare components
This commit is contained in:
1 parent
3143d00c90
commit
903fe6ba37
45 files changed
+6159
-4363
No files matched your search
@@ -0,0 +1,212 @@
|
||||
import { CITY_BY_ID } from './registry.js';
|
||||
|
||||
export function createIngestion({
|
||||
state: layerState,
|
||||
services,
|
||||
parts,
|
||||
source,
|
||||
}) {
|
||||
/**
|
||||
* Convert an upstream GBFS URL into a local proxy URL.
|
||||
* The dev server proxies /api/gbfs/* to avoid CORS issues with third-party feeds.
|
||||
* @param {string} upstreamUrl - Full HTTPS GBFS endpoint URL.
|
||||
* @returns {string} Relative proxy URL.
|
||||
*/
|
||||
|
||||
function toProxyUrl(upstreamUrl) {
|
||||
return `/api/gbfs/${encodeURIComponent(upstreamUrl)}`;
|
||||
}
|
||||
|
||||
/** Increment the loading reference count and mark loading state active. */
|
||||
|
||||
function beginLoading() {
|
||||
layerState._loadingOps++;
|
||||
layerState._loading = true;
|
||||
}
|
||||
|
||||
/** Decrement the loading reference count; clear loading flag when zero. */
|
||||
|
||||
function endLoading() {
|
||||
layerState._loadingOps = Math.max(0, layerState._loadingOps - 1);
|
||||
layerState._loading = layerState._loadingOps > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch and parse JSON from a GBFS endpoint via the local proxy.
|
||||
* @param {string} upstreamUrl - Full HTTPS GBFS endpoint URL.
|
||||
* @param {Object} [options]
|
||||
* @param {AbortSignal} [options.signal] - Optional abort signal for cancellation.
|
||||
* @returns {Promise<Object>} Parsed JSON payload.
|
||||
* @throws {Error} On non-OK HTTP status or malformed JSON.
|
||||
*/
|
||||
|
||||
async function fetchGbfsJson(upstreamUrl, options) {
|
||||
return source.getStations(upstreamUrl, options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Abort an in-flight GBFS request for a specific city and remove it from the map.
|
||||
* @param {Map<string, { controller: AbortController }>} map - In-flight request map.
|
||||
* @param {string} cityId - City whose request should be cancelled.
|
||||
*/
|
||||
|
||||
function abortInFlight(map, cityId) {
|
||||
const entry = map.get(cityId);
|
||||
if (!entry) return;
|
||||
try {
|
||||
entry.controller?.abort();
|
||||
} catch {
|
||||
// no-op
|
||||
}
|
||||
map.delete(cityId);
|
||||
}
|
||||
|
||||
/** Abort all in-flight station info and status requests across all cities. */
|
||||
|
||||
function abortAllInFlight() {
|
||||
for (const cityId of layerState._inFlightInfo.keys())
|
||||
abortInFlight(layerState._inFlightInfo, cityId);
|
||||
for (const cityId of layerState._inFlightStatus.keys())
|
||||
abortInFlight(layerState._inFlightStatus, cityId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Load station information for a city. Returns cached data if available,
|
||||
* deduplicates concurrent requests, and caches the result on success.
|
||||
* Station info is static metadata (location, name, capacity) and is
|
||||
* fetched once per city per session.
|
||||
* @param {string} cityId - City identifier.
|
||||
* @param {number} generation - Proximity generation to detect stale requests.
|
||||
* @returns {Promise<Map<string, Object>>} Map of stationId to station info.
|
||||
* @throws {Error} On unknown city, fetch failure, or empty station list.
|
||||
*/
|
||||
|
||||
async function loadCityStationInfo(cityId, generation) {
|
||||
if (layerState._stationInfoCache.has(cityId))
|
||||
return layerState._stationInfoCache.get(cityId);
|
||||
const inFlight = layerState._inFlightInfo.get(cityId);
|
||||
if (inFlight) return inFlight.promise;
|
||||
|
||||
const city = CITY_BY_ID.get(cityId);
|
||||
if (!city) throw new Error(`Unknown GBFS city "${cityId}"`);
|
||||
const controller = new AbortController();
|
||||
|
||||
const promise = (async () => {
|
||||
beginLoading();
|
||||
try {
|
||||
const payload = await fetchGbfsJson(city.stationInformationUrl, {
|
||||
signal: controller.signal,
|
||||
});
|
||||
const stationMap = parts.model.parseStationInformation(payload);
|
||||
if (stationMap.size === 0) {
|
||||
throw new Error(`No station information for ${city.city}`);
|
||||
}
|
||||
layerState._stationInfoCache.set(cityId, stationMap);
|
||||
return stationMap;
|
||||
} finally {
|
||||
endLoading();
|
||||
}
|
||||
})().finally(() => {
|
||||
// Clean up in-flight entry only if it is still ours (not replaced by a newer request)
|
||||
const current = layerState._inFlightInfo.get(cityId);
|
||||
if (current && current.controller === controller)
|
||||
layerState._inFlightInfo.delete(cityId);
|
||||
});
|
||||
|
||||
layerState._inFlightInfo.set(cityId, { promise, controller, generation });
|
||||
return promise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load real-time station status for a city (bike/dock counts, operational flags).
|
||||
* Unlike station info, status is NOT served from cache — it is always re-fetched
|
||||
* to keep availability data current. Concurrent requests are deduplicated.
|
||||
* @param {string} cityId - City identifier.
|
||||
* @param {number} generation - Proximity generation to detect stale requests.
|
||||
* @returns {Promise<Map<string, Object>>} Map of stationId to status objects.
|
||||
* @throws {Error} On unknown city or fetch failure.
|
||||
*/
|
||||
|
||||
async function loadCityStationStatus(cityId, generation) {
|
||||
const inFlight = layerState._inFlightStatus.get(cityId);
|
||||
if (inFlight) return inFlight.promise;
|
||||
|
||||
const city = CITY_BY_ID.get(cityId);
|
||||
if (!city) throw new Error(`Unknown GBFS city "${cityId}"`);
|
||||
const controller = new AbortController();
|
||||
|
||||
const promise = (async () => {
|
||||
beginLoading();
|
||||
try {
|
||||
const payload = await fetchGbfsJson(city.stationStatusUrl, {
|
||||
signal: controller.signal,
|
||||
});
|
||||
const statusMap = parts.model.parseStationStatus(payload);
|
||||
layerState._statusCache.set(cityId, {
|
||||
statusMap,
|
||||
timestamp: Date.now(),
|
||||
});
|
||||
return statusMap;
|
||||
} finally {
|
||||
endLoading();
|
||||
}
|
||||
})().finally(() => {
|
||||
const current = layerState._inFlightStatus.get(cityId);
|
||||
if (current && current.controller === controller)
|
||||
layerState._inFlightStatus.delete(cityId);
|
||||
});
|
||||
|
||||
layerState._inFlightStatus.set(cityId, { promise, controller, generation });
|
||||
return promise;
|
||||
}
|
||||
const methods = {
|
||||
/**
|
||||
* Periodic update tick — re-fetches station status for all active cities
|
||||
* and refreshes point colors/sizes. Called by the layer manager at
|
||||
* STATUS_POLL_MS intervals.
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async update() {
|
||||
if (!layerState._enabled || layerState._activeCityIds.size === 0) return;
|
||||
|
||||
const generation = layerState._proximityGeneration;
|
||||
const cityIds = Array.from(layerState._activeCityIds);
|
||||
await Promise.all(
|
||||
cityIds.map(async (cityId) => {
|
||||
try {
|
||||
const statusMap = await loadCityStationStatus(cityId, generation);
|
||||
if (
|
||||
!layerState._enabled ||
|
||||
!layerState._activeCityIds.has(cityId) ||
|
||||
generation !== layerState._proximityGeneration
|
||||
)
|
||||
return;
|
||||
parts.rendering.applyStatusToPoints(cityId, statusMap);
|
||||
} catch (error) {
|
||||
if (error?.name === 'AbortError') return;
|
||||
console.warn(
|
||||
`[Data:Bikeshare] ${cityId} status update error:`,
|
||||
error,
|
||||
);
|
||||
layerState._error = 'GBFS status update failed';
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
layerState._count = layerState._stationRenderMap.size;
|
||||
if (layerState._count > 0) layerState._lastUpdate = Date.now();
|
||||
},
|
||||
};
|
||||
|
||||
return {
|
||||
toProxyUrl,
|
||||
beginLoading,
|
||||
endLoading,
|
||||
fetchGbfsJson,
|
||||
abortInFlight,
|
||||
abortAllInFlight,
|
||||
loadCityStationInfo,
|
||||
loadCityStationStatus,
|
||||
methods,
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user