Update app.py

app.py

@@ -1,59 +1,102 @@
 import streamlit as st
 import openrouteservice
 from openrouteservice import convert
+import requests
+from geopy.geocoders import Nominatim
 import folium
 from streamlit_folium import st_folium
+import os
 
-# Load API key from Streamlit secrets
-ORS_API_KEY = st.secrets["ORS_API_KEY"]
+# Title
+st.set_page_config(page_title="Commute Planner", layout="centered")
+st.title("🚗 Commute Planner")
+st.markdown("Estimate your travel time, view the route map, current weather, and air quality index.")
+
+# API keys (use st.secrets if deploying)
+ORS_API_KEY = os.getenv("ORS_API_KEY", st.secrets.get("ORS_API_KEY", ""))
+OWM_API_KEY = os.getenv("OWM_API_KEY", st.secrets.get("OWM_API_KEY", ""))
 
-# Initialize ORS client
+# Initialize OpenRouteService client
 client = openrouteservice.Client(key=ORS_API_KEY)
+geolocator = Nominatim(user_agent="commute_planner")
 
-# Supported transport modes
-MODES = {
+# Transport mode options
+transport_modes = {
     "Driving": "driving-car",
     "Walking": "foot-walking",
-    "Cycling": "cycling-regular"
+    "Cycling": "cycling-regular",
+    "Transit (experimental)": "driving-hgv"
 }
 
-# App title
-st.set_page_config(page_title="Commute Planner", layout="centered")
-st.title("🚗 Commute Planner")
+# Sidebar Inputs
+start_location = st.text_input("Enter Start Location", key="start")
+end_location = st.text_input("Enter Destination", key="end")
+mode = st.selectbox("Select Transportation Mode", list(transport_modes.keys()), key="mode")
+submit = st.button("Get Route")
 
-# Input fields
-start_location = st.text_input("Start location (address or place name):")
-end_location = st.text_input("Destination (address or place name):")
-mode = st.selectbox("Transportation mode", list(MODES.keys()))
+# Only run route logic if submit was clicked
+if submit or st.session_state.get("show_results"):
+    if submit:
+        try:
+            # Geocode locations
+            start_coords = geolocator.geocode(start_location)
+            end_coords = geolocator.geocode(end_location)
 
-# Process user input
-if st.button("Get Route") and start_location and end_location:
-    try:
-        # Geocode start and end addresses
-        geocode_start = client.pelias_search(start_location)
-        start_coords = geocode_start["features"][0]["geometry"]["coordinates"]
+            if not start_coords or not end_coords:
+                st.error("Could not geocode one of the locations.")
+            else:
+                start_point = [start_coords.longitude, start_coords.latitude]
+                end_point = [end_coords.longitude, end_coords.latitude]
+
+                # Fetch route
+                route = client.directions(
+                    coordinates=[start_point, end_point],
+                    profile=transport_modes[mode],
+                    format="geojson"
+                )
+
+                distance_km = route['features'][0]['properties']['segments'][0]['distance'] / 1000
+                duration_min = route['features'][0]['properties']['segments'][0]['duration'] / 60
 
-        geocode_end = client.pelias_search(end_location)
-        end_coords = geocode_end["features"][0]["geometry"]["coordinates"]
+                # Save to session state
+                st.session_state["show_results"] = True
+                st.session_state["distance_km"] = distance_km
+                st.session_state["duration_min"] = duration_min
+                st.session_state["start_coords"] = [start_coords.latitude, start_coords.longitude]
+                st.session_state["end_coords"] = [end_coords.latitude, end_coords.longitude]
+                st.session_state["route"] = route
 
-        coords = (start_coords, end_coords)
+        except Exception as e:
+            st.error(f"Error: {e}")
 
-        # Get route info
-        route = client.directions(coords, profile=MODES[mode], format="geojson")
-        properties = route["features"][0]["properties"]["summary"]
-        distance_km = properties["distance"] / 1000
-        duration_min = properties["duration"] / 60
+# Display results if they exist
+if st.session_state.get("show_results"):
+    st.success(f"**Distance:** {st.session_state['distance_km']:.2f} km")
+    st.success(f"**Estimated Duration:** {st.session_state['duration_min']:.1f} minutes")
 
-        st.success(f"🛣️ Distance: {distance_km:.2f} km | ⏱️ Duration: {duration_min:.1f} minutes")
+    # Draw map
+    route = st.session_state["route"]
+    m = folium.Map(location=st.session_state["start_coords"], zoom_start=13)
+    folium.Marker(st.session_state["start_coords"], tooltip="Start", icon=folium.Icon(color='green')).add_to(m)
+    folium.Marker(st.session_state["end_coords"], tooltip="End", icon=folium.Icon(color='red')).add_to(m)
+    folium.GeoJson(route, name="Route").add_to(m)
+    st_folium(m, width=700, height=500)
 
-        # Map
-        m = folium.Map(location=[start_coords[1], start_coords[0]], zoom_start=13)
-        folium.Marker([start_coords[1], start_coords[0]], popup="Start", icon=folium.Icon(color='green')).add_to(m)
-        folium.Marker([end_coords[1], end_coords[0]], popup="End", icon=folium.Icon(color='red')).add_to(m)
-        folium.GeoJson(route, name="Route").add_to(m)
+    # Get weather and AQI
+    lat, lon = st.session_state["start_coords"]
+    weather_url = f"https://api.openweathermap.org/data/2.5/weather?lat={lat}&lon={lon}&appid={OWM_API_KEY}&units=metric"
+    air_url = f"http://api.openweathermap.org/data/2.5/air_pollution?lat={lat}&lon={lon}&appid={OWM_API_KEY}"
+
+    try:
+        weather = requests.get(weather_url).json()
+        air = requests.get(air_url).json()
 
-        st.subheader("📍 Route Map")
-        st_folium(m, width=700, height=500)
+        temp = weather['main']['temp']
+        condition = weather['weather'][0]['description'].capitalize()
+        aqi = air['list'][0]['main']['aqi']
 
-    except Exception as e:
-        st.error(f"Error fetching route: {e}")
+        st.info(f"**Current Temperature:** {temp}°C")
+        st.info(f"**Weather Condition:** {condition}")
+        st.info(f"**Air Quality Index (AQI):** {aqi} (1=Good, 5=Very Poor)")
+    except:
+        st.warning("Could not fetch weather or air quality data.")