OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[fix] openstreetmap - fix some minor whitespace & indentation issues

Browse source 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2021-06-09 17:11:06 +02:00
parent 40956e8e6b
commit bf10b4a857
3 changed files with 38 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
searx/engines/openstreetmap.py
View file

@ -1,8 +1,8 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
"""
OpenStreetMap (Map)
"""
# lint: pylint # lint: pylint
"""OpenStreetMap (Map)
"""
# pylint: disable=missing-function-docstring # pylint: disable=missing-function-docstring
import re import re
@ -151,16 +151,13 @@ def response(resp):
user_language = resp.search_params['language'] user_language = resp.search_params['language']
if resp.search_params['route']: if resp.search_params['route']:
results.append( results.append({
{ 'answer': gettext('Get directions'),
'answer': gettext('Get directions'), 'url': route_url.format(*resp.search_params['route'].groups()),
'url': route_url.format(*resp.search_params['route'].groups()), })
}
)
fetch_wikidata(nominatim_json, user_language) fetch_wikidata(nominatim_json, user_language)
# parse results
for result in nominatim_json: for result in nominatim_json:
title, address = get_title_address(result) title, address = get_title_address(result)
@ -173,29 +170,27 @@ def response(resp):
links, link_keys = get_links(result, user_language) links, link_keys = get_links(result, user_language)
data = get_data(result, user_language, link_keys) data = get_data(result, user_language, link_keys)
# append result results.append({
results.append( 'template': 'map.html',
{ 'title': title,
'template': 'map.html', 'address': address,
'title': title, 'address_label': get_key_label('addr', user_language),
'address': address, 'url': url,
'address_label': get_key_label('addr', user_language), 'osm': osm,
'url': url, 'geojson': geojson,
'osm': osm, 'img_src': img_src,
'geojson': geojson, 'links': links,
'img_src': img_src, 'data': data,
'links': links, 'type': get_tag_label(
'data': data, result.get('category'), result.get('type', ''), user_language
'type': get_tag_label(result.get('category'), result.get('type', ''), user_language), ),
'type_icon': result.get('icon'), 'type_icon': result.get('icon'),
'content': '', 'content': '',
'longitude': result['lon'], 'longitude': result['lon'],
'latitude': result['lat'], 'latitude': result['lat'],
'boundingbox': result['boundingbox'], 'boundingbox': result['boundingbox'],
} })
)
# return results
return results return results
@ -353,13 +348,11 @@ def get_links(result, user_language):
url, url_label = mapping_function(raw_value) url, url_label = mapping_function(raw_value)
if url.startswith('https://wikidata.org'): if url.startswith('https://wikidata.org'):
url_label = result.get('wikidata', {}).get('itemLabel') or url_label url_label = result.get('wikidata', {}).get('itemLabel') or url_label
links.append( links.append({
{ 'label': get_key_label(k, user_language),
'label': get_key_label(k, user_language), 'url': url,
'url': url, 'url_label': url_label,
'url_label': url_label, })
}
)
link_keys.add(k) link_keys.add(k)
return links, link_keys return links, link_keys
@ -379,13 +372,11 @@ def get_data(result, user_language, ignore_keys):
continue continue
k_label = get_key_label(k, user_language) k_label = get_key_label(k, user_language)
if k_label: if k_label:
data.append( data.append({
{ 'label': k_label,
'label': k_label, 'key': k,
'key': k, 'value': v,
'value': v, })
}
)
data.sort(key=lambda entry: (get_key_rank(entry['key']), entry['label'])) data.sort(key=lambda entry: (get_key_rank(entry['key']), entry['label']))
return data return data

3
searx/static/themes/simple/less/style.less
View file

@ -330,9 +330,6 @@ article.result-images[data-vim-selected]::before {
text-align: left; text-align: left;
} }
} }
} }
.torrent_result { .torrent_result {

2
searx/templates/oscar/result_templates/map.html
View file

@ -59,7 +59,7 @@
<span><a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" 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></span> <span><a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" 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></span>
{%- endif -%} {%- endif -%}
</p> </p>
</div> </div>
{%- if (result.latitude and result.longitude) or result.boundingbox -%} {%- if (result.latitude and result.longitude) or result.boundingbox -%}