use FeatureGroup

app.py

@@ -51,7 +51,7 @@ if auto_refresh:
 
 
 # Streamlit functions
-def display_interventions(interventions_df, m):
+def display_interventions(interventions_df):
     """Display NGO interventions on the map"""
     for index, row in interventions_df.iterrows():
         village_status = row[interventions_df.columns[7]]
@@ -84,15 +84,16 @@ def display_interventions(interventions_df, m):
         intervention_info = f"<b>Intervention Status:</b> {status}<br><b>Village Status:</b> {village_status.split('/')[0]}<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
-        folium.Marker(
+        
+        fg.add_child(folium.Marker(
             location=row["latlng"],
             tooltip=city,
             popup=folium.Popup(intervention_info, max_width=300),
             icon=folium.Icon(color=color_mk),
-        ).add_to(m)
+        ))
 
 
-def show_requests(filtered_df, m):
+def show_requests(filtered_df):
     """Display victim requests on the map"""
     for index, row in filtered_df.iterrows():
         request_type = row["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"]
@@ -105,7 +106,7 @@ def show_requests(filtered_df, m):
         if row["latlng"] is None:
             continue
 
-        folium.Marker(
+        fg.add_child(folium.Marker(
             location=row["latlng"],
             tooltip=row["  لأي  جماعة / قيادة / دوار تنتمون ؟"]
             if not pd.isna(row["  لأي  جماعة / قيادة / دوار تنتمون ؟"])
@@ -114,7 +115,7 @@ def show_requests(filtered_df, m):
             icon=folium.Icon(
                 color=COLOR_MAPPING.get(request_type, "blue"), icon=icon_name
             ),
-        ).add_to(m)
+        ))
 
 
 def display_google_sheet_tables(data_url):
@@ -181,11 +182,11 @@ def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for
     # if we want to check hidden contact information
     if for_help_requests:
         st.markdown(
-            f"We are hiding contact information to protect the privacy of the victims. If you are an NGO and want to contact the victims, please contact us at [email protected]",
+            "We are hiding contact information to protect the privacy of the victims. If you are an NGO and want to contact the victims, please contact us at [email protected]",
         )
     # arabic needs rtl
     st.markdown(
-        f"""
+        """
                 <div style="text-align: left;">
                 <a href="mailto:[email protected]">[email protected]</a> نحن نخفي معلومات الاتصال لحماية خصوصية الضحايا. إذا كنت جمعية وتريد الاتصال بالضحايا، يرجى الاتصال بنا على 
                 </div>
@@ -232,6 +233,7 @@ df = add_latlng_col(df, process_column=15)
 interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
 interventions_df = add_latlng_col(interventions_df, process_column=12)
 m = init_map()
+fg = folium.FeatureGroup(name="Markers")
 
 # Selection of requests
 options = [
@@ -317,12 +319,12 @@ if show_interventions:
             "Etat de la région actuel | Current situation of the area "
         ].isin(selected_statuses)
     ]
-    display_interventions(interventions_df, m)
+    display_interventions(interventions_df)
 
 # Show requests
-show_requests(filtered_df, m)
+show_requests(filtered_df)
 
-st_folium(m, use_container_width=True, returned_objects=[])
+st_folium(m, use_container_width=True, returned_objects=[], feature_group_to_add=fg, key="map")
 tab_ar, tab_en, tab_fr = st.tabs(["العربية", "English", "Français"])
 
 

src/utils.py

@@ -58,7 +58,7 @@ def parse_latlng(latlng):
     print(f"Error parsing latlng: {latlng}")
     return None
 
-def add_epicentre_to_map(map_obj):
+def add_epicentre_to_map(fg):
     # Removed the spinner to not confuse the users as the map is already loaded
     icon_epicentre = folium.plugins.BeautifyIcon(
         icon='star',
@@ -66,9 +66,11 @@ def add_epicentre_to_map(map_obj):
         background_color='#b3334f',
         text_color='white'
     )
-    folium.Marker(location=EPICENTER_LOCATION, 
+
+    fg.add_child(folium.Marker(location=EPICENTER_LOCATION, 
                   popup="Epicenter مركز الزلزال", 
-                  icon=icon_epicentre).add_to(map_obj)
+                  icon=icon_epicentre))
+    
 
 
 def add_danger_distances_to_map(map_obj):