From 4b75d41f864b9d127aa88c962b7ce849ee3b0b51 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Wed, 19 Nov 2014 14:59:30 +0100
Subject: [PATCH] [enh][oscar_template] loading map informations from
 overpass-api

---
 searx/engines/openstreetmap.py                |   4 +
 searx/static/oscar/img/loader.gif             | Bin 0 -> 14190 bytes
 searx/static/oscar/js/scripts.js              |  84 +++++++++++++++++-
 .../templates/oscar/result_templates/map.html |  36 +++++++-
 4 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 searx/static/oscar/img/loader.gif

diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
index db0fbfe75..f727ca8ea 100644
--- a/searx/engines/openstreetmap.py
+++ b/searx/engines/openstreetmap.py
@@ -39,6 +39,9 @@ def response(resp):
         url = result_base_url.format(osm_type=osm_type,
                                      osm_id=r['osm_id'])
 
+        osm = {'type':osm_type,
+               'id':r['osm_id']}
+
         geojson =  r.get('geojson')
 
         # if no geojson is found and osm_type is a node, add geojson Point
@@ -82,6 +85,7 @@ def response(resp):
                         'boundingbox': r['boundingbox'],
                         'geojson': geojson,
                         'address': address,
+                        'osm': osm,
                         'url': url})
 
     # return results
