Update disambiguation/disambiguate.py

disambiguation/disambiguate.py

@@ -19,14 +19,7 @@ import streamlit as st
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 
-request_url = 'https://nominatim.openstreetmap.org/search.php?q=Glebe&polygon_geojson=1&accept-language=en&format=jsonv2'
-headers = {
-    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3 Safari/605.1.15"
-}
-page1 = requests.get(request_url, headers=headers, verify=False)
-cont = page1.content
-st.markdown('111')
-st.markdown(cont)
+
 
 
 def dismabiguate_entities(doc, ent, ase, level_1, level_2, level_3, midmid):
@@ -38,15 +31,6 @@ def get_coordinates(ent, ase, level_1, level_2, level_3, midmid):
     }
     time.sleep(2)
     page = requests.get(request_url, headers=headers, verify=False)
-    # page = requests.get(request_url, verify=False)
-    # print(request_url, '++++++')
-    # print(ent, '++++++')
-    # print(ase, '++++++')
-    # print(level_1, '++++++')
-    # print(level_2, '++++++')
-    # print(level_3, '++++++')
-    # print(midmid, '++++++')
-
 
     json_content = json.loads(page.content)
     # json_content = json.loads(aa)
@@ -60,16 +44,6 @@ def get_coordinates(ent, ase, level_1, level_2, level_3, midmid):
     mid1 = None
     mid2 = None
     coordinates = all_coordinates
-    # if level_1 is not None:
-    #
-    #     all_coordinates, centroid, mid1, mid2 = geo_level1.get_level1_coordinates(all_coordinates, centroid, level_1, midmid)
-        
-    # if level_2 is not None:
-    #     if level_1 is not None and level_1.lower() not in geo_level1.center:
-    #         all_coordinates, centroid = geo_level2.get_level2_coordinates(coordinates, centroid, level_2, level_1)
-    #     else:
-    #         print ("Else executed")
-    #         all_coordinates, centroid = geo_level2.get_level2_coordinates(all_coordinates, centroid, level_2, level_1)
 
     if level_3 is not None:
         all_coordinates, centroid = geo_level3.get_level3_coordinates(coordinates, centroid, level_3, level_1)
@@ -82,7 +56,6 @@ def get_coordinates(ent, ase, level_1, level_2, level_3, midmid):
 def dismabiguate_entities_between(doc, ent, ase, level_1, level_2, level_3, midmid):
     return get_coordinates_between(doc, ent, ase, level_1, level_2, level_3, midmid)
 
-
 def get_coordinates_between(doc, ent, ase, level_1, level_2, level_3, midmid):
 
     # first ase
@@ -105,16 +78,9 @@ def get_coordinates_between(doc, ent, ase, level_1, level_2, level_3, midmid):
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3 Safari/605.1.15"
     }
     page = requests.get(request_url, headers=headers, verify=False)
-    print('bebe')
-    print(ase)
-    print(doc.ents)
-
-    st.markdown(ase)
-    st.markdown(request_url)   
-    st.markdown(page.content)   
+  
+    st.markdown('The IP of this Space is blocked by OpenStreetMap, we are fixing this issue. You can still interact with the second table at the first page.')   
     json_content = json.loads(page.content)
-    # json_content = json.loads(aa)
-    # print(json_content, 'jjj')
     all_coordinates = json_content[0]['geojson']['coordinates'][0]
     centroid = (float(json_content[0]['lon']), float(json_content[0]['lat']))
     for p in all_coordinates: