Merge branch 'master' of https://gitlab.viarezo.fr/2019aixl/ebec-2021

main.py

@@ -22,6 +22,11 @@ def trees_positions(liste_coord):
     return dict
 
 if __name__=="__main__":
+<<<<<<< HEAD
+    lat = 48.89394122
+    lon = 2.247959188
+=======
     lat = 48.89227652
     lon = 2.253773690
+>>>>>>> 813f0fa0998be24636500d74894a86f50c568431
     print(tree_position(lat, lon))
\ No newline at end of file

research.py

@@ -3,13 +3,13 @@ from math import sqrt
 
 def circular_research(lat, lon, main_street):
     street = requete_osm(lat, lon)['address']['road']
-    if not(street == main_street):
+    if not(street == main_street) and not(street == ''):
         return street
     step = 10**(-5)
     while step < 10**(-4):
         for i in range(8):
             street = check_position(lat, lon, step, main_street, i)
-            if not(street == main_street):
+            if not(street == main_street) and not(street == ''):
                 return street
         step += 10**(-5)
     return None
@@ -18,19 +18,43 @@ def check_position(lat, lon, step, main_street, i):
     street = ''
     step_diag = step/sqrt(2)
     if i == 0:
+        try:
             street = requete_osm(lat+step, lon)['address']['road']
+        except KeyError:
+            pass
     elif i == 1:
+        try:
             street = requete_osm(lat+step_diag, lon+step_diag)['address']['road']
+        except KeyError:
+            pass
     elif i == 2:
+        try:
             street = requete_osm(lat, lon+step)['address']['road']
+        except KeyError:
+            pass
     elif i == 3:
+        try:
             street = requete_osm(lat-step_diag, lon+step_diag)['address']['road']
+        except KeyError:
+            pass
     elif i == 4:
+        try:
             street = requete_osm(lat-step, lon)['address']['road']
+        except KeyError:
+            pass
     elif i == 5:
+        try:
             street = requete_osm(lat-step_diag, lon-step_diag)['address']['road']
+        except KeyError:
+            pass
     elif i == 6:
+        try:
             street = requete_osm(lat, lon-step)['address']['road']
+        except KeyError:
+            pass
     elif i == 7:
+        try:
             street = requete_osm(lat+step_diag, lon-step_diag)['address']['road']
+        except KeyError:
+            pass
     return street