Update src/streamlit_app.py

src/streamlit_app.py

@@ -1,6 +1,7 @@
 import os
+from pathlib import Path
 
-# 🛡️ SUPPRESS Streamlit telemetry and permission errors
+# ── SUPPRESS telemetry & permission errors ─────────────────────────────────
 os.environ["HOME"] = "/tmp"
 os.environ["XDG_CONFIG_HOME"] = "/tmp"
 os.environ["XDG_CACHE_HOME"] = "/tmp"
@@ -17,35 +18,38 @@ from datetime import datetime, timedelta
 import warnings
 warnings.filterwarnings("ignore")
 
-# Page config
+# ── PATH SETUP ───────────────────────────────────────────────────────────────
+# project root is two levels up from this file (src/)
+ROOT_DIR = Path(__file__).resolve().parent.parent
+DATA_DIR = ROOT_DIR / "data"
+
+# ── STREAMLIT CONFIG ─────────────────────────────────────────────────────────
 st.set_page_config(
     page_title="MODA Multimodal Routing",
     layout="wide",
     initial_sidebar_state="expanded"
 )
 
-# ─── Data Loading ───────────────────────────────────────────────────────────
+# ── LOAD DATA ─────────────────────────────────────────────────────────────────
 @st.cache_data
 def load_data():
-    """Load CSVs from data/ folder in repo root."""
-    dfs = {
-        "gdf_poi": pd.read_csv("data/poi_places.csv"),
-        "gdf_nodes": pd.read_csv("data/road_nodes.csv"),
-        "gdf_edges": pd.read_csv("data/road_edges.csv")
-    }
-    # normalize column names
-    for k, df in dfs.items():
-        df.columns = [c.lower() for c in df.columns]
-    return dfs
+    """
+    Load POI and road network CSVs from data/ directory under project root.
+    """
+    # load and lowercase columns
+    gdf_poi   = pd.read_csv(DATA_DIR / "poi_places.csv").rename(columns=str.lower)
+    gdf_nodes = pd.read_csv(DATA_DIR / "road_nodes.csv").rename(columns=str.lower)
+    gdf_edges = pd.read_csv(DATA_DIR / "road_edges.csv").rename(columns=str.lower)
+    return gdf_poi, gdf_nodes, gdf_edges
 
-# ─── Build Graph ────────────────────────────────────────────────────────────
+# ── BUILD GRAPH ─────────────────────────────────────────────────────────────
 @st.cache_data
 def build_graph(gdf_nodes, gdf_edges, gdf_poi):
     G = nx.Graph()
     # add road nodes
     for _, r in gdf_nodes.iterrows():
-        G.add_node(r.osmid, x=r.geometry.x, y=r.geometry.y)
-    # add edges
+        G.add_node(r.osmid, x=r.x, y=r.y)
+    # add road edges
     for _, r in gdf_edges.iterrows():
         if pd.notna(r.length):
             G.add_edge(r.u, r.v, length=r.length)
@@ -53,7 +57,7 @@ def build_graph(gdf_nodes, gdf_edges, gdf_poi):
     for idx, r in gdf_poi.iterrows():
         nid = f"poi_{idx}"
         G.add_node(nid, x=r.longitude, y=r.latitude, name=r.name)
-    # connect POIs to nearest road
+    # connect POI to nearest road node
     road_list = [(n, d['y'], d['x']) for n, d in G.nodes(data=True) if isinstance(n, (int, float))]
     for idx, r in gdf_poi.iterrows():
         nid = f"poi_{idx}"
@@ -64,33 +68,30 @@ def build_graph(gdf_nodes, gdf_edges, gdf_poi):
         G.add_edge(nearest, nid, length=dist)
     return G
 
-# ─── Routing Helpers ────────────────────────────────────────────────────────
+# ── ROUTING HELPERS ─────────────────────────────────────────────────────────
 def get_poi_id(name, gdf_poi):
-    df = gdf_poi[gdf_poi.name.str.lower().str.strip() == name.lower().strip()]
-    return f"poi_{df.index[0]}" if not df.empty else None
+    match = gdf_poi[gdf_poi.name.str.lower().str.strip() == name.lower().strip()]
+    return f"poi_{match.index[0]}" if not match.empty else None
 
-# ─── Compute Paths ──────────────────────────────────────────────────────────
 def compute_route(G, start_id, end_id, speed_kmh):
     path = nx.shortest_path(G, start_id, end_id, weight='length')
