ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #344 from dalf/osm-lang-all-fix 

[fix] openstreetmap engine: map "all" language to English
This commit is contained in:
Alexandre Flament 2021-09-25 11:29:13 +02:00 committed by GitHub
parent 636215b1f2 ab569c1e12
commit 0c3314b338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/engines/openstreetmap.py
View File

@ -42,6 +42,7 @@ route_re = re.compile('(?:from )?(.+) to (.+)')
wikidata_image_sparql = """ wikidata_image_sparql = """
select ?item ?itemLabel ?image ?sign ?symbol ?website ?wikipediaName select ?item ?itemLabel ?image ?sign ?symbol ?website ?wikipediaName
where { where {
hint:Query hint:optimizer "None".
values ?item { %WIKIDATA_IDS% } values ?item { %WIKIDATA_IDS% }
OPTIONAL { ?item wdt:P18|wdt:P8517|wdt:P4291|wdt:P5252|wdt:P3451|wdt:P4640|wdt:P5775|wdt:P2716|wdt:P1801|wdt:P4896 ?image } OPTIONAL { ?item wdt:P18|wdt:P8517|wdt:P4291|wdt:P5252|wdt:P3451|wdt:P4640|wdt:P5775|wdt:P2716|wdt:P1801|wdt:P4896 ?image }
OPTIONAL { ?item wdt:P1766|wdt:P8505|wdt:P8667 ?sign } OPTIONAL { ?item wdt:P1766|wdt:P8505|wdt:P8667 ?sign }
@ -220,6 +221,7 @@ def fetch_wikidata(nominatim_json, user_langage):
wd_to_results.setdefault(wd_id, []).append(result) wd_to_results.setdefault(wd_id, []).append(result)
if wikidata_ids: if wikidata_ids:
user_langage = 'en' if user_langage == 'all' else user_langage
wikidata_ids_str = " ".join(wikidata_ids) wikidata_ids_str = " ".join(wikidata_ids)
query = wikidata_image_sparql.replace('%WIKIDATA_IDS%', sparql_string_escape(wikidata_ids_str)).replace( query = wikidata_image_sparql.replace('%WIKIDATA_IDS%', sparql_string_escape(wikidata_ids_str)).replace(
'%LANGUAGE%', sparql_string_escape(user_langage) '%LANGUAGE%', sparql_string_escape(user_langage)