From d9b293b81bf1061bcd2ef2da9403c8a39dfee825 Mon Sep 17 00:00:00 2001 From: Aix Lena <lena.aix@student-cs.fr> Date: Tue, 13 Apr 2021 22:19:27 +0200 Subject: [PATCH] maj --- coord_to_intersections.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coord_to_intersections.py b/coord_to_intersections.py index c094410..65090b1 100644 --- a/coord_to_intersections.py +++ b/coord_to_intersections.py @@ -2,6 +2,7 @@ from research import circular_research def coord_to_inter(liste_coord,lat,long,main_street): dist=[] inter_street=[] + inter_street_coord=[] for inter in liste_coord: d=(inter[0]-long)**2 + (inter[1]-lat)**2 dist.append(d) @@ -14,12 +15,13 @@ 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) while len(inter_street)<2 : candidat=liste_coord[dist.index(min(dist))] - dist_1_2= (candidat[0]-inter_street[0][0])**2 + (candidat[1]-inter_street[0][1])**2 + dist_1_2= (candidat[0]-inter_street_coord[0][0])**2 + (candidat[1]-inter_street_coord[0][1])**2 dist_main_2= min(dist) if dist_1_2<dist_main_2 : indice=dist.index(min(dist)) -- GitLab