quick

app.py

@@ -126,8 +126,22 @@ def show_requests(filtered_df):
         displayed_request = marker_request(request_type)  # TODO: the marker should depend on selected_options
         long_lat = row["latlng"]
         maps_url = f"https://maps.google.com/?q={long_lat}"
+
+        douar = row[filtered_df.columns[3]]
+        person_in_place = row[filtered_df.columns[6]]
+        douar_info = row[filtered_df.columns[9]]
+        source = row[filtered_df.columns[10]]
         # 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>'
+        display_text = f"""
+        <b>Request Type:</b> {request_type}<br>
+        <b>Id:</b> {row["id"]}<br>
+        <b>Source:</b> {source}<br>
+        <b>Person in place:</b> {person_in_place}<br>
+        <b>Douar:</b> {douar}<br>
+        <b>Douar Info:</b> {douar_info}<br>
+        <a href="{maps_url}" target="_blank" rel="noopener noreferrer"><b>Google Maps</b></a>
+        """
+
         icon_name = ICON_MAPPING.get(request_type, "list")
         if long_lat is None:
             continue
@@ -398,14 +412,12 @@ show_verified_requests(verified_df)
 
 # Add legend
 legend_macro = get_legend_macro(show_unverified)
-print(legend_macro)
 # delete old legend
 for child in m.get_root()._children:
-    pass
+    pass #TODO: fix this
     # if child.startswith("macro_element"):
     #     m.get_root()._children.remove(child)
 m.get_root().add_child(legend_macro)
-print(m.get_root()._children)
 
 st_folium(m, use_container_width=True, returned_objects=[], feature_group_to_add=fg, key="map")
 

src/map_utils.py

@@ -112,10 +112,8 @@ template_2 = """
 {% endmacro %}"""
 
 def get_legend_macro(show_unverified):
-  print("show_unverified", show_unverified)
   legend_macro = MacroElement()
   legend_macro._template = Template(template_1 + (labels_unverified_requests if show_unverified else labels_verified) + template_2)
-  # legend_macro._template = Template(template_1 + (labels_unverified_requests) + template_2)
   return legend_macro
 
 __all__ = ["get_legend_macro"]