Update

app.py

@@ -7,8 +7,10 @@ import os
 import json
 import requests
 import streamlit as st
+from datetime import datetime
 
 nextbus_token = os.getenv("NEXTBUS_TOKEN")
+datamall_token = os.getenv("DATAMALL_TOKEN")
 
 def wide_space_default():
     st.set_page_config(layout='wide')
@@ -32,7 +34,7 @@ def get_all_stops():
     response = requests.request("GET", url, headers=headers, data=payload)
     return response.json()["BusStopsResult"]["busstops"]
 
-def get_bus_arrival(bus_stop_code):
+def get_nus_bus_arrival(bus_stop_code):
     url = f"https://nnextbus.nus.edu.sg/ShuttleService?busstopname={bus_stop_code}"
 
     payload = {}
@@ -51,81 +53,70 @@ def get_bus_arrival(bus_stop_code):
 
     return response.json()['ShuttleServiceResult']['shuttles']
 
+def get_lta_bus_arrival(bus_stop_code):
+    url = f"https://datamall2.mytransport.sg/ltaodataservice/v3/BusArrival?BusStopCode={bus_stop_code}"
+    payload = {}
+    headers = {
+        'AccountKey': datamall_token
+    }
+    response = requests.request("GET", url, headers=headers, data=payload)
+    return response.json()
+
+
 # stops = get_all_stops()
-stops = [
-            {
-                "caption": "COM 3",
-                "name": "COM3",
-                "LongName": "COM 3",
-                "ShortName": "COM 3",
-                "latitude": 1.294431,
-                "longitude": 103.775217
-            },
-            {
-                "caption": "Opp TCOMS",
-                "name": "TCOMS-OPP",
-                "LongName": "Opp TCOMS",
-                "ShortName": "Opp TCOMS",
-                "latitude": 1.293789,
-                "longitude": 103.776715
-            },
-            {
-                "caption": "TCOMS",
-                "name": "TCOMS",
-                "LongName": "TCOMS",
-                "ShortName": "TCOMS",
-                "latitude": 1.293654,
-                "longitude": 103.776898
-            },
-            {
-                "caption": "BIZ 2",
-                "name": "BIZ2",
-                "LongName": "BIZ 2",
-                "ShortName": "BIZ 2",
-                "latitude": 1.293273,
-                "longitude": 103.775074
-            },
-            {
-                "caption": "University Town",
-                "name": "UTOWN",
-                "LongName": "University Town",
-                "ShortName": "UTown",
-                "latitude": 1.303623,
-                "longitude": 103.774388
-            },
-            {
-                "caption": "Prince George's Park",
-                "name": "PGP",
-                "LongName": "Prince George's Park",
-                "ShortName": "PGP",
-                "latitude": 1.291765,
-                "longitude": 103.780419
-            },
-            {
-                "caption": "Prince George's Park Foyer",
-                "name": "PGPR",
-                "LongName": "Prince George's Park Foyer",
-                "ShortName": "PGP Foyer",
-                "latitude": 1.290994,
-                "longitude": 103.781153
-            },
-            {
-                "caption": "Opp Kent Ridge MRT",
-                "name": "KR-MRT-OPP",
-                "LongName": "Opp Kent Ridge MRT",
-                "ShortName": "Opp KR MRT",
-                "latitude": 1.294962,
-                "longitude": 103.784556
-            },
-            {
-                "caption": "Kent Ridge MRT",
-                "name": "KR-MRT",
-                "LongName": "Kent Ridge MRT",
-                "ShortName": "KR MRT",
-                "latitude": 1.29482,
-                "longitude": 103.784413
-            },
-        ]
+nus_stops = [
+    {
+        "caption": "COM 3",
+        "name": "COM3",
+        "LongName": "COM 3",
+        "ShortName": "COM 3",
+        "latitude": 1.294431,
+        "longitude": 103.775217
+    },
+    {
+        "caption": "Opp TCOMS",
+        "name": "TCOMS-OPP",
+        "LongName": "Opp TCOMS",
+        "ShortName": "Opp TCOMS",
+        "latitude": 1.293789,
+        "longitude": 103.776715
+    },
+    {
+        "caption": "TCOMS",
+        "name": "TCOMS",
+        "LongName": "TCOMS",
+        "ShortName": "TCOMS",
+        "latitude": 1.293654,
+        "longitude": 103.776898
+    },
+    {
+        "caption": "Prince George's Park",
+        "name": "PGP",
+        "LongName": "Prince George's Park",
+        "ShortName": "PGP",
+        "latitude": 1.291765,
+        "longitude": 103.780419
+    },
+    {
+        "caption": "Prince George's Park Foyer",
+        "name": "PGPR",
+        "LongName": "Prince George's Park Foyer",
+        "ShortName": "PGP Foyer",
+        "latitude": 1.290994,
+        "longitude": 103.781153
+    },
+]
+
+public_stops = [
+    {
+        'name': "Opp HMK",
+        'code': "16061"
+    },
+    {
+        'name': "HMK",
+        'code': "16069"
+    },
+]
 
 st.write(
     """
@@ -138,14 +129,14 @@ st.write(
     unsafe_allow_html=True,
 )
 
-
-for stop_info in stops:
-    shuttle_info = get_bus_arrival(stop_info['name'])
+# NUS Stops
+for stop_info in nus_stops:
+    shuttle_info = get_nus_bus_arrival(stop_info['name'])
     
     buses = list()
     
     for shuttle in shuttle_info:
-        if shuttle["_etas"] is None: continue
+        if "_etas" not in shuttle: continue
         for bus in shuttle["_etas"]:
             plate = bus["plate"]
             eta = bus["eta"]
@@ -160,7 +151,41 @@ for stop_info in stops:
     
     with st.container(border=True):
         cols = st.columns(6)
-        cols[0].metric("Bus Stop", stop_info['name'])
+        cols[0].metric("NUS Stop", stop_info['name'])
         
         for i, bus in enumerate(buses[:5]):
             cols[i+1].metric(bus['plate'], bus["shuttle_name"], str(bus["eta"]))
+            
+# Public Bus
+for stop_info in public_stops:
+    bus_info = get_lta_bus_arrival(stop_info['code'])
+    buses = list()
+    
+    for shuttle in bus_info["Services"]:
+        try:
+            service_no = shuttle["ServiceNo"]
+            for bus_seq in ['NextBus', 'NextBus2', 'NextBus3']:
+                bus_type = shuttle[bus_seq]['Type']
+                bus_load = shuttle[bus_seq]['Load']
+                arrival_time = datetime.fromisoformat(shuttle[bus_seq]['EstimatedArrival'])
+                now = datetime.now(arrival_time.tzinfo)
+                time_diff = arrival_time - now
+                eta = int(time_diff.total_seconds() / 60)
+                
+                buses.append({
+                    "service": service_no,
+                    "eta": eta,
+                    "type": f'{bus_type} - {bus_load}'
+                })
+        except Exception as e:
+            pass
+    
+    buses.sort(key=lambda x: x["eta"])
+    
+    with st.container(border=True):
+        cols = st.columns(6)
+        cols[0].metric("Public Stop", stop_info['name'])
+        
+        for i, bus in enumerate(buses[:5]):
+            cols[i+1].metric(bus["type"], bus['service'], bus["eta"])
+