Merge pull request #34 from OneBusAway/feature/integrate-sdk

Feature/integrate-sdk

package.json

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

src/components/oba/StopPane.svelte

@@ -20,7 +20,9 @@
 
 	async function loadData(stopID) {
 		loading = true;
+
 		const response = await fetch(`/api/oba/arrivals-and-departures-for-stop/${stopID}`);
+
 		if (response.ok) {
 			arrivalsAndDeparturesResponse = await response.json();
 			arrivalsAndDepartures = arrivalsAndDeparturesResponse.data.entry;

src/lib/RestAPI/arrivalsAndDeparturesForStop.js

@@ -1,17 +1,20 @@
 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) {
-	const apiURL = `${baseURL}/api/where/arrivals-and-departures-for-stop/${stopID}.json?key=${apiKey}`;
-	const response = await fetch(apiURL);
+	const response = await oba.arrivalAndDeparture.list(stopID);
 
-	if (!response.ok) {
+	if (response.code !== 200) {
 		error(500, 'Unable to fetch arrivals-and-departures-for-stop.');
-		return;
 	}
 
-	const data = await response.json();
-	return json(data);
+	return json(response);
 }

src/lib/RestAPI/stop.js

@@ -2,15 +2,19 @@ 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) {
-	const apiURL = `${baseURL}/api/where/stop/${stopID}.json?key=${apiKey}`;
-	const response = await fetch(apiURL);
+	const response = await oba.stop.retrieve(stopID);
 
-	if (!response.ok) {
-		return error(500, 'Unable to fetch arrivals-and-departures-for-stop.');
+	if (response.code !== 200) {
+		error(500, 'Unable to fetch arrivals-and-departures-for-stop.');
 	}
 
-	const data = await response.json();
-	return json(data);
+	return json(response);
 }