fix issue in requests filtering (we didn't support multiple requests for the same entry) (#21)

- fix issue in requests filtering (we didn't support multiple requests for the same entry) (9150d3720cbe4a4b143b7714409327f33faddb89)
- add utility functions (eac75830d98cac63ab676c908bff9d7e581b9fbe)
- fix fullscreen (geocoder still not working though) (acd3ac2dc9b0844e3ce4d5ae38a3e109f117d24e)

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
+from src.utils import add_latlng_col, init_map, parse_gg_sheet, is_request_in_list, marker_request
 
 TOKEN = os.environ.get("HF_TOKEN", None)
 REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
@@ -97,12 +97,14 @@ def show_requests(filtered_df):
     """Display victim requests on the map"""
     for index, row in filtered_df.iterrows():
         request_type = row["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"]
+        displayed_request = marker_request(request_type)
         long_lat = row[
             "هل يمكنك تقديم الإحداثيات الدقيقة للموقع؟ (ادا كنت لا توجد بعين المكان) متلاً \n31.01837503440344, -6.781405948842175"
         ]
         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>Id:</b> {row["id"]}<br><a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a>'
-        icon_name = ICON_MAPPING.get(request_type, "info-sign")
+        icon_name = ICON_MAPPING.get(displayed_request, "info-sign")
         if row["latlng"] is None:
             continue
 
@@ -113,7 +115,7 @@ def show_requests(filtered_df):
             else None,
             popup=folium.Popup(display_text, max_width=300),
             icon=folium.Icon(
-                color=COLOR_MAPPING.get(request_type, "blue"), icon=icon_name
+                color=COLOR_MAPPING.get(displayed_request, "blue"), icon=icon_name
             ),
         ))
 
@@ -258,8 +260,11 @@ for i, option in enumerate(options):
         selected_options.append(option)
 
 df["id"] = df.index
-filtered_df = df[df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].isin(selected_options)]
-selected_headers = [HEADERS_MAPPING[request] for request in selected_options]
+# keep rows with at least one request in selected_options
+filtered_df = df[df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(
+    lambda x: is_request_in_list(x, selected_options)
+)]
+
 
 # Selection of interventions
 show_interventions = st.checkbox(
@@ -268,7 +273,6 @@ show_interventions = st.checkbox(
 )
 
 # Categories of villages
-
 st.markdown(
     "👉 **State of villages visited by NGOs| Etat de villages visités par les ONGs | وضعية القرى التي زارتها الجمعيات**",
     unsafe_allow_html=True,

src/utils.py

@@ -12,19 +12,26 @@ def parse_gg_sheet(url):
     df = pd.read_csv(url, on_bad_lines="warn")
     return df
 
-# Session for Requests
-# session = requests.Session()
-# @st.cache_data(persist=True)
-# def parse_latlng_from_link(url):
-#     try:
-#         # extract latitude and longitude from gmaps link
-#         if "@" not in url:
-#             resp = session.head(url, allow_redirects=True)
-#             url = resp.url
-#         latlng = url.split("@")[1].split(",")[0:2]
-#         return [float(latlng[0]), float(latlng[1])]
-#     except Exception as e:
-#         return None
+
+def is_request_in_list(request, selection_list):
+    if isinstance(request, float):  # Check if the input is a float (like NaN)
+        return False
+    if "," in request:
+      all_requests = [r.strip() for r in request.split(",")]
+    else:
+      all_requests = [request]
+    return any([r in selection_list for r in all_requests])
+
+
+def marker_request(request):
+    # in case of multiple requests we use the first one for the marker's icon
+    # requests are already sorted by priority from the form
+    try:
+        displayed_request = request.split(',')[0]
+    except:
+        displayed_request = request
+    return displayed_request
+
 
 def add_latlng_col(df, process_column):
     """Add a latlng column to the dataframe"""
@@ -108,19 +115,21 @@ def init_map():
         max_bounds=True,
     )
     # Add a search bar to the map
-    plugins.Geocoder(
+    geocoder = plugins.Geocoder(
         collapsed=False,
         position="topright",
         placeholder="Search | البحث",
-    ).add_to(m)
+    )
+    m.add_child(geocoder)
 
     # Add Fullscreen button to the map
-    plugins.Fullscreen(
+    fullscreen = plugins.Fullscreen(
         position="topright",
         title="Expand me | تكبير الخريطة",
         title_cancel="Exit me | تصغير الخريطة",
         force_separate_button=True,
-    ).add_to(m)
+    )
+    m.add_child(fullscreen)
 
     # Satellite View from Mapbox
     tileurl = "https://marocmap.ikiker.com/maroc/{z}/{x}/{y}.png"