Update src/streamlit_app.py

src/streamlit_app.py

@@ -1,115 +1,130 @@
 import streamlit as st
-import geopandas as gpd
 import pandas as pd
-import pydeck as pdk
-import numpy as np
 import osmnx as ox
 from streamlit_folium import st_folium
 import folium
 
 st.set_page_config(layout="wide")
-st.title("🧠 Dubai Digital Twin – Interactive Map")
+st.title("🧠 Dubai Digital Twin – Interactive 2D Map with Folium")
 
 # --- Sidebar Layer Controls ---
 st.sidebar.title("🗺️ Layer Toggles")
-show_buildings = st.sidebar.checkbox("Show Buildings", True)
 show_malls = st.sidebar.checkbox("Show Malls", True)
+show_stores = st.sidebar.checkbox("Show Stores in Malls", True)
 show_footfall = st.sidebar.checkbox("Show Footfall", True)
 show_parks = st.sidebar.checkbox("Show Parks", True)
 show_metro_lines = st.sidebar.checkbox("Show Metro Lines", True)
 show_metro_stations = st.sidebar.checkbox("Show Metro Stations", True)
-show_move_sim = st.sidebar.checkbox("Simulate Entity Movement", True)
 
 # --- Legend ---
 st.sidebar.markdown("---")
 st.sidebar.markdown("### 📌 Legend")
-st.sidebar.markdown("- 🏗️ Buildings: Gray")
-st.sidebar.markdown("- 🛍️ Malls: Blue / Green / Orange")
+st.sidebar.markdown("- 🛍️ Malls: Blue")
+st.sidebar.markdown("- 🏬 Stores: Purple")
 st.sidebar.markdown("- 🌳 Parks: Green")
-st.sidebar.markdown("- 📊 Footfall: Red")
+st.sidebar.markdown("- 📊 Footfall: Red (Draggable)")
 st.sidebar.markdown("- 🚇 Metro Lines: Blue Line")
 st.sidebar.markdown("- 🚉 Metro Stations: Yellow Dot")
 
 # --- Load Dubai Boundary ---
 st.subheader("🌍 Getting Dubai boundary...")
 try:
-    ox.settings.use_cache = False  # Disable disk cache to avoid permission error
     dubai = ox.geocode_to_gdf("Dubai, United Arab Emirates")
     dubai_polygon = dubai.geometry.values[0]
     bounds = dubai_polygon.bounds
-    west, south, east, north = bounds[0], bounds[1], bounds[2], bounds[3]
-    bbox = (west, south, east, north)
+    bbox = (bounds[0], bounds[1], bounds[2], bounds[3])
     st.success("✅ Dubai boundary fetched.")
 except Exception as e:
     st.error(f"❌ Boundary fetch failed: {e}")
     st.stop()
 
-
-# --- Real Data Sources ---
+# --- Load Real Data ---
 try:
     malls = ox.features_from_bbox(bbox, tags={"shop": "mall"})
-    malls_points = malls[malls.geometry.type == "Point"]
-
     parks = ox.features_from_bbox(bbox, tags={"leisure": "park"})
-    parks_points = parks[parks.geometry.type == "Point"]
-
     metro_stations = ox.features_from_bbox(bbox, tags={"railway": "station"})
-    metro_station_points = metro_stations[metro_stations.geometry.type == "Point"]
-
-    footfall = pd.read_excel("data/jj_with_footfall.xlsx")
+    metro_lines = ox.features_from_bbox(bbox, tags={"railway": ["subway", "light_rail"]})
+    stores = ox.features_from_bbox(bbox, tags={"shop": True})
+    footfall = pd.read_excel("data/jj_with_footfall.xlsx").dropna(subset=["latitude", "longitude"])
 except Exception as e:
-    st.warning(f"⚠️ OSM or data file fetch failed: {e}")
+    st.warning(f"⚠️ Data load failed: {e}")
+
+# --- Render Map ---
+fmap = folium.Map(location=[25.2048, 55.2708], zoom_start=12)
+
+# Malls
+if show_malls:
+    for _, row in malls.iterrows():
+        if row.geometry.geom_type == "Point":
+            folium.Marker(
+                location=[row.geometry.y, row.geometry.x],
+                popup=f"Mall: {row.get('name', 'Unnamed')}",
+                tooltip=row.get('name', 'Mall'),
+                icon=folium.Icon(color="blue", icon="shopping-cart", prefix="fa")
+            ).add_to(fmap)
 
