From 5ae38bafdf06518b30d092d8b68d5a41f5539249 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 16 Dec 2014 15:01:05 +0100 Subject: [enh] add photon engine --- searx/engines/openstreetmap.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'searx/engines/openstreetmap.py') diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index 36b6011e7..be775122a 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -9,20 +9,23 @@ # @parse url, title from json import loads +from searx.utils import searx_useragent # engine dependent config categories = ['map'] paging = False # search-url -url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1' - +base_url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1' result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' # do search-request def request(query, params): - params['url'] = url.format(query=query) + params['url'] = base_url.format(query=query) + + # using searx User-Agent + params['headers']['User-Agent'] = searx_useragent() return params -- cgit v1.2.3 From 672f1c674ca63b7589c1bc6b0c32caf439bd16db Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 16 Dec 2014 17:01:25 +0100 Subject: [fix] pep8 --- searx/engines/openstreetmap.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'searx/engines/openstreetmap.py') diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index be775122a..68446ef5f 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -16,13 +16,14 @@ categories = ['map'] paging = False # search-url -base_url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1' +base_url = 'https://nominatim.openstreetmap.org/' +search_string = 'search/{query}?format=json&polygon_geojson=1&addressdetails=1' result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' # do search-request def request(query, params): - params['url'] = base_url.format(query=query) + params['url'] = base_url + search_string.format(query=query) # using searx User-Agent params['headers']['User-Agent'] = searx_useragent() @@ -71,8 +72,8 @@ def response(resp): address.update({'house_number': address_raw.get('house_number'), 'road': address_raw.get('road'), 'locality': address_raw.get('city', - address_raw.get('town', - address_raw.get('village'))), + address_raw.get('town', # noqa + address_raw.get('village'))), # noqa 'postcode': address_raw.get('postcode'), 'country': address_raw.get('country'), 'country_code': address_raw.get('country_code')}) -- cgit v1.2.3