Upload 2 files

app.py

@@ -8,8 +8,6 @@ import scipy.spatial as sp
 import streamlit as st
 import folium
 from streamlit.components.v1 import html
-
-
 from haversine import haversine, Unit
 
 
@@ -228,6 +226,10 @@ def search_geonames(toponym, df):
 
     lat=[]
     lon=[]
+    name=[]
+    country=[]
+    fcodeName=[]
+    population=[]
 
     if 'geonames' in data:
         for place_info in data['geonames']:
@@ -236,6 +238,11 @@ def search_geonames(toponym, df):
 
             lat.append(latitude)
             lon.append(longitude)
+            name.append(place_info.get('name', ''))
+            country.append(place_info.get('countryName', ''))
+            fcodeName.append(place_info.get('fcodeName', ''))
+            population.append(place_info.get('population', ''))
+
 
             print(latitude)
             print(longitude)
@@ -261,6 +268,11 @@ def search_geonames(toponym, df):
 
     df['lat'] = lat
     df['lon'] = lon
+    df['name']=name
+    df['country']=country
+    df['fcodeName']=fcodeName
+    df['population']=population
+
     result = torch.cat(result, dim=1).detach().numpy()
     return result
 
@@ -275,6 +287,7 @@ def get50Neigbors(locationID, dataset, k=50):
 
     lat, lon, geohash,name = input_row['Latitude'], input_row['Longitude'], input_row['Geohash'], input_row['Name']
 
+    
     filtered_dataset = dataset.loc[dataset['Geohash'].str.startswith(geohash[:7])].copy()
 
     filtered_dataset['distance'] = filtered_dataset.apply(
@@ -414,17 +427,20 @@ def showing(df):
     size_scale = 100  
     color_scale = 255  
     for i in range(len(df)):
-        lat, lon, prob = df.iloc[i]['lat'], df.iloc[i]['lon'], df.iloc[i]['prob']
+        lat, lon, prob, name, country,fcodeName,population = df.iloc[i]['lat'], df.iloc[i]['lon'], df.iloc[i]['prob'],df.iloc[i]['name'],df.iloc[i]['country'],df.iloc[i]['fcodeName'],df.iloc[i]['population']
         
         size = int(prob**2 * size_scale )
         color = int(prob**2 * color_scale)
+
+        popup_info= f"<strong>Name:</strong>{name} <br/><strong>Country:</strong> {country}<br/> <strong>fcodeName:</strong> {fcodeName} <br/><strong>population:</strong>{population}"
         
         folium.CircleMarker(
             location=[lat, lon],
             radius=size,
             color=f'#{color:02X}0000',
             fill=True,
-            fill_color=f'#{color:02X}0000'
+            fill_color=f'#{color:02X}0000',
+            popup=popup_info
         ).add_to(m)
 
     m.save("map.html")
@@ -486,7 +502,6 @@ def mapping(selected_place,locations, sentence_info):
 def show_on_map():
 
 
-
     input = st.text_area("Enter a sentence:", height=200)
 
     st.button("Submit")

requirements.txt

@@ -0,0 +1,17 @@
+streamlit==0.89.0
+torch==2.1.0 
+transformers @ git+https://github.com/zekun-li/transformers@geolm
+scipy
+rank_bm25
+scikit-image
+geopandas
+pandas
+numpy
+requests==2.26.0
+folium
+rasterio 
+streamlit_folium
+opencv-python
+torchvision
+matplotlib
+haversine