[enh][oscar_template] loading map informations from overpass-api

1 files changed, 33 insertions, 3 deletions

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>