Mirrors/wttr.in
2
0
Fork 0
mirror of https://github.com/chubin/wttr.in synced 2024-11-15 00:27:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not add country name to the GPS coords (fixes #260)

Browse source
This commit is contained in:
Igor Chubin 2019-01-11 17:27:14 +01:00
parent 6dfd809694
commit 0f6d8da10c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/location.py
View file

@ -243,7 +243,7 @@ def location_processing(location, ip_addr):
# contains some unicode symbols # contains some unicode symbols
# here we resolve them # here we resolve them
if location is not None and not ascii_only(location): if location is not None and not ascii_only(location):
location = "~" + location location = "~" + location.lstrip('~')
if location is not None and location.upper() in IATA_CODES: if location is not None and location.upper() in IATA_CODES:
location = '~%s' % location location = '~%s' % location
@ -252,7 +252,10 @@ def location_processing(location, ip_addr):
geolocation = geolocator(location_canonical_name(location[1:])) geolocation = geolocator(location_canonical_name(location[1:]))
if geolocation is not None: if geolocation is not None:
override_location_name = location[1:].replace('+', ' ') override_location_name = location[1:].replace('+', ' ')
if country:
override_location_name += ", %s" % country
location = "%s,%s" % (geolocation['latitude'], geolocation['longitude']) location = "%s,%s" % (geolocation['latitude'], geolocation['longitude'])
country = None
if not hide_full_address: if not hide_full_address:
full_address = geolocation['address'] full_address = geolocation['address']
else: else: