merge

app.py

@@ -56,9 +56,9 @@ if auto_refresh:
 
 
 # Streamlit functions
-def display_interventions(interventions_df, selected_statuses):
+def display_interventions(interventions_df, selected_statuses, map_obj, intervention_fgs):
     """Display NGO interventions on the map"""
-    global fg
+
     for index, row in interventions_df.iterrows():
         village_status = row[interventions_df.columns[7]]
         is_future_intervention = (
@@ -81,7 +81,7 @@ def display_interventions(interventions_df, selected_statuses):
 
         else:
             color_mk = "darkgreen"
-            status = "Partial ⚠️"
+            status = "Partial 📝"
 
         intervention_type = row[interventions_df.columns[6]]
         org = row[interventions_df.columns[1]]
@@ -107,6 +107,7 @@ def display_interventions(interventions_df, selected_statuses):
         if row["latlng"] is None:
             continue
 
+        fg = intervention_fgs[status]
         fg.add_child(
             folium.Marker(
                 location=row["latlng"],
@@ -210,14 +211,16 @@ def show_requests(filtered_df):
         )
 
 
-def show_verified_requests(filtered_verified_df):
+def show_verified_requests(filtered_verified_df, emergency_fgs):
     """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():
         long_lat = row["latlng"]
         # we display all requests in popup text and use the first one for the icon/color
@@ -250,7 +253,11 @@ def show_verified_requests(filtered_verified_df):
         if long_lat is None:
             continue
         location = row["Location Details"]
-        fg.add_child(
+
+        # Select the correct feature group
+        fg_emergency_group = emergency_fgs[emergency]
+
+        fg_emergency_group.add_child(
             folium.Marker(
                 location=long_lat,
                 tooltip=location if not pd.isna(location) else None,
@@ -328,7 +335,7 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
         st.markdown(
             """
                     <div style="text-align: left;">
-                    <a href="mailto:nt3awnoumorocco@gmail.com">nt3awnoumorocco@gmail.com</a> نحن نخفي معلومات الاتصال لحماية خصوصية الضحايا. إذا كنت جمعية وتريد الاتصال بالضحايا، يرجى الاتصال بنا على 
+                    <a href="mailto:nt3awnoumorocco@gmail.com">nt3awnoumorocco@gmail.com</a> نحن نخفي معلومات الاتصال لحماية خصوصية الضحايا. إذا كنت جمعية وتريد الاتصال بالضحايا، يرجى الاتصال بنا على
                     </div>
                     """,
             unsafe_allow_html=True,
@@ -364,7 +371,7 @@ st.markdown(LOGO, unsafe_allow_html=True)
 # st.title("Nt3awnou نتعاونو")
 st.markdown(SLOGAN, unsafe_allow_html=True)
 
-m = init_map()
+m, emergency_fgs, intervention_fgs = init_map()
 fg = folium.FeatureGroup(name="Markers")
 
 # Selection of requests
@@ -465,15 +472,16 @@ status_mapping = {
 selected_statuses = [status_mapping[status] for status in selected_village_types]
 
 if show_interventions:
-    display_interventions(interventions_df, selected_statuses)
     display_solved(solved_verified_requests, selected_statuses)
+    display_interventions(interventions_df, selected_statuses, m, intervention_fgs)
+
 
 # Show requests
 if show_unverified:
     show_requests(filtered_df)
 
 # Show verified requests
-show_verified_requests(verified_df)
+show_verified_requests(verified_df, emergency_fgs)
 
 # Add legend
 legend_macro = get_legend_macro(show_unverified)
@@ -491,7 +499,7 @@ with st.expander("💻 For Developers only, embed code for the map | للمطو
     st.code(
         """
 <iframe id="nt3awnou-map"
-   src="https://nt3awnou-embed-rescue-map.hf.space/?embed=true" width="1200" height="720" 
+   src="https://nt3awnou-embed-rescue-map.hf.space/?embed=true" width="1200" height="720"
    frameborder="0"
    width="850"
    height="450"
@@ -563,7 +571,7 @@ with tab_fr:
             "# Nombre de demandes résolues",
             len_solved_verified_requests,
         )
-        
+
 
 # Verified Requests table
 st.divider()

src/utils.py

@@ -67,7 +67,7 @@ def parse_latlng(latlng):
         if latlng.count(',') > 2:
             d1, d2, d3, d4 = latlng.split(",")[:4]
             return [float(".".join([d1, d2])), float(".".join([d3, d4]))]
-        
+
         # case of more than one dot 30.98. -7.10
         if latlng.count('.') > 2:
             d1, d2, d3, d4 = latlng.split(".")[:4]
@@ -79,7 +79,7 @@ def parse_latlng(latlng):
         lat = re.sub(r"[^\d\.\-]", "", lat)
         lng = re.sub(r"[^\d\.\-]", "", lng)
         return [float(lat), float(lng)]
-    
+
     except Exception as e:
         print(f"Error parsing latlng: {latlng}  Reason: {e}")
         return None
@@ -93,16 +93,16 @@ def add_epicentre_to_map(fg):
         text_color='white'
     )
 
-    fg.add_child(folium.Marker(location=EPICENTER_LOCATION, 
-                #   popup="Epicenter مركز الزلزال", 
+    fg.add_child(folium.Marker(location=EPICENTER_LOCATION,
+                #   popup="Epicenter مركز الزلزال",
                   tooltip="Epicenter مركز الزلزال",
                   icon=icon_epicentre))
-    
+
 
 
 def add_danger_distances_to_map(map_obj):
     Danger_Distances_group = folium.FeatureGroup(name='Danger distances - earthquake magnitude 7 | مسافات الخطر - قوة الزلازل 7').add_to(map_obj)
-    
+
     zones = [
         {"radius": 100000, "fill_opacity": 0.1, "weight": 1, "fill_color": "yellow", "tooltip": "50 to 100 km - Moderate risk area | منطقة خطر معتدلة"},
         {"radius": 50000, "fill_opacity": 0.1, "weight": 1, "fill_color": "orange", "tooltip": "30 to 50 km - High risk zone | منطقة عالية المخاطر"},
@@ -123,7 +123,7 @@ def add_danger_distances_to_map(map_obj):
         ).add_to(Danger_Distances_group)
 
 
-def add_village_names(douar_df, map_obj): 
+def add_village_names(douar_df, map_obj):
     village_fgroup = folium.FeatureGroup(name='🔵 All the Villages / Tous les villages / جميع القرى', show=False).add_to(map_obj)
 
     for _, row in douar_df.iterrows():
@@ -137,13 +137,41 @@ def add_village_names(douar_df, map_obj):
         folium.CircleMarker(
             location=[lat, lng],
             radius=0.1,
-            tooltip = dour_name, # we might remove the tooltip to avoid crowding the map 
+            tooltip = dour_name, # we might remove the tooltip to avoid crowding the map
             popup=folium.Popup(display_text, max_width=200),
             color= "#0046C8",
             opacity = 0.7
         ).add_to(village_fgroup)
 
 
+def init_intervention_fgs(m):
+    intervention_fgs = {}
+
+    fg_done = folium.FeatureGroup(name="Done ✅", show=True).add_to(m)
+    fg_planned = folium.FeatureGroup(name="Planned ⏳", show=True).add_to(m)
+    fg_partial = folium.FeatureGroup(name="Partial 📝", show=True).add_to(m)
+
+    intervention_fgs["Done ✅"] = fg_done
+    intervention_fgs["Planned ⌛"] = fg_planned
+    intervention_fgs["Partial 📝"] = fg_partial
+
+    return intervention_fgs
+
+
+def init_emergency_fgs(m):
+    emergency_fgs = {}
+
+    fg_high = folium.FeatureGroup(name="High 🔴", show=True).add_to(m)
+    fg_medium = folium.FeatureGroup(name="Medium 🟠", show=True).add_to(m)
+    fg_low = folium.FeatureGroup(name="Low 🟡", show=True).add_to(m)
+
+    emergency_fgs["High"] = fg_high
+    emergency_fgs["Medium"] = fg_medium
+    emergency_fgs["Low"] = fg_low
+
+    return emergency_fgs
+
+
 def init_map():
     m = folium.Map(
         location=[31.228674, -7.992047],
@@ -185,6 +213,8 @@ def init_map():
     # Add danger zones
     add_epicentre_to_map(m)
     add_danger_distances_to_map(m)
+    emergency_fgs = init_emergency_fgs(m)
+    intervention_fgs = init_intervention_fgs(m)
 
     # Add a LayerControl to the map to toggle between layers (Satellite View and Default One)
     folium.LayerControl().add_to(m)
@@ -197,4 +227,4 @@ def init_map():
         strings={"title": "My location | موقعي", "popup": "My location | موقعي"},
     ).add_to(m)
 
-    return m
+    return m, emergency_fgs, intervention_fgs