From b218d83944ff763323f58e68296ab76b6de0f77f Mon Sep 17 00:00:00 2001
From: "a.pradeilles" <alexandre.pradeilles@student-cs.fr>
Date: Thu, 15 Apr 2021 10:11:21 +0200
Subject: [PATCH] gestion main_street
---
main.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/main.py b/main.py
index b56b503..0066131 100644
--- a/main.py
+++ b/main.py
@@ -2,11 +2,17 @@ from request import requete_osm
from coord_to_intersections import coord_to_inter
from request2 import search_osm, all_intersect
from ordre_arbres import ordre_arbre
+from research import circular_research_2
import time
def tree_position(lat, lon):
req = requete_osm(lat, lon)
- main_street = req['address']['road']
+ try:
+ main_street = req['address']['road']
+ except KeyError:
+ main_street = circular_research_2(lat, lon)
+ if main_street == '':
+ main_street = circular_research_2(lat, lon)
print(main_street)
city = req['address']['town']
country = req['address']['country']
@@ -47,7 +53,7 @@ def classement_arbres(liste_coord):
if __name__=="__main__":
t1 = time.time()
- lat, lon = 48.892046, 2.249319
+ lat, lon = 48.898867, 2.237485
print(tree_position(lat, lon))
t2 = time.time()
print(t2-t1)
--
GitLab