diff --git a/searx/static/oscar/img/loader.gif b/searx/static/oscar/img/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3980ff00b1bc7d845ea080629a1702c5a6d1ca11
GIT binary patch
literal 14190
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
J3<O*FzX8P2Vs`)l

literal 0
HcmV?d00001

diff --git a/searx/static/oscar/js/scripts.js b/searx/static/oscar/js/scripts.js
index b37c72857..92847de96 100644
--- a/searx/static/oscar/js/scripts.js
+++ b/searx/static/oscar/js/scripts.js
@@ -68,6 +68,88 @@ $(document).ready(function(){
             source: searx.searchResults.ttAdapter()
         });
     }
+    
+    $(".searx_overpass_request").on( "click", function( event ) {
+        var overpass_url = "http://overpass-api.de/api/interpreter?data=";
+        var query_start = overpass_url + "[out:json][timeout:25];(";
+        var query_end = ");out meta;";
+        
+        var osm_id = $(this).data('osm-id');
+        var osm_type = $(this).data('osm-type');
+        var result_table = $(this).data('result-table');
+        var result_table_loadicon = "#" + $(this).data('result-table-loadicon');
+        
+        // tags which can be ignored
+        var osm_ignore_tags = [ "addr:city", "addr:country", "addr:housenumber", "addr:postcode", "addr:street" ]
+        
+        if(osm_id && osm_type && result_table) {
+            result_table = "#" + result_table;
+            var query = null;
+            switch(osm_type) {
+                case 'node':
+                    query = query_start + "node(" + osm_id + ");" + query_end;
+                    break;
+                case 'way':
+                    query = query_start + "way(" + osm_id + ");" + query_end;
+                    break;
+                case 'relation':
+                    query = query_start + "relation(" + osm_id + ");" + query_end;
+                    break;
+                default:
+                    break;
+            }
+            if(query) {
+                //alert(query);
+                var ajaxRequest = $.ajax( query )
+                .done(function( html) {
+                    if(html && html['elements'] && html['elements'][0]) {
+                        var element = html['elements'][0];
+                        var newHtml = $(result_table).html();
+                        for (var row in element.tags) {
+                            if(element.tags["name"] == null || osm_ignore_tags.indexOf(row) == -1) {
+                                newHtml += "<tr><td>" + row + "</td><td>";
+                                switch(row) {
+                                    case "phone":
+                                    case "fax":
+                                        newHtml += "<a href=\"tel:" + element.tags[row].replace(/ /g,'') + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "email":
+                                        newHtml += "<a href=\"mailto:" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "website":
+                                    case "url":
+                                        newHtml += "<a href=\"" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikidata":
+                                        newHtml += "<a href=\"https://www.wikidata.org/wiki/" + element.tags[row] + "\">" + element.tags[row] + "</a>";
+                                        break;
+                                    case "wikipedia":
+                                        if(element.tags[row].indexOf(":") != -1) {
+                                            newHtml += "<a href=\"https://" + element.tags[row].substring(0,element.tags[row].indexOf(":")) + ".wikipedia.org/wiki/" 
+                                                + element.tags[row].substring(element.tags[row].indexOf(":")+1) + "\">" + element.tags[row] + "</a>";
+                                            break;
+                                        }
+                                    default:
+                                        newHtml += element.tags[row];
+                                        break;
+                                }
+                                newHtml += "</td></tr>";
+                            }
+                        }
+                        $(result_table).html(newHtml);
+                        $(result_table).removeClass('hidden');
+                        $(result_table_loadicon).addClass('hidden');
+                    }
+                })
+                .fail(function() {
+                    alert( "could not load " );
+                })
+            }
+        }
+
+        // this event occour only once per element
+        $( this ).off( event );    
+    });
 
     $(".searx_init_map").on( "click", function( event ) {
         var leaflet_target = $(this).data('leaflet-target');
@@ -119,7 +201,7 @@ $(document).ready(function(){
                     map.setView(new L.LatLng(map_lat, map_lon),8);
             }
 
-	        map.addLayer(osmMapnik);
+	        map.addLayer(osmMapquest);
 	        
 	        var baseLayers = {
              "OSM Mapnik": osmMapnik,
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html
index a7c37dd59..531146dc6 100644
--- a/searx/templates/oscar/result_templates/map.html
+++ b/searx/templates/oscar/result_templates/map.html
@@ -3,13 +3,25 @@
 <h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+
 <small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
+
 {% 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.osm and (result.osm.type and result.osm.id) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer searx_overpass_request" data-toggle="collapse" data-target="#result-overpass-{{ index }}" data-osm-type="{{ result.osm.type }}" data-osm-id="{{ result.osm.id }}" data-result-table="result-overpass-table-{{ index }}" data-result-table-loadicon="result-overpass-table-loading-{{ index }}" data-btn-text-collapsed="{{ _('show details') }}" data-btn-text-not-collapsed="{{ _('hide details') }}">{{ icon('map-marker') }} {{ _('show details') }}</a></small>
+{% endif %}
+
+{# {% if (result.latitude and result.longitude) %}
+    <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer" data-toggle="collapse" data-target="#result-geodata-{{ index }}" data-btn-text-collapsed="{{ _('show geodata') }}" data-btn-text-not-collapsed="{{ _('hide geodata') }}">{{ icon('map-marker') }} {{ _('show geodata') }}</a></small>
+{% endif %} #}
+
+<div class="container-fluid">
+
 {% if result.address %}
-<p class="result-content result-adress" itemscope itemtype="http://schema.org/PostalAddress">
+<p class="row result-content result-adress col-xs-12 col-sm-5 col-md-4" itemscope itemtype="http://schema.org/PostalAddress">
     {% if result.address.name %}
         <strong itemprop="name">{{ result.address.name }}</strong><br/>
     {% endif %}
@@ -27,11 +39,29 @@
     {% if result.address.country %}
         <span itemprop="addressCountry">{{ result.address.country }}</span>
     {% endif %}
-</p><div class="clearfix"></div>
+</p>
 {% endif %}
 
-{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
+{% if result.osm and (result.osm.type and result.osm.id) %}
+    <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}">
+        <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
+        <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
+            <tr><th>key</th><th>value</th></tr>
+        </table>
+    </div>
+{% endif %}
 
+{# {% if (result.latitude and result.longitude) %}
+    <div class="row collapse col-xs-12 col-sm-5 col-md-4" id="result-geodata-{{ index }}">
+        <strong>Longitude:</strong> {{ result.longitude }} <br/>
+        <strong>Latitude:</strong> {{ result.latitude }}
+    </div>
+{% endif %} #}
+
+{% if result.content %}<p class="row result-content col-xs-12 col-sm-12 col-md-12">{{ result.content|safe }}</p>{% endif %}
+
+</div>
+    
 {% if (result.latitude and result.longitude) or result.boundingbox %}
     <div class="collapse" id="result-map-{{ index }}">
         <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>