Fix pd.to_numeric bug

Author: William

Streamlit_Mapping.py

@@ -491,7 +491,6 @@ def button9_click():
                 valid_input = False
             if valid_input:
                 df = df.rename(columns={df.columns[st.session_state.index + 1]: new_title})
-                
             if mapname != list(df.columns[1:]):
                 st.session_state.df = df
                 st.session_state.mapname = list(df.columns[1:])
@@ -553,11 +552,14 @@ def button9_click():
     # Colour change options
     discrete_colours = st.sidebar.toggle(label='Use discrete colouring')
     num_colours = st.sidebar.slider("Number of Colours", min_value=2, max_value=6, value=5)
-
+    
     if not df.empty and 'index' in st.session_state and mapname:
-        df[mapname[st.session_state.index]] = (df[mapname[st.session_state.index]].astype(str).str.replace(r"[^\d.-]", "", regex=True))
+        df[mapname[st.session_state.index]] = (
+            df[mapname[st.session_state.index]]
+            .astype(str)
+            .str.replace(r"[£$€,]", "", regex=True)
+        )
         df[mapname[st.session_state.index]] = pd.to_numeric(df[mapname[st.session_state.index]], errors="coerce")
-
     # Colour pickers
     colours = []
     # Create two columns in the sidebar using container
@@ -653,7 +655,6 @@ def button9_click():
                             with colour_column3:
                                 thresholds[i] = st.number_input('<', float(thresholds[i-1] + step/10), value=float(thresholds[i]), step=step, key=f'+input{i}', label_visibility="hidden", format=f'%.{dp}f')
                 colours.append(colour)
-                # print(float(thresholds[i]))
             custom_colour_scale = colours
         else:
             thresholds=[]
@@ -739,6 +740,7 @@ def button9_click():
             st.rerun()
         if query_params['preset'] == 'ln_average_growth':
             df = pd.read_csv("examples/ITL3_LN_Average_Growth.csv")
+
             fig = True
             mapname = df.columns[1:].tolist()
             levels = []

examples/ITL3_LN_Average_Growth.csv

@@ -83,7 +83,7 @@ TLK51,-0.003623125648410171
 TLK52,0.012095766871986886
 TLK61,0.012261231961902356
 TLK62,0.0032346655676786184
-TLK63,6.816284108642397e-06
+TLK63,0.000006816284109
 TLK64,-0.005569673784010772
 TLK71,0.0036349922136757586
 TLK72,0.0033324009174603357
@@ -117,7 +117,7 @@ TLI45,-0.001946969498128759
 TLI51,-0.016438004922871487
 TLI52,-0.015066114774994628
 TLI53,-0.020972111070233387
-TLI54,1.3986503075891222e-05
+TLI54,0.0000139865030759
 TLI61,-0.006674786791348867
 TLI62,0.009164732708573571
 TLI63,-0.0013626803062413372
@@ -144,7 +144,7 @@ TLF14,-0.0009582513285482838
 TLF15,0.002022490388451104
 TLF16,0.009590992767239234
 TLF21,0.005606386669048765
-TLF22,6.509781463120608e-05
+TLF22,0.000065097814631
 TLF24,0.00492114020948217
 TLF25,-0.0069685070962031284
 TLF30,0.003936685716320673

map.py

@@ -62,7 +62,7 @@ def make_choropleths(data, map_df, geo_level, colorscale=sequential.Viridis[::-1
 
     column = data.columns[index]
     temp = data[column]
-    temp = (temp.astype(str).str.replace(r"[^\d.-]", "", regex=True))
+    temp = (temp.astype(str).str.replace(r"[£$€,]", "", regex=True))
     temp = pd.to_numeric(temp, errors="coerce")
 
     hovertemplate = '%{text}<br>' + column + f': {unit}'+'%{customdata[0]:' + data_format + '}<extra></extra>'