-# --- Movement Simulation Map ---
-if show_move_sim:
-    st.subheader("🎯 Simulate Object Movement")
-    fmap = folium.Map(location=[25.2048, 55.2708], zoom_start=12)
+# Stores
+if show_stores:
+    for _, row in stores.iterrows():
+        if row.geometry.geom_type == "Point":
+            folium.Marker(
+                location=[row.geometry.y, row.geometry.x],
+                popup=f"Store: {row.get('name', 'Unnamed Store')}",
+                tooltip=row.get('name', 'Store'),
+                icon=folium.Icon(color="purple", icon="shopping-bag", prefix="fa")
+            ).add_to(fmap)
 
-    # Malls
-    for _, row in malls_points.iterrows():
-        folium.Marker(
-            location=[row.geometry.y, row.geometry.x],
-            popup=f"Mall: {row.get('name', 'Unnamed')} (Drag me)",
-            tooltip=row.get('name', 'Mall'),
-            draggable=True,
-            icon=folium.Icon(color="blue", icon="shopping-cart", prefix="fa")
-        ).add_to(fmap)
+# Parks
+if show_parks:
+    for _, row in parks.iterrows():
+        if hasattr(row.geometry, 'y') and hasattr(row.geometry, 'x'):
+            folium.Marker(
+                location=[row.geometry.y, row.geometry.x],
+                popup=f"Park: {row.get('name', 'Unnamed')}",
+                tooltip=row.get('name', 'Park'),
+                icon=folium.Icon(color="green", icon="tree", prefix="fa")
+            ).add_to(fmap)
 
-    # Parks
-    for _, row in parks_points.iterrows():
-        folium.Marker(
-            location=[row.geometry.y, row.geometry.x],
-            popup=f"Park: {row.get('name', 'Unnamed')} (Drag me)",
-            tooltip=row.get('name', 'Park'),
-            draggable=True,
-            icon=folium.Icon(color="green", icon="tree", prefix="fa")
-        ).add_to(fmap)
+# Metro Stations
+if show_metro_stations:
+    for _, row in metro_stations.iterrows():
+        if hasattr(row.geometry, 'y') and hasattr(row.geometry, 'x'):
+            folium.Marker(
+                location=[row.geometry.y, row.geometry.x],
+                popup=f"Metro: {row.get('name', 'Unnamed')}",
+                tooltip=row.get('name', 'Metro'),
+                icon=folium.Icon(color="orange", icon="train", prefix="fa")
+            ).add_to(fmap)
+
+# Metro Lines
+if show_metro_lines:
+    for _, row in metro_lines.iterrows():
+        if row.geometry.geom_type == "LineString":
+            folium.PolyLine(
+                locations=[(y, x) for x, y in row.geometry.coords],
+                color="blue", weight=4, opacity=0.7
+            ).add_to(fmap)
 
-    # Metro Stations
-    for _, row in metro_station_points.iterrows():
+# Draggable Footfall
+if show_footfall:
+    for _, row in footfall.iterrows():
         folium.Marker(
-            location=[row.geometry.y, row.geometry.x],
-            popup=f"Metro Station: {row.get('name', 'Unnamed')} (Drag me)",
-            tooltip=row.get('name', 'Metro'),
+            location=[row["latitude"], row["longitude"]],
+            popup="Drag me",
             draggable=True,
-            icon=folium.Icon(color="orange", icon="train", prefix="fa")
+            icon=folium.Icon(color="red", icon="map-marker", prefix="fa")
         ).add_to(fmap)
 
-    # Footfall points
-    if show_footfall:
-        for _, row in footfall.dropna(subset=["latitude", "longitude"]).iterrows():
-            folium.CircleMarker(
-                location=[row["latitude"], row["longitude"]],
-                radius=4,
-                color="red",
-                fill=True,
-                fill_opacity=0.6,
-                tooltip="Footfall"
-            ).add_to(fmap)
+# Display map
+fmap_state = st_folium(fmap, width=1200, height=700)
 
-    moved = st_folium(fmap, width=1000, height=600)
+# Show moved coordinates
+if fmap_state and fmap_state.get("last_object_clicked"):
+    lat = fmap_state["last_object_clicked"]["lat"]
+    lon = fmap_state["last_object_clicked"]["lng"]
+    st.success(f"📍 New Position: {lat}, {lon}")
 
-    if moved and moved.get("last_object_clicked"):
-        lat = moved["last_object_clicked"]["lat"]
-        lon = moved["last_object_clicked"]["lng"]
-        st.success(f"📍 New Position: {lat}, {lon}")
+# Button to refresh
+if st.sidebar.button("🔄 Refresh Map"):
+    st.session_state["fmap_rendered"] = False
+    st.rerun()