add NGOs data to map

app.py

@@ -55,6 +55,8 @@ 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]]
+        if pd.isna(village_status):
+            village_status = "Partiellement satisfait / Partially Served"
         if (
             row[interventions_df.columns[5]]
             == "Intervention prévue dans le futur / Planned future intervention"
@@ -76,12 +78,12 @@ def display_interventions(interventions_df):
             color_mk = "darkgreen"
             status = "Partial ⚠️"
 
-        intervention_type = row[interventions_df.columns[6]].split("/")[0].strip()
+        intervention_type = row[interventions_df.columns[6]]
         org = row[interventions_df.columns[1]]
         city = row[interventions_df.columns[9]]
         date = row[interventions_df.columns[4]]
         population = row[interventions_df.columns[11]]
-        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}"
+        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
         
@@ -234,7 +236,7 @@ df = parse_gg_sheet(REQUESTS_URL)
 df = add_latlng_col(df, process_column=15)
 len_requests = len(df)
 interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
-interventions_df = add_latlng_col(interventions_df, process_column=12)
+interventions_df = add_latlng_col(interventions_df, process_column="Automatic Extracted Coordinates")
 len_interventions = len(interventions_df)
 m = init_map()
 fg = folium.FeatureGroup(name="Markers")
@@ -320,11 +322,6 @@ status_mapping = {
 selected_statuses = [status_mapping[status] for status in selected_village_types]
 
 if show_interventions:
-    interventions_df = interventions_df.loc[
-        interventions_df[
-            "Etat de la région actuel | Current situation of the area "
-        ].isin(selected_statuses)
-    ]
     display_interventions(interventions_df)
 
 # Show requests

src/utils.py

@@ -1,3 +1,4 @@
+from typing import Union
 import folium
 import pandas as pd
 from folium import plugins
@@ -40,9 +41,14 @@ def marker_request(request):
     return displayed_request
 
 
-def add_latlng_col(df, process_column):
+def add_latlng_col(df, process_column: Union[str, int]):
     """Add a latlng column to the dataframe"""
-    df = df.assign(latlng=df.iloc[:, process_column].apply(parse_latlng))
+    if isinstance(process_column, str):
+        df["latlng"] = df[process_column].apply(parse_latlng)
+    elif isinstance(process_column, int):
+        df["latlng"] = df.iloc[:, process_column].apply(parse_latlng)
+    else:
+        raise ValueError(f"process_column should be a string or an integer, got {type(process_column)}")
     return df
 
 # parse latlng (column 4) to [lat, lng]