better coors parsing

app.py

@@ -1,7 +1,6 @@
 import os
 import time
 from datetime import datetime
-import uuid
 
 import folium
 import pandas as pd
@@ -192,7 +191,7 @@ def show_verified_requests(filtered_verified_df):
                 )
 
         # mark as solved button
-        id_in_sheet = row["id"]+2
+        id_in_sheet = row["id"] + 2
         display_text += f"<a href='https://docs.google.com/forms/d/e/1FAIpQLSdyAcOAULumk4A1DsfrwUsGdZ-9G5xOUuD3vHdQOp3nGNAZXw/viewform?usp=pp_url&entry.1499427789={id_in_sheet}&entry.1666684596={datetime.now().strftime('%Y-%m-%d')}' target='_blank' rel='noopener noreferrer'><b>Mark as solved</b></a><br>"
 
         icon_name = ICON_MAPPING.get(request_type, "list")

src/utils.py

@@ -3,7 +3,6 @@ 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"
@@ -64,27 +63,27 @@ def add_latlng_col(df, process_column: Union[str, int]):
 def parse_latlng(latlng):
     if pd.isna(latlng):
         return None
-        # lat, lng = latlng.split(",")
-        # return [float(lat), float(lng)]
-
     try:
-        # check if it matches (30.9529832, -7.1010705) or (30.9529832,-7.1010705)
-        if re.match(r"\(\d+\.\d+,\s?-\d+\.\d+\)", latlng):
-            lat, lng = latlng[1:-1].split(",")
-            return [float(lat), float(lng)]
-        # check of it matches 30.9529832, -7.1010705 or 30.9529832,-7.1010705 or 30.9529832 ,-7.10107050
-        elif re.match(r"\d+\.\d+\s?,\s?-\d+\.\d+", latlng):
-            lat, lng = latlng.split(",")
-            return [float(lat), float(lng)]
-        # check if it matches 30,9529832, -7,1010705 or 30,9529832,-7,1010705, match1=30,9529832 and match2=-7,1010705
-        elif re.match(r"\d+,\d+,\s?-\d+,\d+", latlng):
-            d1, d2, d3, d4 = latlng.split(",")
+        # case where there more than one comma 30,98 , -7,10
+        if latlng.count(',') > 2:
+            d1, d2, d3, d4 = latlng.split(",")[:4]
+            return [float(".".join([d1, d2])), float(".".join([d3, d4]))]
+        
+        # case of more than one dot 30.98. -7.10
+        if latlng.count('.') > 2:
+            d1, d2, d3, d4 = latlng.split(".")[:4]
             return [float(".".join([d1, d2])), float(".".join([d3, d4]))]
+
+        # case where there is only one comma 30,98 , -7,10
+        lat, lng = latlng.split(",")[:2]
+        # remove anything that is not a digit or a dot or a minus sign
+        lat = re.sub(r"[^\d\.\-]", "", lat)
+        lng = re.sub(r"[^\d\.\-]", "", lng)
+        return [float(lat), float(lng)]
+    
     except Exception as e:
         print(f"Error parsing latlng: {latlng}  Reason: {e}")
         return None
-    print(f"Error parsing latlng: {latlng}")
-    return None
 
 def add_epicentre_to_map(fg):
     # Removed the spinner to not confuse the users as the map is already loaded