update legend

app.py

@@ -22,11 +22,16 @@ from src.text_content import (
     SLOGAN,
 )
 from src.utils import add_latlng_col, init_map, parse_gg_sheet, is_request_in_list, marker_request
+from src.map_utils import get_legend_macro
 
 TOKEN = os.environ.get("HF_TOKEN", None)
-VERIFIED_REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1PXcAtI5L95hHSXAiRl3Y4v5O4coG39S86OTfBEcvLTE/edit#gid=0"
+VERIFIED_REQUESTS_URL = (
+    "https://docs.google.com/spreadsheets/d/1PXcAtI5L95hHSXAiRl3Y4v5O4coG39S86OTfBEcvLTE/edit#gid=0"
+)
 REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
-INTERVENTIONS_URL = "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
+INTERVENTIONS_URL = (
+    "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
+)
 api = HfApi(TOKEN)
 
 
@@ -46,9 +51,7 @@ if "auto_refresh" not in st.session_state:
 
 auto_refresh = st.sidebar.checkbox("Auto Refresh?", st.session_state.auto_refresh)
 if auto_refresh:
-    number = st.sidebar.number_input(
-        "Refresh rate in seconds", value=st.session_state.sleep_time
-    )
+    number = st.sidebar.number_input("Refresh rate in seconds", value=st.session_state.sleep_time)
     st.session_state.sleep_time = number
 
 
@@ -58,7 +61,9 @@ def display_interventions(interventions_df, selected_statuses):
     global fg
     for index, row in interventions_df.iterrows():
         village_status = row[interventions_df.columns[7]]
-        is_future_intervention = row[interventions_df.columns[5]] == "Intervention prévue dans le futur / Planned future intervention"
+        is_future_intervention = (
+            row[interventions_df.columns[5]] == "Intervention prévue dans le futur / Planned future intervention"
+        )
 
         if pd.isna(village_status) and not is_future_intervention:
             village_status = "Partiellement satisfait / Partially Served"
@@ -69,10 +74,7 @@ def display_interventions(interventions_df, selected_statuses):
         if is_future_intervention:
             color_mk = "pink"
             status = "Planned ⌛"
-        elif (
-            village_status
-            != "Critique, Besoin d'aide en urgence / Critical, in urgent need of help"
-        ):
+        elif village_status != "Critique, Besoin d'aide en urgence / Critical, in urgent need of help":
             # past intervention  and village not in a critical condition
             color_mk = "green"
             status = "Done ✅"
@@ -89,13 +91,15 @@ def display_interventions(interventions_df, selected_statuses):
         intervention_info = f"<b>Intervention Status:</b> {status}<br><b>Village Status:</b> {village_status}<br><b>Org:</b> {org}<br><b>Intervention:</b> {intervention_type}<br><b>Population:</b> {population}<br><b>📅 Date:</b> {date}"
         if row["latlng"] is None:
             continue
-        
-        fg.add_child(folium.Marker(
-            location=row["latlng"],
-            tooltip=city,
-            popup=folium.Popup(intervention_info, max_width=300),
-            icon=folium.Icon(color=color_mk),
-        ))
+
+        fg.add_child(
+            folium.Marker(
+                location=row["latlng"],
+                tooltip=city,
+                popup=folium.Popup(intervention_info, max_width=300),
+                icon=folium.Icon(color=color_mk),
+            )
+        )
 
 
 def show_requests(filtered_df):
@@ -103,7 +107,7 @@ def show_requests(filtered_df):
     global fg
     for index, row in filtered_df.iterrows():
         request_type = row["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"]
-        displayed_request = marker_request(request_type) # TODO: the marker should depend on selected_options
+        displayed_request = marker_request(request_type)  # TODO: the marker should depend on selected_options
         long_lat = row["latlng"]
         maps_url = f"https://maps.google.com/?q={long_lat}"
         # we display all requests in popup text and use the first one for the icon/color
@@ -112,41 +116,67 @@ def show_requests(filtered_df):
         if long_lat is None:
             continue
 
-        fg.add_child(folium.Marker(
-            location=long_lat,
-            tooltip=row["  لأي  جماعة / قيادة / دوار تنتمون ؟"]
-            if not pd.isna(row["  لأي  جماعة / قيادة / دوار تنتمون ؟"])
-            else None,
-            popup=folium.Popup(display_text, max_width=300),
-            icon=folium.Icon(
-                color=COLOR_MAPPING.get(displayed_request, "beige"), icon=icon_name, prefix="glyphicon"
-            ),
-        ))
+        fg.add_child(
+            folium.Marker(
+                location=long_lat,
+                tooltip=row["  لأي  جماعة / قيادة / دوار تنتمون ؟"]
+                if not pd.isna(row["  لأي  جماعة / قيادة / دوار تنتمون ؟"])
+                else None,
+                popup=folium.Popup(display_text, max_width=300),
+                icon=folium.Icon(
+                    color=COLOR_MAPPING.get(displayed_request, "beige"), icon=icon_name, prefix="glyphicon"
+                ),
+            )
+        )
+
 
 def show_verified_requests(filtered_verified_df):
     """Display verified victim requests on the map"""
     global fg
