From 5e2b4543b1f357c3164374a8cec6942974d31a65 Mon Sep 17 00:00:00 2001
From: "a.pradeilles" <alexandre.pradeilles@student-cs.fr>
Date: Tue, 13 Apr 2021 22:55:30 +0200
Subject: [PATCH] ajout exceptions
---
__pycache__/research.cpython-38.pyc | Bin 1080 -> 1391 bytes
main.py | 4 +--
research.py | 44 +++++++++++++++++++++-------
3 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/__pycache__/research.cpython-38.pyc b/__pycache__/research.cpython-38.pyc
index afacca98aac9733bd63f19ac1325b5a92f644af1..ed2ca150e2e72ec77e82ae5798e6c587af0df0f5 100644
GIT binary patch
literal 1391
zcmWIL<>g{vU|`T;DNAr-XJB{?;vi!t1_lNP1_p*=9R>!56owSW9EM!RC`LvQn<<AW
zmpO`=ks*aSg{6fdiY0|Lg{_4liZz8jm_d`{CCD62##`J)sfDGfC8_cG#krb{w^)h`
zi%OE2L6T6+#=yY9&cMLn46>(;fq|ifp@yM`v6(4_QIa8rNs^(KxrVuhDVwQSt%f;;
z8A1m$q_EVo)Uc$mW-}BOl`y8TH8Z*}#Ol<tmN0>I*Ra$u)vz|R!u47~^;*?1GchnS
z1Tz#`)v%<nm^0L}6l$d~1T$!|``uzsOi3w9EiS&rQk0*Va*HATW5(l-tv{aFrRzG&
zynbXRW&e_cfq_Ajxd;?6w^)l3^U_mq@g--ZCTGVN<QHd_Waj5-vfX0NNi4a=oRgn-
zi#s<lGcUflq$oAD<Q5y0W+^U7Ex5&)xsstsfPsPGmqW5uOlWaxQE`l8PHIJBUP@7_
zLO@YsN@`|KPHJ(COMY@`Zfaghag1|tOlneUvaXSVkzq_xYH?~}QF4Y}LFFyM<jkVv
z(wxMic$g>)C^W@DLCh$`D8R_V$im3M$ipbWD8R_Y$i-MB#K6Fi%nFi+Vo(%-JO_>j
z9wr8c6vkTC8m1D46sBfIX@*+18WvFC7x`34l`z&Y)G&!dB8f$kA%#_vp_VnAAy0&b
zp@b=$tH_O!0R$r%@|YqRCNSphsbNWB%VsL-sgeWhWdrH0VH0O)W=g@PzYV0DkpZs1
zriLYjDVwS21k`RuknK419zxUWP{WeKp3O9Yv4{(1y97fGBNp4mAg-UlSj2{GM&7>~
zmJ|-K2_8`UnLs9>*^kief};CC4ND3qSa%ny{SxTDN0@-(|Gc^ymJ}|q2}u6Oqx%So
z{UHByXERM;D&m0I4+(voCNQD;zlJrKL6gU?2$WA>g3^5vBLf3N5h#HbffCS55cef0
zN52G#y#$Ma6@!wLCUX%;3X)+syi+S(i;D7#G}((l1y2z-$Rs`x!2=@rK?E-Y149%i
zD2v3WWG1GAvj~I`1W9u;Fff1^#bKa?%gDmW!^pwN#3;qc$H)a{$-!9=F)l_XMma_S
zMh-?0OA5}yCC0{B1hT_VlkFBexa=w}fw-O}H?brG;u}!z0jq*I43vu@ERf4?aoFVM
Vr<CTT+JQo*7!(vdj66&nya2!d7uNs)
delta 618
zcmaFQwS$8%l$V!_fq{Xc>RV}o8tX*9mijaX28I%b8ipFiW~LNINrn_ANrqbH8s-|N
zY^Gwl8s=bz6y{o%8kQ86Y=)ww62=tPW=0o=Se07V5+;zY8kQQS8rEi3xE`Y#W+nzk
zhG2$5qZ*bJW^;yGmO`ZzhF}IwHosf!i76>Xsl~;&Sc>u!Q_??XOjc%$XXKyU%$RD-
z!N|hM!pOnM!zjSW!N|qP#aJZBz`&5q3UV+MvokO-urM$%I5RLX6ss^!mS&PnH7H@M
zVW?pehj@WSk|BjvlA)G0??Vks3R^Z)Q3zO`4J2Q~CeF~zl!8!mriLYjDVwRN1gwS;
zWD1J>ni`fA_H3r28IwOUNonPE)Uc#*WHS}*04rybK({iZh9!kFo2lr|<U(dCojjKs
zmK3gRrlLP!<%~5<5~#MT)Uc#*XERM;EK->Kky(nPhBcT$lgIDYWCIqHdZr>~1_p*A
zCI$uuP4*&A5E~SAMZ6#uH;CW^5j+eG3{jlLC8-7RDVd4sMf@N^Fd+b9aWF72fI_iY
z4HSZmEQ~yi9E=i-9E>tpX)Z=7#v+g&zsa(!GG-v1U@nreaI<f5*yQG?l;)(`F@j=)
Oje&uIhmnVggBJkxn06Ha
diff --git a/main.py b/main.py
index d05ef1f..c221b79 100644
--- a/main.py
+++ b/main.py
@@ -10,6 +10,6 @@ def tree_position(lat, lon):
return {'lat':lat, 'lon':lon, 'ville':city, 'rue':main_street, 'début tronçon': begin, 'fin tronçon':end}
if __name__=="__main__":
- lat = 48.89525193
- lon = 2.247122897
+ lat = 48.89394122
+ lon = 2.247959188
print(tree_position(lat, lon))
\ No newline at end of file
diff --git a/research.py b/research.py
index fc827f6..b605890 100644
--- a/research.py
+++ b/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:
- street = requete_osm(lat+step, lon)['address']['road']
+ try:
+ street = requete_osm(lat+step, lon)['address']['road']
+ except KeyError:
+ pass
elif i == 1:
- street = requete_osm(lat+step_diag, lon+step_diag)['address']['road']
+ try:
+ street = requete_osm(lat+step_diag, lon+step_diag)['address']['road']
+ except KeyError:
+ pass
elif i == 2:
- street = requete_osm(lat, lon+step)['address']['road']
+ try:
+ street = requete_osm(lat, lon+step)['address']['road']
+ except KeyError:
+ pass
elif i == 3:
- street = requete_osm(lat-step_diag, lon+step_diag)['address']['road']
+ try:
+ street = requete_osm(lat-step_diag, lon+step_diag)['address']['road']
+ except KeyError:
+ pass
elif i == 4:
- street = requete_osm(lat-step, lon)['address']['road']
+ try:
+ street = requete_osm(lat-step, lon)['address']['road']
+ except KeyError:
+ pass
elif i == 5:
- street = requete_osm(lat-step_diag, lon-step_diag)['address']['road']
+ try:
+ street = requete_osm(lat-step_diag, lon-step_diag)['address']['road']
+ except KeyError:
+ pass
elif i == 6:
- street = requete_osm(lat, lon-step)['address']['road']
+ try:
+ street = requete_osm(lat, lon-step)['address']['road']
+ except KeyError:
+ pass
elif i == 7:
- street = requete_osm(lat+step_diag, lon-step_diag)['address']['road']
+ try:
+ street = requete_osm(lat+step_diag, lon-step_diag)['address']['road']
+ except KeyError:
+ pass
return street
--
GitLab