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

Canonify contries names

Browse source
This commit is contained in:
Igor Chubin 2021-01-02 17:32:06 +01:00
parent e525129847
commit ed569540bc
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/location.py
View file

@ -206,7 +206,7 @@ def _geoip(ip_addr):
try:
response = GEOIP_READER.city(ip_addr)
city, region, country, ccode, lat, long = response.city.name, response.subdivisions.name, response.country.name, response.country.iso_code, response.location.latitude, response.location.longitude
except geoip2.errors.AddressNotFoundError:
except (geoip2.errors.AddressNotFoundError, AttributeError):
return None
return [city, region, country, ccode, lat, long]
@ -320,6 +320,34 @@ def _get_hemisphere(location):
return geolocation["latitude"] > 0
def _fully_qualified_location(location, region, country):
""" Return fully qualified location name with `region` and `country`,
as a string.
"""
# If country is not specified, location stays as is
if not country:
return location
# Canonify/shorten country name
if country == "United Kingdom of Great Britain and Northern Ireland":
country = "United Kingdom"
elif country == "Russian Federation":
country = "Russia"
elif country == "United States of America":
country = "United States"
# In United States region is important, because there are a lot of
# locations with the same name in different regions.
# In the rest of the world, usage of region name may decrease chances
# or correct name resolution, so for the moment `region` is used
# only for the United States
if country == "United States" and region:
location += ", %s, %s" % (region, country)
else:
location += ", %s" % country
return location
def location_processing(location, ip_addr):
"""
"""
@ -343,8 +371,7 @@ def location_processing(location, ip_addr):
socket.gethostbyname(
location.lstrip('~ ')[1:]))
location = '~' + location
if region and country:
location += ", %s, %s" % (region, country)
location = _fully_qualified_location(location, region, country)
hide_full_address = not force_show_full_address
except:
location, region, country = NOT_FOUND_LOCATION, None, None
@ -368,8 +395,7 @@ def location_processing(location, ip_addr):
# here too
if location:
location = '~' + location
if region and country:
location += ", %s, %s" % (region, country)
location = _fully_qualified_location(location, region, country)
hide_full_address = not force_show_full_address
if location and not location.startswith('~'):
@ -381,7 +407,7 @@ def location_processing(location, ip_addr):
# up to this point it is possible that the name
# contains some unicode symbols
# here we resolve them
if location is not None:
if location is not None and location != NOT_FOUND_LOCATION:
location = "~" + location.lstrip('~ ')
if not override_location_name:
override_location_name = location.lstrip('~')
@ -426,4 +452,5 @@ def _main_():
if __name__ == "__main__":
_main_()
#_main_()
print(_get_location("104.26.4.59"))