Ludovic Moncla commited on
Commit
3902302
·
1 Parent(s): ff23fdf

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +3 -4
app.py CHANGED
@@ -102,7 +102,7 @@ def search_and_map(query, search_mode, dataset_choice):
102
  search_col = "text" if search_mode == "text" else "headword"
103
 
104
  # Filtering
105
- mask = df[search_col].str.contains(query, case=False, na=False)
106
  results = df[mask].copy()
107
 
108
  m = folium.Map(location=[46.2, 2.2], zoom_start=4)
@@ -201,8 +201,7 @@ def search_and_map(query, search_mode, dataset_choice):
201
  final_df['texte'] = final_df['texte'].astype(str).str.slice(0, 280) + '...'
202
  else:
203
  final_df = results[['headword', 'coordinates', 'meridian', 'text']].head(50).copy()
204
- final_df['coordinates'] = final_df['coordinates'].astype(str)
205
- final_df['meridian'] = final_df['meridian'].astype(str)
206
  final_df['text'] = final_df['text'].astype(str).str.slice(0, 280) + '...'
207
 
208
  return final_df, m._repr_html_()
@@ -238,7 +237,7 @@ with gr.Blocks(title="Historical Encyclopedias Coordinates Explorer") as demo:
238
  value="Encyclopédie de Diderot et d'Alembert",
239
  label="Choose Dataset"
240
  )
241
- search_input = gr.Textbox(label="Search term", placeholder="E.g., Paris, river, castle...")
242
  search_mode = gr.Radio(choices=["headword", "text"], value="headword", label="Search in:")
243
  btn = gr.Button("Search on map", variant="primary")
244
 
 
102
  search_col = "text" if search_mode == "text" else "headword"
103
 
104
  # Filtering
105
+ mask = df[search_col].str.contains(r'\b' + re.escape(query) + r'\b', case=False, na=False)
106
  results = df[mask].copy()
107
 
108
  m = folium.Map(location=[46.2, 2.2], zoom_start=4)
 
201
  final_df['texte'] = final_df['texte'].astype(str).str.slice(0, 280) + '...'
202
  else:
203
  final_df = results[['headword', 'coordinates', 'meridian', 'text']].head(50).copy()
204
+ #final_df['coordinates'] = final_df['coordinates'].astype(str)
 
205
  final_df['text'] = final_df['text'].astype(str).str.slice(0, 280) + '...'
206
 
207
  return final_df, m._repr_html_()
 
237
  value="Encyclopédie de Diderot et d'Alembert",
238
  label="Choose Dataset"
239
  )
240
+ search_input = gr.Textbox(label="Search term", placeholder="E.g., Acapulco, Brest, Berlin...")
241
  search_mode = gr.Radio(choices=["headword", "text"], value="headword", label="Search in:")
242
  btn = gr.Button("Search on map", variant="primary")
243