summaryrefslogtreecommitdiff
path: root/searx/engines/openstreetmap.py
diff options
context:
space:
mode:
authorThomas Pointhuber <thomas.pointhuber@gmx.at>2014-11-03 18:46:58 +0100
committerThomas Pointhuber <thomas.pointhuber@gmx.at>2014-11-03 18:46:58 +0100
commitc38917bb2a472429f78cd00fffb5e7057ceecc02 (patch)
tree6457f3ed76087f7f36ee719f75d77d8a725bf2f9 /searx/engines/openstreetmap.py
parent2e7723a6c1ce51c6b3830470164ac818126760ae (diff)
downloadsearxng-c38917bb2a472429f78cd00fffb5e7057ceecc02.tar.gz
searxng-c38917bb2a472429f78cd00fffb5e7057ceecc02.zip
[enh] template_oscar: show addressdata if possible
Diffstat (limited to 'searx/engines/openstreetmap.py')
-rw-r--r--searx/engines/openstreetmap.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
index d73a116ba..e5deba1e5 100644
--- a/searx/engines/openstreetmap.py
+++ b/searx/engines/openstreetmap.py
@@ -15,7 +15,7 @@ categories = ['map']
paging = False
# search-url
-url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1'
+url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1'
result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
@@ -47,6 +47,30 @@ def response(resp):
geojson = {u'type':u'Point',
u'coordinates':[r['lon'],r['lat']]}
+ address_raw = r.get('address')
+ address = {}
+
+ # get name
+ if r['class'] == 'amenity' or\
+ r['class'] == 'shop' or\
+ r['class'] == 'tourism' or\
+ r['class'] == 'leisure':
+ if address_raw.get('address29'):
+ address = {'name':address_raw.get('address29')}
+ else:
+ address = {'name':address_raw.get(r['type'])}
+
+ # add rest of adressdata, if something is already found
+ if address.get('name'):
+ address.update({'house_number':address_raw.get('house_number'),
+ 'road':address_raw.get('road'),
+ 'locality':address_raw.get('town', address_raw.get('village')),
+ 'postcode':address_raw.get('postcode'),
+ 'country':address_raw.get('country'),
+ 'country_code':address_raw.get('country_code')})
+ else:
+ address = None
+
# append result
results.append({'template': 'map.html',
'title': title,
@@ -55,6 +79,7 @@ def response(resp):
'latitude': r['lat'],
'boundingbox': r['boundingbox'],
'geojson': geojson,
+ 'address': address,
'url': url})
# return results