+    verified_color_mapping = {
+        "Low": "beige",
+        "Medium": "orange",
+        "High": "red",
+    }
     for index, row in filtered_verified_df.iterrows():
-        request_type = row["Help Details"]
-        displayed_request = marker_request(request_type) # TODO: the marker should depend on selected_options
         long_lat = row["latlng"]
-        maps_url = f"https://maps.google.com/?q={long_lat}"
         # we display all requests in popup text and use the first one for the icon/color
-        display_text = f'<b>Request Type:</b> {request_type}<br><b>Verified Id:</b> {row["id"]}<br><a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a>'
+        display_text = ""
+        for col, val in zip(filtered_verified_df.columns, row):
+            if col == "Help Details":
+                request_type = row["Help Details"]
+                marker_request(request_type)  # TODO: the marker should depend on selected_options
+                display_text += f"<b>Request Type:</b> {request_type}<br>"
+            elif col == "Location Details":
+                display_text += f"<b>Location:</b> {val}<br>"
+            elif col == "Emergency Degree":
+                display_text += f"<b>Emergency Degree:</b> {val}<br>"
+            elif col == "Verification Date":
+                display_text += f"<b>Verification Date:</b> {val}<br>"
+            elif col == "id":
+                display_text = f"<b>Id:</b> {val}<br>" + display_text
+            elif col == "latlng":
+                maps_url = f"https://maps.google.com/?q={val}"
+                display_text += (
+                    f'<a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a><br>'
+                )
+
         icon_name = ICON_MAPPING.get(request_type, "list")
+        emergency = row.get("Emergency Degree", "Low")
         if long_lat is None:
             continue
-        location = row['Location Details']
-        fg.add_child(folium.Marker(
-            location=long_lat,
-            tooltip=location
-            if not pd.isna(location)
-            else None,
-            popup=folium.Popup(display_text, max_width=300),
-            icon=folium.Icon(
-                color=COLOR_MAPPING.get(displayed_request, "beige"), icon=icon_name, prefix="glyphicon"
-            ),
-        ))
+        location = row["Location Details"]
+        fg.add_child(
+            folium.Marker(
+                location=long_lat,
+                tooltip=location if not pd.isna(location) else None,
+                popup=folium.Popup(display_text, max_width=300),
+                icon=folium.Icon(
+                    color=verified_color_mapping.get(emergency, "beige"), icon=icon_name, prefix="glyphicon"
+                ),
+            )
+        )
+
 
 def display_google_sheet_tables(data_url):
     """Display the google sheet tables for requests and interventions"""
@@ -161,10 +191,7 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     col_1, col_2 = st.columns([1, 1])
 
     with col_1:
-        query = st.text_input(
-            "🔍 Search for information / بحث عن المعلومات",
-            key=f"query_{uuid.uuid4()}"
-        )
+        query = st.text_input("🔍 Search for information / بحث عن المعلومات", key=f"query_{uuid.uuid4()}")
     with col_2:
         if search_id:
             id_number = st.number_input(
@@ -173,13 +200,11 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
                 max_value=len(filtered_df),
                 value=0,
                 step=1,
-                key=f"id_{uuid.uuid4()}"
+                key=f"id_{uuid.uuid4()}",
             )
         if status:
             selected_status = st.selectbox(
-                "🗓️ Status / حالة",
-                ["all / الكل", "Done / تم", "Planned / مخطط لها"],
-                key=f"status_{uuid.uuid4()}"
+                "🗓️ Status / حالة", ["all / الكل", "Done / تم", "Planned / مخطط لها"], key=f"status_{uuid.uuid4()}"
             )
 
     if query:
@@ -197,14 +222,10 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     if status:
         target = "Pouvez-vous nous préciser si vous êtes déjà intervenus ou si vous prévoyez de le faire | Tell us if you already made the intervention, or if you're planning to do it"
         if selected_status == "Done / تم":
-            display_df = display_df[
-                display_df[target] == "Intervention déjà passée / Past intevention"
-            ]
+            display_df = display_df[display_df[target] == "Intervention déjà passée / Past intevention"]
 
         elif selected_status == "Planned / مخطط لها":
