From 111c0cab6214cce4db231ceef98e50e7d2d6f694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 12 Mar 2018 17:18:24 +0100 Subject: [PATCH] grandlyon: prefer map coordinates over geocoding for closeness check (#21569) --- grandlyon/wcs-scripts/has_close_demands.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/grandlyon/wcs-scripts/has_close_demands.py b/grandlyon/wcs-scripts/has_close_demands.py index a7639f8..ff79eba 100644 --- a/grandlyon/wcs-scripts/has_close_demands.py +++ b/grandlyon/wcs-scripts/has_close_demands.py @@ -4,14 +4,16 @@ from quixote import get_publisher from wcs.wf.geolocate import GeolocateWorkflowStatusItem result = False -coords = None -if 'form_var_numero' in vars(): +coords = vars().get('form_var_carte') +if not coords and 'form_var_numero' in vars(): geolocate = GeolocateWorkflowStatusItem() geolocate.method = 'address_string' geolocate.address_string = '[form_var_numero] [form_var_voie], [form_var_commune], France' coords = geolocate.geolocate_address_string(None) + coords = '%(lat)s;%(lon)s' % coords if coords: - lat, lon = coords['lat'], coords['lon'] + lat, lon = coords.split(';') + lat, lon = float(lat), float(lon) lat1, lat2 = lat - 0.008, lat + 0.008 lon1, lon2 = lon - 0.006, lon + 0.006