0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

geo.get_country: allow name as arg, not just code

Browse source
This commit is contained in:
rolux 2013-08-28 12:06:56 +02:00
parent 22eecc22e4
commit cb45a25a7c
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ox/geo.py
View file

@ -1910,9 +1910,19 @@ def get_area(southwest, northeast):
math.sin(southwest['lat']) - math.sin(northeast['lat']) math.sin(southwest['lat']) - math.sin(northeast['lat'])
) * abs(southwest['lng'] - northeast['lng']); ) * abs(southwest['lng'] - northeast['lng']);
def get_country(country_code): def get_country(code_or_name):
country_code = country_code.upper() if isinstance(code_or_name, unicode):
return COUNTRIES[country_code] if country_code in COUNTRIES else {} code_or_name = code_or_name.encode('utf-8')
if len(code_or_name) == 2:
code_or_name = code_or_name.upper()
return COUNTRIES[code_or_name] if code_or_name in COUNTRIES else {}
else:
for code, country in COUNTRIES.iteritems():
if code_or_name == country['name'] or (
'aliases' in country and code_or_name in country['aliases']
):
return country
return {}
def get_country_name(country_code): def get_country_name(country_code):
country_code = country_code.upper() country_code = country_code.upper()