refactor: Update all API fetches to use onebusaway-sdk

package.json

@@ -37,6 +37,6 @@
 	"type": "module",
 	"dependencies": {
 		"@fortawesome/free-regular-svg-icons": "^6.6.0",
-		"onebusaway-sdk": "^0.1.0-alpha.31"
+		"onebusaway-sdk": "^0.1.0-alpha.40"
 	}
 }

src/lib/RestAPI/arrivalsAndDeparturesForStop.js

@@ -1,17 +1,8 @@
 import { error, json } from '@sveltejs/kit';
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
+import oba from '../obaSdk';
 
-import onebusaway from 'onebusaway-sdk';
-
-const oba = new onebusaway({
-	baseURL,
-	apiKey
-});
-
-export default async function (stopID) {
+export default async function arrivalsAndDeparturesForStop(stopID) {
 	const response = await oba.arrivalAndDeparture.list(stopID);
-
 	if (response.code !== 200) {
 		error(500, 'Unable to fetch arrivals-and-departures-for-stop.');
 	}

src/lib/RestAPI/shape.js

@@ -0,0 +1,11 @@
+import oba from '../obaSdk';
+import { error, json } from '@sveltejs/kit';
+export default async function shape(shapeId) {
+	const response = await oba.shape.retrieve(shapeId);
+
+	if (response.code !== 200) {
+		return error(500, 'Unable to fetch shape.');
+	}
+
+	return json(response);
+}

src/lib/RestAPI/stop.js

@@ -1,19 +1,9 @@
+import oba from '../obaSdk';
 import { error, json } from '@sveltejs/kit';
-
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
-import onebusaway from 'onebusaway-sdk';
-
-const oba = new onebusaway({
-	baseURL,
-	apiKey
-});
-
-export default async function (stopID) {
+export default async function stop(stopID) {
 	const response = await oba.stop.retrieve(stopID);
-
 	if (response.code !== 200) {
-		error(500, 'Unable to fetch arrivals-and-departures-for-stop.');
+		error(500, 'Unable to fetch stop.');
 	}
 
 	return json(response);

src/lib/RestAPI/stops-for-location.js

@@ -0,0 +1,11 @@
+import oba from '../obaSdk';
+import { error, json } from '@sveltejs/kit';
+export default async function stopsForLocation(queryParams) {
+	const response = await oba.stopsForLocation.list(queryParams);
+
+	if (response.code !== 200) {
+		error(500, 'Unable to fetch stops-for-location.');
+	}
+
+	return json(response);
+}

src/lib/RestAPI/tripDetails.js

@@ -1,24 +1,10 @@
+import oba from '../obaSdk';
 import { error, json } from '@sveltejs/kit';
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
-
-export async function GET({ params, url }) {
-	const { tripId } = params;
-	const vehicleId = url.searchParams.get('vehicleId');
-	const serviceDate = url.searchParams.get('serviceDate');
-
-	let apiURL = `${baseURL}/api/where/trip-details/${tripId}.json?key=${apiKey}`;
-
-	if (vehicleId) apiURL += `&vehicleId=${vehicleId}`;
-	if (serviceDate) apiURL += `&serviceDate=${serviceDate}`;
-
-	const response = await fetch(apiURL);
-
-	if (!response.ok) {
+export default async function tripDetails(tripID, queryParams) {
+	const response = await oba.tripDetails.retrieve(tripID, queryParams);
+	if (response.code !== 200) {
 		error(500, 'Unable to fetch trip-details.');
-		return;
 	}
 
-	const data = await response.json();
-	return json(data);
+	return json(response);
 }

src/lib/obaSdk.js

@@ -0,0 +1,10 @@
+import onebusaway from 'onebusaway-sdk';
+import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
+import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
+
+const oba = new onebusaway({
+	baseURL,
+	apiKey
+});
+
+export default oba;

src/routes/api/oba/arrivals-and-departures-for-stop/[id]/+server.js

@@ -1,6 +1,8 @@
-import arrivalDepartureAPI from '$lib/RestAPI/arrivalsAndDeparturesForStop';
+import arrivalsAndDeparturesForStop from '$lib/RestAPI/arrivalsAndDeparturesForStop';
 
 /** @type {import('./$types').RequestHandler} */
+
 export async function GET({ params }) {
-	return arrivalDepartureAPI(params.id);
+	const stopID = params.id;
+	return arrivalsAndDeparturesForStop(stopID);
 }

src/routes/api/oba/shape/[shapeId]/+server.js

@@ -1,24 +1,6 @@
-import { error, json } from '@sveltejs/kit';
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
+import shape from '../../../../../lib/RestAPI/shape.js';
 
 export async function GET({ params }) {
-	const { shapeId } = params;
-
-	let apiURL = `${baseURL}/api/where/shape/${shapeId}.json?key=${apiKey}`;
-
-	try {
-		const response = await fetch(apiURL);
-		console.log('response:', response);
-
-		if (!response.ok) {
-			throw new Error(`HTTP error! status: ${response.status}`);
-		}
-
-		const data = await response.json();
-		return json(data);
-	} catch (err) {
-		console.error('Error fetching shape data:', err);
-		throw error(500, 'Unable to fetch shape data.');
-	}
+	const shapeId = params.shapeId;
+	return shape(shapeId);
 }

src/routes/api/oba/stop/[stopID]/+server.js

@@ -1,6 +1,8 @@
-import stopAPI from '$lib/RestAPI/stop';
-
 /** @type {import('./$types').RequestHandler} */
+
+import stop from '../../../../../lib/RestAPI/stop';
+
 export async function GET({ params }) {
-	return stopAPI(params.stopID);
+	const stopID = params.stopID;
+	return stop(stopID);
 }

src/routes/api/oba/stops-for-location/+server.js

@@ -1,21 +1,14 @@
-import { error, json } from '@sveltejs/kit';
-
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
+import stopsForLocation from '../../../../lib/RestAPI/stops-for-location.js';
 
 /** @type {import('./$types').RequestHandler} */
 export async function GET({ url }) {
-	const lat = url.searchParams.get('lat');
-	const lng = url.searchParams.get('lng');
-	const apiURL = `${baseURL}/api/where/stops-for-location.json?key=${apiKey}&lat=${lat}&lon=${lng}`;
-	const response = await fetch(apiURL);
+	const lat = +url.searchParams.get('lat');
+	const lng = +url.searchParams.get('lng');
 
-	if (!response.ok) {
-		error(500, 'Unable to fetch stops-for-location.');
-		return;
-	}
+	const queryParams = {
+		lat: lat,
+		lon: lng
+	};
 
-	const data = await response.json();
-	return json(data);
+	return stopsForLocation(queryParams);
 }

src/routes/api/oba/trip-details/[tripId]/+server.js

@@ -1,6 +1,4 @@
-import { error, json } from '@sveltejs/kit';
-import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
-import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
+import tripDetails from '../../../../../lib/RestAPI/tripDetails.js';
 
 export async function GET({ params, url }) {
 	const { tripId } = params;
@@ -11,34 +9,19 @@ export async function GET({ params, url }) {
 	const includeStatus = url.searchParams.get('includeStatus') || 'true';
 	const time = url.searchParams.get('time');
 
-	let apiURL = `${baseURL}/api/where/trip-details/${tripId}.json?key=${apiKey}`;
+	const queryParams = {
+		includeTrip,
+		includeSchedule,
+		includeStatus
+	};
 
-	if (serviceDate) apiURL += `&serviceDate=${serviceDate}`;
-	apiURL += `&includeTrip=${includeTrip}`;
-	apiURL += `&includeSchedule=${includeSchedule}`;
-	apiURL += `&includeStatus=${includeStatus}`;
-	if (time) apiURL += `&time=${time}`;
-
-	try {
-		const response = await fetch(apiURL);
-
-		if (!response.ok) {
-			throw new Error(`HTTP error! status: ${response.status}`);
-		}
-
-		const data = await response.json();
-
-		// Ensure stops are included in the references
-		if (!data.data.references || !data.data.references.stops) {
-			// If stops are not included, we might need to fetch them separately
-			// This is a placeholder for that logic
-			data.data.references = data.data.references || {};
-			data.data.references.stops = []; // Fetch stops here if needed
-		}
+	if (time) {
+		queryParams.time = time;
+	}
 
-		return json(data);
-	} catch (err) {
-		console.error('Error fetching trip details:', err);
-		throw error(500, 'Unable to fetch trip details.');
+	if (serviceDate) {
+		queryParams.serviceDate = serviceDate;
 	}
+
+	return tripDetails(tripId, queryParams);
 }

src/routes/stops/[stopID]/+page.server.js

@@ -1,11 +1,11 @@
-import stopAPI from '$lib/RestAPI/stop.js';
-import arrivalDepartureAPI from '$lib/RestAPI/arrivalsAndDeparturesForStop.js';
+import arrivalsAndDeparturesForStop from '../../../lib/RestAPI/arrivalsAndDeparturesForStop.js';
+import stop from '../../../lib/RestAPI/stop.js';
 
 export async function load({ params }) {
 	const stopID = params.stopID;
-	const stopResponse = await stopAPI(stopID);
+	const stopResponse = await stop(stopID);
 	const stopBody = await stopResponse.json();
-	const arrivalsAndDeparturesResponse = await arrivalDepartureAPI(stopID);
+	const arrivalsAndDeparturesResponse = await arrivalsAndDeparturesForStop(stopID);
 	const arrivalsAndDeparturesResponseJSON = await arrivalsAndDeparturesResponse.json();
 
 	return {