add interventions & change icons (#5)

- add interventions & change icons (783b474203363e01d570e50a1723e6b23b205679)


Co-authored-by: Loubna Ben Allal <[email protected]>

app.py

@@ -3,6 +3,7 @@ import streamlit as st
 import pandas as pd
 from streamlit_folium import st_folium
 import time
+import requests
 
 st.set_page_config(layout="wide")
 
@@ -36,6 +37,20 @@ st.markdown("""
 ✉️ [email protected] المتطوعين ليبغاو يعاونوا يقدرو يتصلوا معنا عبر البريد  
             """)
 
+def parse_latlng_from_link(url):
+    # extract latitude and longitude from gmaps link 
+    session = requests.Session()
+    if "@" not in url:
+        # We first need to get the redirect URL
+        resp = session.head(url, allow_redirects=True)
+        url = resp.url
+    latlng = url.split('@')[1].split(',')[0:2]
+    return [float(latlng[0]), float(latlng[1])]
+
+
+def parse_gg_sheet_interventions(url):
+    df = pd.read_csv(url)
+    return df.assign(latlng=df.iloc[:, 3].apply(parse_latlng_from_link))
 
 def parse_gg_sheet(url):
     url = url.replace("edit#gid=", "export?format=csv&gid=")
@@ -51,12 +66,14 @@ def parse_gg_sheet(url):
 
     return df.assign(latlng=df.iloc[:, 4].apply(parse_latlng))
 
-
 df = parse_gg_sheet(
     "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
 )
+interventions_df = parse_gg_sheet_interventions(
+    "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/gviz/tq?tqx=out:csv"
+)
 
-
+# select requests
 headers_mapping = {
     "إغاثة": "Rescue/إغاثة",
     "مساعدة طبية": "Medical Assistance/مساعدة طبية",
@@ -71,6 +88,14 @@ colors_mapping = {
     "طعام وماء": "blue",
     "مخاطر (تسرب الغاز، تلف في الخدمات العامة...)": "grey",
 }
+icon_mapping = {
+    "إغاثة": "bell",        # life ring icon for rescue
+    "مساعدة طبية": "heart",     # medical kit for medical assistance
+    "مأوى": "home",              # home icon for shelter
+    "طعام وماء": "cutlery",      # cutlery (fork and knife) for food & water
+    "مخاطر (تسرب الغاز، تلف في الخدمات العامة...)": "Warning"  # warning triangle for dangers
+}
+
 options = ["إغاثة", "مساعدة طبية", "مأوى", "طعام وماء", "مخاطر (تسرب الغاز، تلف في الخدمات العامة...)"]
 selected_options = []
 
@@ -87,7 +112,10 @@ arabic_options = [e.split("/")[1] for e in selected_options]
 df['id'] = df.index
 filtered_df = df[df['ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)'].isin(arabic_options)]
 selected_headers = [headers_mapping[request] for request in arabic_options]
-#st.subheader(", ".join(selected_headers))
+
+# select interventions
+st.markdown("👇 **View past or planned interventions / عرض عمليات المساعدة السابقة أو المخطط لها**")
+show_interventions = st.checkbox("Display Interventions عرض التدخلات")
 
 m = folium.Map(
     location=[31.628674, -7.992047],
@@ -100,14 +128,27 @@ m = folium.Map(
     max_bounds=True,
 )
 
+if show_interventions:
+    for index, row in interventions_df.iterrows():
+        status = "Done ✅" if row[interventions_df.columns[5]]=="Intervention prévue dans le futur / Planned future intervention" else "Planned ⌛"
+        color_mk = "green" if row[interventions_df.columns[5]]=="Intervention prévue dans le futur / Planned future intervention" else "pink"
+        intervention_type = row[interventions_df.columns[6]].split("/")[0].strip()
+        org = row[interventions_df.columns[1]]
+        city = row[interventions_df.columns[9]]
+        date = row[interventions_df.columns[4]]
+        intervention_info = f"<b>Status:</b> {status}<br><b>Org:</b> {org}<br><b>Intervention:</b> {intervention_type}<br><b>📅 Date:</b> {date}"
+        print(f"intervention_info: {intervention_info}")
+        folium.Marker(
+            location=row["latlng"],
+            tooltip=city,
+            popup=folium.Popup(intervention_info, max_width=300),  
+            icon=folium.Icon(color=color_mk)  
+        ).add_to(m)
 
 for index, row in filtered_df.iterrows():
     request_type = row['ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)']
-    #phone = row["رقم الهاتف (اختياري)"] if not pd.isna(row["رقم الهاتف (اختياري)"]) else ""
-    
-    # Formatted text using HTML
     display_text = f"<b>Request Type:</b> {request_type}<br><b>Id:</b> {row['id']}"
-    
+    icon_name = icon_mapping.get(request_type, 'info-sign') 
     if row["latlng"] is None:
         continue
 
@@ -115,7 +156,7 @@ for index, row in filtered_df.iterrows():
         location=row["latlng"],
         tooltip=row['  لأي  جماعة / قيادة / دوار تنتمون ؟'] if not pd.isna(row['  لأي  جماعة / قيادة / دوار تنتمون ؟']) else None,
         popup=folium.Popup(display_text, max_width=300),  
-        icon=folium.Icon(color=colors_mapping.get(request_type, "blue"))  
+        icon=folium.Icon(color=colors_mapping.get(request_type, "blue"), icon=icon_name)  
     ).add_to(m)
 st_data = st_folium(m, use_container_width=True)
 
@@ -147,7 +188,6 @@ st.markdown(
     """,
     unsafe_allow_html=True,
 )
-
 if auto_refresh:
     time.sleep(number)
     st.experimental_rerun()