Update src/utils.py

src/utils.py

@@ -9,27 +9,59 @@ BORDER_COLOR = "black"
 
 def parse_gg_sheet(url):
     url = url.replace("edit#gid=", "export?format=csv&gid=")
-    print(url)
     df = pd.read_csv(url, on_bad_lines="warn")
+    return df
 
-    # parse latlng (column 4) to [lat, lng]
-    def parse_latlng(latlng):
-        try:
-            lat, lng = latlng.split(",")
-            return [float(lat), float(lng)]
-        except Exception as e:
-            print(f"Error parsing latlng: {e}")
-            return None
-
-    if df.shape[1] > 4:
-        df = df.assign(latlng=df.iloc[:, 4].apply(parse_latlng))
+# 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 add_latlng_col(df, process_column):
+    """Add a latlng column to the dataframe"""
+    df = df.assign(latlng=df.iloc[:, process_column].apply(parse_latlng))
     return df
 
+# parse latlng (column 4) to [lat, lng]
+import re
+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
+        elif re.match(r"\d+\.\d+,\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(",")
+            return [float(".".join([d1, d2])), float(".".join([d3, d4]))]
+    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(map_obj):
+    # Removed the spinner to not confuse the users as the map is already loaded
     icon_epicentre = folium.plugins.BeautifyIcon(
-        icon=None,
-        spin=False,
+        icon='star',
         border_color='#b3334f',
         background_color='#b3334f',
         text_color='white'
@@ -89,13 +121,13 @@ def init_map():
     ).add_to(m)
 
     # Satellite View from Mapbox
-    tileurl = "https://api.mapbox.com/styles/v1/phd2020/clmer2mra01d001pbgjkictpt/tiles/256/{z}/{x}/{y}@2x?access_token=pk.eyJ1IjoicGhkMjAyMCIsImEiOiJja29lZzFwZmUwNHkzMm5wMjZnYjVvcGltIn0.tE0ritrelQOyLdKUH6hgOw"
+    tileurl = "https://marocmap.ikiker.com/maroc/{z}/{x}/{y}.png"
     folium.TileLayer(
         tiles=tileurl,
-        attr="Satellite View",
-        name="Satellite View | عرض القمر الصناعي",
+        attr="Maroc Map",
+        name="Maroc Map",
         overlay=False,
-        control=True,
+        control=False,
     ).add_to(m)
 
     # Add danger zones