website: Revive ISB bus timings

Straightforward changes necessary to bring back bus timings in Venues.
Most of the work was done by @kagiura in PR #3172.
I'm mainly bringing in the bus stop data and API changes and gluing it
together to make it work with the original bus timing feature.

Author: zwliew

website/package.json

@@ -46,7 +46,7 @@
     "@types/enzyme": "3.10.18",
     "@types/jest": "29.5.14",
     "@types/json2mq": "0.2.2",
-    "@types/leaflet": "1.9.12",
+    "@types/leaflet": "1.9.14",
     "@types/lodash": "4.14.197",
     "@types/mousetrap": "1.6.15",
     "@types/no-scroll": "2.1.2",

website/scripts/download-bus-stops.js

@@ -1,3 +1,5 @@
+// TODO: This script is outdated and needs work to make it work with the new API.
+
 const path = require('path');
 const axios = require('axios');
 const fs = require('fs-extra');

website/src/apis/nextbus.ts

@@ -2,7 +2,7 @@ import axios from 'axios';
 
 import { NextBus, NextBusTime, NextBusTimings } from 'types/venues';
 
-const baseUrl = 'https://nextbus.nusmods.com';
+const baseUrl = 'https://nnextbus.nusmods.com';
 
 interface ShuttleServiceResult {
   caption: string;
@@ -25,24 +25,18 @@ function convertArrivalTime(arrivalTime: string): NextBusTime {
   throw new Error(`Unknown arrival time ${arrivalTime}`);
 }
 
-export function nextBus(code: string): Promise<NextBusTimings> {
-  const url = `${baseUrl}/arrival`;
-  return axios
-    .get<{
-      ShuttleServiceResult: ShuttleServiceResult;
-    }>(url, { params: { busstopname: code } })
-    .then((response) => {
-      const shuttles: NextBusTimings = {};
-
-      response.data.ShuttleServiceResult.shuttles.forEach((arrival: Shuttle) => {
-        const timing: NextBus = {
-          arrivalTime: convertArrivalTime(arrival.arrivalTime),
-          nextArrivalTime: convertArrivalTime(arrival.nextArrivalTime),
-        };
-
-        shuttles[arrival.name] = timing;
-      });
-
-      return shuttles;
-    });
+export async function nextBus(name: string): Promise<NextBusTimings> {
+  const url = `${baseUrl}/ShuttleService?busstopname=${name}`;
+  const response = await axios.get<{
+    ShuttleServiceResult: ShuttleServiceResult;
+  }>(url, { params: { busstopname: name } });
+  const shuttles: NextBusTimings = {};
+  response.data.ShuttleServiceResult.shuttles.forEach((arrival: Shuttle) => {
+    const timing: NextBus = {
+      arrivalTime: convertArrivalTime(arrival.arrivalTime),
+      nextArrivalTime: convertArrivalTime(arrival.nextArrivalTime),
+    };
+    shuttles[arrival.name] = timing;
+  });
+  return shuttles;
 }