show interventions

app.py

@@ -20,7 +20,7 @@ from src.text_content import (
     REVIEW_TEXT,
     SLOGAN,
 )
-from src.utils import add_latlng_col, init_map, parse_gg_sheet, is_request_in_list, marker_request
+from src.utils import add_latlng_col, add_village_names, init_map, parse_gg_sheet, is_request_in_list, marker_request, parse_json_file
 from src.map_utils import get_legend_macro
 
 TOKEN = os.environ.get("HF_TOKEN", None)
@@ -31,6 +31,7 @@ REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fO
 INTERVENTIONS_URL = (
     "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
 )
+DOUARS_URL = "data/regions.json"
 api = HfApi(TOKEN)
 
 
@@ -90,7 +91,6 @@ def display_interventions(interventions_df, selected_statuses):
         population = row[interventions_df.columns[11]]
         details = row[interventions_df.columns[8]]
         road_state = row[interventions_df.columns[12]]
-        # 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}"
         intervention_info = f"""
         <b>Date:</b> {date}<br>
         <b>City:</b> {city}<br>
@@ -116,6 +116,57 @@ def display_interventions(interventions_df, selected_statuses):
             )
         )
 
+def display_solved(solved_verified_requests, selected_statuses):
+    # Index(['VerificationStatus', 'Verification Date', 'Help Details',
+    #    'Further details', 'Phone Number', 'Location Details',
+    #    'Emergency Degree', 'Location Link/GPS Coordinates', 'Status',
+    #    'Intervenant ', 'Intervention Date', 'Any remarks',
+    #    'Automatic Extracted Coordinates'],
+    #   dtype='object')
+
+    global fg
+    for index, row in solved_verified_requests.iterrows():
+        if row["latlng"] is None:
+            continue
+        intervention_status = row[solved_verified_requests.columns[8]]
+        is_future_intervention = (
+            intervention_status == "Planned"
+        )
+
+        if is_future_intervention:
+            status = "Planned ⌛"
+            icon = folium.Icon(icon="heart", prefix="glyphicon", color="pink", icon_color="red")
+        else:
+            status = "Done ✅"
+            icon = folium.Icon(icon="heart", prefix="glyphicon", color="darkgreen", icon_color="red")
+        # if village_status not in selected_statuses:
+        #     continue # TODO: enable filters
+        intervention_type = row[solved_verified_requests.columns[2]]
+        details = row[solved_verified_requests.columns[3]]
+        contact = row[solved_verified_requests.columns[4]]
+        location = row[solved_verified_requests.columns[5]]
+        org = row[solved_verified_requests.columns[9]]
+        intervention_date = row[solved_verified_requests.columns[10]]
+        remarks = row[solved_verified_requests.columns[11]]
+        intervention_info = f"""
+        <b>Intervention Date:</b> {intervention_date}<br>
+        <b>Org:</b> {org}<br>
+        <b>Intervention:</b> {intervention_type}<br>
+        <b>Invervention Status:</b> {status}<br>
+        <b>Details:</b> {details}<br>
+        <b>Location:</b> {location}<br>
+        <b>Remarks:</b> {remarks}<br>
+        <b>Contact:</b> {contact}<br>
+        """
+        # golden color
+        fg.add_child(
+            folium.Marker(
+                location=row["latlng"],
+                tooltip=location,
+                popup=folium.Popup(intervention_info, max_width=300),
+                icon=icon
+            )
+        )
 
 def show_requests(filtered_df):
     """Display victim requests on the map"""
@@ -351,13 +402,20 @@ for i, option in enumerate(options):
 df = parse_gg_sheet(REQUESTS_URL)
 if show_unverified:
     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="Automatic Extracted Coordinates")
-len_interventions = len(interventions_df)
 verified_df = parse_gg_sheet(VERIFIED_REQUESTS_URL)
 verified_df = add_latlng_col(verified_df, process_column="Automatic Extracted Coordinates")
+douar_df = parse_json_file(DOUARS_URL)
+
+# check if verified requests have been solved
+solved_verified_requests = verified_df[~pd.isnull(verified_df["Status"])]
+verified_df = verified_df[pd.isnull(verified_df["Status"])]
+
+len_requests = len(df)
+len_interventions = len(interventions_df)
 len_verified_requests = len(verified_df)
+len_solved_verified_requests = len(solved_verified_requests)
 
 df["id"] = df.index  # Needed to display request id
 verified_df["id"] = verified_df.index  # Needed to display request id
@@ -408,6 +466,7 @@ 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)
 
 # Show requests
 if show_unverified:
@@ -424,7 +483,7 @@ for child in m.get_root()._children:
     # if child.startswith("macro_element"):
     #     m.get_root()._children.remove(child)
 m.get_root().add_child(legend_macro)
-
+# add_village_names(douar_df, m)
 st_folium(m, use_container_width=True, returned_objects=[], feature_group_to_add=fg, key="map")
 
 # Embed code

src/utils.py

@@ -3,10 +3,10 @@ from typing import Union
 import folium
 import pandas as pd
 from folium import plugins
+import streamlit as st
 
 EPICENTER_LOCATION = [31.12210171476489, -8.42945837915193]
 BORDER_COLOR = "black"
-DOUARS_URL = "data/regions.json"
 
 # @st.cache_resource
 def parse_gg_sheet(url):
@@ -15,13 +15,12 @@ def parse_gg_sheet(url):
     df = pd.read_csv(url, on_bad_lines="warn")
     return df
 
+@st.cache_resource
 def parse_json_file(url):
     df = pd.read_json(url)
     df = pd.json_normalize(df.douars)
     return df
 
-douar_df = parse_json_file(DOUARS_URL)
-
 def is_request_in_list(request, selection_list, options):
     if isinstance(request, float):  # Check if the input is a float (like NaN)
         return False
@@ -186,7 +185,6 @@ def init_map():
     # Add danger zones
     add_epicentre_to_map(m)
     add_danger_distances_to_map(m)
-    add_village_names(douar_df, m)
 
     # Add a LayerControl to the map to toggle between layers (Satellite View and Default One)
     folium.LayerControl().add_to(m)