-            display_df = display_df[
-                display_df[target] != "Intervention déjà passée / Past intevention"
-            ]
+            display_df = display_df[display_df[target] != "Intervention déjà passée / Past intevention"]
 
     st.dataframe(display_df, height=500)
     # Original link to the Google Sheet
@@ -233,9 +254,7 @@ def id_review_submission():
     with st.expander("🔍 Review of requests | مراجعة طلب مساعدة"):
         st.markdown(REVIEW_TEXT)
 
-        id_to_review = st.number_input(
-            "Enter id / أدخل الرقم", min_value=0, max_value=len(df), value=0, step=1
-        )
+        id_to_review = st.number_input("Enter id / أدخل الرقم", min_value=0, max_value=len(df), value=0, step=1)
         reason_for_review = st.text_area("Explain why / أدخل سبب المراجعة")
         if st.button("Submit / أرسل"):
             if reason_for_review == "":
@@ -250,9 +269,7 @@ def id_review_submission():
                     repo_id="nt3awnou/review_requests",
                     repo_type="dataset",
                 )
-                st.success(
-                    "Submitted at https://huggingface.co/datasets/nt3awnou/review_requests/ تم الإرسال"
-                )
+                st.success("Submitted at https://huggingface.co/datasets/nt3awnou/review_requests/ تم الإرسال")
 
 
 # Logo and Title
@@ -285,9 +302,7 @@ with col2:
         value=True,
     )
 
-st.markdown(
-    "👉 **Choose request type | Choissisez le type de demande | اختر نوع الطلب**"
-)
+st.markdown("👉 **Choose request type | Choissisez le type de demande | اختر نوع الطلب**")
 col1, col2, col3, col4, col5 = st.columns([2, 4, 2, 3, 2])
 cols = [col1, col2, col3, col4, col5]
 
@@ -308,15 +323,15 @@ verified_df = parse_gg_sheet(VERIFIED_REQUESTS_URL)
 verified_df = add_latlng_col(verified_df, process_column="Automatic Extracted Coordinates")
 len_verified_requests = len(verified_df)
 
-df["id"] = df.index # Needed to display request id
-verified_df["id"] = verified_df.index # Needed to display request id
+df["id"] = df.index  # Needed to display request id
+verified_df["id"] = verified_df.index  # Needed to display request id
 # keep rows with at least one request in selected_options
-filtered_df = df[df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(
-    lambda x: is_request_in_list(x, selected_options, options)
-)]
-filtered_verified_df = verified_df[verified_df["Help Details"].apply(
-    lambda x: is_request_in_list(x, selected_options, options)
-)]
+filtered_df = df[
+    df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(lambda x: is_request_in_list(x, selected_options, options))
+]
+filtered_verified_df = verified_df[
+    verified_df["Help Details"].apply(lambda x: is_request_in_list(x, selected_options, options))
+]
 
 
 # Selection of interventions
@@ -340,14 +355,10 @@ fully_satisfied_villages = col_3.checkbox(
 )
 selected_village_types = []
 if critical_villages:
-    selected_village_types.append(
-        "🚨 Critical, in urgent need of help / وضع حرج، في حاجة عاجلة للمساعدة"
-    )
+    selected_village_types.append("🚨 Critical, in urgent need of help / وضع حرج، في حاجة عاجلة للمساعدة")
 
 if partially_satisfied_villages:
-    selected_village_types.append(
-        "⚠️ Partially served / مساعدة جزئية، بحاجة للمزيد من التدخلات"
-    )
+    selected_village_types.append("⚠️ Partially served / مساعدة جزئية، بحاجة للمزيد من التدخلات")
 
 if fully_satisfied_villages:
     selected_village_types.append("✅ Fully served  / تمت المساعدة بشكل كامل")
@@ -369,6 +380,17 @@ if show_unverified:
 # Show verified requests
 show_verified_requests(verified_df)
 
+# Add legend
+legend_macro = get_legend_macro(show_unverified)
+print(legend_macro)
+# delete old legend
+for child in m.get_root()._children:
+    pass
+    # if child.startswith("macro_element"):
+    #     m.get_root()._children.remove(child)
+m.get_root().add_child(legend_macro)
+print(m.get_root()._children)
+
 st_folium(m, use_container_width=True, returned_objects=[], feature_group_to_add=fg, key="map")
 
 # Embed code
@@ -476,9 +498,11 @@ drop_cols = [
     "Intervention Date",
     "Any remarks",
     "VerificationStatus",
-    "Automatic Extracted Coordinates"
+    "Automatic Extracted Coordinates",
 ]