-    dist_m = nx.shortest_path_length(G, start_id, end_id, weight='length')
-    km = dist_m/1000
-    time_min = km / speed_kmh * 60
-    return path, km, time_min
+    d_m = nx.shortest_path_length(G, start_id, end_id, weight='length')
+    km = d_m/1000
+    t_min = km/speed_kmh*60
+    return path, km, t_min
 
-# ─── Streamlit UI ───────────────────────────────────────────────────────────
+# ── STREAMLIT APP ────────────────────────────────────────────────────────────
 # load data
-dfs = load_data()
-gdf_poi = dfs['gdf_poi']
-gdf_nodes = dfs['gdf_nodes']
-gdf_edges = dfs['gdf_edges']
+gdf_poi, gdf_nodes, gdf_edges = load_data()
 
 # sidebar inputs
 st.sidebar.header("📍 Input Rute")
-poi_list = gdf_poi['name'].tolist()
+poi_list = gdf_poi.name.tolist()
 start = st.sidebar.selectbox("Dari:", poi_list)
 end = st.sidebar.selectbox("Ke:", poi_list, index=1)
 time_input = st.sidebar.time_input("Waktu Berangkat", value=datetime.now().time())
 
+# main
 if st.sidebar.button("🔍 Cari Rute"):
     G = build_graph(gdf_nodes, gdf_edges, gdf_poi)
     s_id = get_poi_id(start, gdf_poi)
@@ -99,28 +100,22 @@ if st.sidebar.button("🔍 Cari Rute"):
         st.sidebar.error("Pilih lokasi yang valid.")
     else:
         # Drive
-        path_d, d_km, t_min = compute_route(G, s_id, e_id, speed_kmh=30)
-        cost = int(d_km*3000)
+        path_d, km_d, t_d = compute_route(G, s_id, e_id, speed_kmh=30)
+        cost = int(km_d*3000)
         st.subheader("🚗 Drive Mode")
-        st.write(f"Jarak: **{d_km:.2f} km**")
-        st.write(f"Waktu: **{t_min:.1f} menit**")
-        st.write(f"Biaya: **{cost:,} IDR**")
+        st.write(f"**Jarak:** {km_d:.2f} km  •  **Waktu:** {t_d:.1f} menit  •  **Biaya:** {cost:,} IDR")
         m1 = folium.Map(location=[gdf_poi.latitude.mean(), gdf_poi.longitude.mean()], zoom_start=13)
-        coords = [(G.nodes[n]['y'], G.nodes[n]['x']) for n in path_d]
-        folium.PolyLine(coords, color='blue', weight=4).add_to(m1)
-        st_folium(m1, width=700, height=500)
+        coords1 = [(G.nodes[n]['y'], G.nodes[n]['x']) for n in path_d]
+        folium.PolyLine(coords1, color='blue', weight=4).add_to(m1)
+        st_folium(m1, width=700, height=400)
         # Bus
-        path_b, b_km, b_min = compute_route(G, s_id, e_id, speed_kmh=25)
-        arrival = (datetime.combine(datetime.today(), time_input) + timedelta(minutes=b_min)).time()
+        path_b, km_b, t_b = compute_route(G, s_id, e_id, speed_kmh=25)
+        arrival = (datetime.combine(datetime.today(), time_input) + timedelta(minutes=t_b)).time()
         st.subheader("🚌 Bus Mode")
-        st.write(f"Jarak: **{b_km:.2f} km**")
-        st.write(f"Waktu: **{b_min:.1f} menit**")
-        st.write(f"Tiba: **{arrival.strftime('%H:%M')}**")
-        st.write("Biaya: **3500 IDR**")
+        st.write(f"**Jarak:** {km_b:.2f} km  •  **Waktu:** {t_b:.1f} menit  •  **Tiba:** {arrival.strftime('%H:%M')}  •  **Biaya:** 3,500 IDR")
         m2 = folium.Map(location=[gdf_poi.latitude.mean(), gdf_poi.longitude.mean()], zoom_start=13)
         coords2 = [(G.nodes[n]['y'], G.nodes[n]['x']) for n in path_b]
         folium.PolyLine(coords2, color='green', weight=4).add_to(m2)
-        st_folium(m2, width=700, height=500)
-
+        st_folium(m2, width=700, height=400)
 else:
     st.info("Pilih rute dan klik **Cari Rute** di sidebar.")