on master help sign in
[mod] wikidata: WDGeoAttribute class: doesn't change the method signature of get_str
commit9ed3ee2bebf2f159d4231d9aad9df53aea6db90a authorAlexandre Flament <alex@al-f.net> dateMon 16 Nov 2020, 09:41 (6 years ago) parent3cfef61
1 file changed+10−3
searx/engines/wikidata.py+10−3
searx/engines/wikidata.py+10−3
@@ -23,7 +23,7 @@ from searx.data import WIKIDATA_UNITS
2323from searx.poolrequests import post, get
2424from searx.utils import match_language, searx_useragent, get_string_replaces_function
2525from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom
26−from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url # NOQA
26+from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url # NOQA # pylint: disable=unused-import
2727
2828logger = logger.getChild('wikidata')
2929
@@ -228,7 +228,7 @@ def get_results(attribute_result, attributes, language):
228228 # Should use normalized value p:P2046/psn:P2046/wikibase:quantityAmount
229229 area = attribute_result.get('P2046')
230230 osm_zoom = area_to_osm_zoom(area) if area else 19
231− url = attribute.get_str(attribute_result, language, osm_zoom=osm_zoom)
231+ url = attribute.get_geo_url(attribute_result, osm_zoom=osm_zoom)
232232 if url:
233233 infobox_urls.append({'title': attribute.get_label(language),
234234 'url': url,
@@ -546,7 +546,14 @@ class WDGeoAttribute(WDAttribute):
546546 def get_group_by(self):
547547 return self.get_select()
548548
549− def get_str(self, result, language, osm_zoom=19):
549+ def get_str(self, result, language):
550+ latitude = result.get(self.name + 'Lat')
551+ longitude = result.get(self.name + 'Long')
552+ if latitude and longitude:
553+ return latitude + ' ' + longitude
554+ return None
555+
556+ def get_geo_url(self, result, osm_zoom=19):
550557 latitude = result.get(self.name + 'Lat')
551558 longitude = result.get(self.name + 'Long')
552559 if latitude and longitude: