From 813f0fa0998be24636500d74894a86f50c568431 Mon Sep 17 00:00:00 2001
From: Aix Lena <lena.aix@student-cs.fr>
Date: Tue, 13 Apr 2021 22:48:06 +0200
Subject: [PATCH] maj
---
coord_to_intersections.py | 3 ++-
main.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/coord_to_intersections.py b/coord_to_intersections.py
index 976f6a2..72f068a 100644
--- a/coord_to_intersections.py
+++ b/coord_to_intersections.py
@@ -39,10 +39,11 @@ def coord_to_inter(liste_coord,lat,long,main_street):
liste_coord.pop(indice)
else :
inter_street.append(nom_de_rue)
+ inter_street_coord.append(candidat)
indice=dist.index(min(dist))
dist.pop(indice)
liste_coord.pop(indice)
- return inter_street
+ return inter_street+inter_street_coord
diff --git a/main.py b/main.py
index 4b7ab1b..285cde8 100644
--- a/main.py
+++ b/main.py
@@ -6,8 +6,8 @@ def tree_position(lat, lon):
main_street = req['address']['road']
city = req['address']['town']
intersections = req['geojson']['coordinates']
- [begin,end] = coord_to_inter(intersections, lat, lon, main_street)
- return {'lat':lat, 'lon':lon, 'ville':city, 'rue':main_street, 'début tronçon': begin, 'fin tronçon':end}
+ [begin,end,coord_begin, coord_end] = coord_to_inter(intersections, lat, lon, main_street)
+ return {'lat':lat, 'lon':lon, 'ville':city, 'rue':main_street, 'début tronçon': begin, 'fin tronçon':end, 'coordonées début tronçon': coord_begin, 'coordonnées fin tronçon': coord_end}
if __name__=="__main__":
lat = 48.89227652
--
GitLab