entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 46 Releases Activity

misc: limit geocoding to bounding box (#46410)

This commit is contained in:
Lauréline Guérin 2020-12-18 10:49:50 +01:00
parent 1bee5d7de8
commit 65a54ff5da
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test_api.py
View File

@ -3375,11 +3375,27 @@ def test_geocoding(pub):
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/search?format=json&q=test&accept-language=en'
pub.site_options.add_section('options')
pub.site_options.set('options', 'map-bounds-top-left', '1.23;2.34')
pub.site_options.set('options', 'map-bounds-bottom-right', '2.34;3.45')
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
resp = get_app(pub).get('/api/geocoding?q=test')
assert urlopen.call_args[0][0] == ('https://nominatim.entrouvert.org/search?viewbox=2.34,1.23,3.45,2.34&bounded=1&'
'format=json&q=test&accept-language=en')
pub.site_options.set('options', 'nominatim_key', 'KEY')
pub.site_options.set('options', 'map-bounds-top-left', '')
pub.site_options.set('options', 'map-bounds-bottom-right', '')
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
resp = get_app(pub).get('/api/geocoding?q=test')
assert urlopen.call_args[0][0] == 'https://nominatim.entrouvert.org/search?key=KEY&format=json&q=test&accept-language=en'
pub.site_options.set('options', 'map-bounds-top-left', '1.23;2.34')
pub.site_options.set('options', 'map-bounds-bottom-right', '2.34;3.45')
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
resp = get_app(pub).get('/api/geocoding?q=test')
assert urlopen.call_args[0][0] == ('https://nominatim.entrouvert.org/search?key=KEY&viewbox=2.34,1.23,3.45,2.34&bounded=1&'
'format=json&q=test&accept-language=en')
pub.site_options.set('options', 'geocoding_service_url', 'http://reverse.example.net/?param=value')
pub.site_options.write(open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w'))
resp = get_app(pub).get('/api/geocoding?q=test')

5
wcs/qommon/publisher.py
View File

@ -789,6 +789,11 @@ class QommonPublisher(Publisher, object):
key = self.get_site_option('nominatim_key')
if key:
url += '?key=%s' % key
if self.get_site_option('map-bounds-top-left'):
url += '&' if '?' in url else '?'
top, left = self.get_site_option('map-bounds-top-left').split(';')
bottom, right = self.get_site_option('map-bounds-bottom-right').split(';')
url += 'viewbox=%s,%s,%s,%s&bounded=1' % (left, top, right, bottom)
return url
def get_working_day_calendar(self):