jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-15 09:17:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch connection issue with freegeoip.net (Fixes #1378)

Browse Source
This commit is contained in:
Fabian Affolter 2016-02-27 23:58:36 +01:00
parent 9e4ddc405d
commit eb8228237e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/util/location.py
View File

@ -1,7 +1,4 @@
""" """
homeassistant.util.location
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Module with location helpers. Module with location helpers.
detect_location_info and elevation are mocked by default during tests. detect_location_info and elevation are mocked by default during tests.
@ -22,12 +19,12 @@ LocationInfo = collections.namedtuple(
def detect_location_info(): def detect_location_info():
""" Detect location information. """ """Detect location information."""
try: try:
raw_info = requests.get( raw_info = requests.get(
'https://freegeoip.net/json/', timeout=5).json() 'https://freegeoip.net/json/', timeout=5).json()
except requests.RequestException: except (requests.RequestException, ValueError):
return return None
data = {key: raw_info.get(key) for key in LocationInfo._fields} data = {key: raw_info.get(key) for key in LocationInfo._fields}
@ -41,12 +38,12 @@ def detect_location_info():
def distance(lat1, lon1, lat2, lon2): def distance(lat1, lon1, lat2, lon2):
""" Calculate the distance in meters between two points. """ """Calculate the distance in meters between two points."""
return vincenty((lat1, lon1), (lat2, lon2)) * 1000 return vincenty((lat1, lon1), (lat2, lon2)) * 1000
def elevation(latitude, longitude): def elevation(latitude, longitude):
""" Return elevation for given latitude and longitude. """ """Return elevation for given latitude and longitude."""
req = requests.get(ELEVATION_URL, params={ req = requests.get(ELEVATION_URL, params={
'locations': '{},{}'.format(latitude, longitude), 'locations': '{},{}'.format(latitude, longitude),
'sensor': 'false', 'sensor': 'false',