-display_dataframe(verified_df, drop_cols, VERIFIED_REQUESTS_URL, search_id=True, for_help_requests=True, show_link=False)
+display_dataframe(
+    verified_df, drop_cols, VERIFIED_REQUESTS_URL, search_id=True, for_help_requests=True, show_link=False
+)
 
 # Requests table
 st.divider()

src/map_utils.py

@@ -1,7 +1,25 @@
 from branca.element import Template, MacroElement
 
+labels_unverified_requests="""
+    <li><span style='background:#CE3C28;opacity:0.7;'></span>Rescue / إغاثة</li>
+    <li><span style='background:#ED922E;opacity:0.7;'></span>Medical Assistance / مساعدة طبية</li>
+    <li><span style='background:#FFCA92;opacity:0.7;'></span>Shelter / مأوى</li>
+    <li><span style='background:#37A8DA;opacity:0.7;'></span>Food & Water / طعام وماء</li>
+    <li><span style='background:#575757;opacity:0.7;'></span>Danger / مخاطر (تسرب الغاز، تلف في الخدمات العامة...)</li>
+    <li><span style='background:#6EAA25;opacity:0.7;'></span>Done / تم</li>
+    <li><span style='background:#023020;opacity:0.7;'></span>Partial / تم جزئيا</li>
+    <li><span style='background:#FF91E8;opacity:0.7;'></span>Planned / مخطط لها</li>
+"""
+labels_verified="""
+    <li><span style='background:#CE3C28;opacity:0.7;'></span>High Emergency / طوارئ عالية</li>
+    <li><span style='background:#ED922E;opacity:0.7;'></span>Medium Emergency / طوارئ متوسطة</li>
+    <li><span style='background:#FFCA92;opacity:0.7;'></span>Low Emergency / طوارئ منخفضة</li>
+    <li><span style='background:#6EAA25;opacity:0.7;'></span>Done / تم</li>
+    <li><span style='background:#023020;opacity:0.7;'></span>Partial / تم جزئيا</li>
+    <li><span style='background:#FF91E8;opacity:0.7;'></span>Planned / مخطط لها</li>
+"""
 
-template = """
+template_1 = """
 {% macro html(this, kwargs) %}
 
 <!doctype html>
@@ -40,14 +58,9 @@ template = """
 <div class='legend-title'>Legend / مفتاح الخريطة</div>
 <div class='legend-scale'>
   <ul class='legend-labels'>
-    <li><span style='background:#CE3C28;opacity:0.7;'></span>Rescue / إغاثة</li>
-    <li><span style='background:#ED922E;opacity:0.7;'></span>Medical Assistance / مساعدة طبية</li>
-    <li><span style='background:#FFCA92;opacity:0.7;'></span>Shelter / مأوى</li>
-    <li><span style='background:#37A8DA;opacity:0.7;'></span>Food & Water / طعام وماء</li>
-    <li><span style='background:#575757;opacity:0.7;'></span>Danger / مخاطر (تسرب الغاز، تلف في الخدمات العامة...)</li>
-    <li><span style='background:#6EAA25;opacity:0.7;'></span>Done / تم</li>
-    <li><span style='background:#023020;opacity:0.7;'></span>Partial / تم جزئيا</li>
-    <li><span style='background:#FF91E8;opacity:0.7;'></span>Planned / مخطط لها</li>
+
+"""
+template_2 = """
   </ul>
 </div>
 </div>
@@ -95,12 +108,14 @@ template = """
   .maplegend a {
     color: #777;
     }
-    .leaflet-control-geocoder-form input {
-    color: #000;
-    }
 </style>
 {% endmacro %}"""
-legend_macro = MacroElement()
-legend_macro._template = Template(template)
 
-__all__ = ["legend_macro"]
+def get_legend_macro(show_unverified):
+  print("show_unverified", show_unverified)
+  legend_macro = MacroElement()
+  legend_macro._template = Template(template_1 + (labels_unverified_requests if show_unverified else labels_verified) + template_2)
+  # legend_macro._template = Template(template_1 + (labels_unverified_requests) + template_2)
+  return legend_macro
+
+__all__ = ["get_legend_macro"]

src/utils.py

@@ -3,7 +3,6 @@ from typing import Union
 import folium
 import pandas as pd
 from folium import plugins
-from src.map_utils import legend_macro
 import streamlit as st
 
 EPICENTER_LOCATION = [31.12210171476489, -8.42945837915193]
@@ -172,6 +171,4 @@ def init_map():
         strings={"title": "My location | موقعي", "popup": "My location | موقعي"},
     ).add_to(m)
 
-    # Macro to add legend
-    m.get_root().add_child(legend_macro)
     return m