From c38917bb2a472429f78cd00fffb5e7057ceecc02 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 3 Nov 2014 18:46:58 +0100
Subject: [PATCH] [enh] template_oscar: show addressdata if possible

---
 searx/engines/openstreetmap.py                |  27 +++++++++++++++++-
 searx/static/oscar/css/oscar.min.css          | Bin 1047 -> 1078 bytes
 searx/static/oscar/less/oscar/results.less    |   2 ++
 .../templates/oscar/result_templates/map.html |  24 +++++++++++++++-
 4 files changed, 51 insertions(+), 2 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
diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css
index 1afd3e866182ffc376896eb5de54313965bd009a..b8d6fba156d46bd2063a4f4003ea52cffe8608c3 100644
GIT binary patch
delta 29
kcmbQvv5jNHX-0wS+{B{v%skza`~oY}f{NPBdl;jc0I1Uo1ONa4

delta 12
TcmdnSF`Z+>X~xa37=4%kA@Kyp

diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/oscar/less/oscar/results.less
index 9ca2109bc..08500b3ff 100644
--- a/searx/static/oscar/less/oscar/results.less
+++ b/searx/static/oscar/less/oscar/results.less
@@ -17,6 +17,8 @@
 }
 
 .result-content {
+    margin-top: 5px;
+
     .highlight {
         font-weight:bold;
     }
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html
index 45aa76356..2c1e549e3 100644
--- a/searx/templates/oscar/result_templates/map.html
+++ b/searx/templates/oscar/result_templates/map.html
@@ -7,7 +7,29 @@
 {% if (result.latitude and result.longitude) or result.boundingbox %}
     <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>
 {% endif %}
-   
+
+{% if result.address %}
+<p class="result-content result-adress" itemscope itemtype="http://schema.org/PostalAddress">
+    {% if result.address.name %}
+        <strong itemprop="name">{{ result.address.name }}</strong><br/>
+    {% endif %}
+    {% if result.address.road %}
+        <span itemprop="streetAddress">
+            {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %}
+            {{ result.address.road }}
+        </span><br/>
+    {% endif %}
+    {% if result.address.locality %}
+        <span itemprop="addressLocality">{{ result.address.locality }}</span>,
+        {% if result.address.postcode %} <span itemprop="postalCode">{{ result.address.postcode }}</span>{% endif %}
+        <br/>
+    {% endif %}
+    {% if result.address.country %}
+        <span itemprop="addressCountry">{{ result.address.country }}</span>
+    {% endif %}
+</p><div class="clearfix"></div>
+{% endif %}
+
 {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
 
 {% if (result.latitude and result.longitude) or result.boundingbox %}