From b502f5a9375b12cad86ac05bb37550f140086cdc 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:14:00 +0100 Subject: [PATCH] grandlyon: prefer map coordinates over geocoding for similar items (#21569) --- grandlyon/wcs-scripts/similar_map.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/grandlyon/wcs-scripts/similar_map.py b/grandlyon/wcs-scripts/similar_map.py index f8f6162..3424d64 100644 --- a/grandlyon/wcs-scripts/similar_map.py +++ b/grandlyon/wcs-scripts/similar_map.py @@ -3,12 +3,17 @@ from qommon.form import MapWidget result = '' -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) - map_widget = MapWidget('geo', readonly=True, value='%(lat)s;%(lon)s' % coords, + coords = '%(lat)s;%(lon)s' % coords + +if coords: + map_widget = MapWidget('geo', readonly=True, value=coords, initial_zoom=16) result = '''