jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests and linting

Browse Source
This commit is contained in:
Paulus Schoutsen
2015-09-20 11:46:01 -07:00
parent 0d09e2e1df
commit 30492cc685
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/util/location.py
View File

@@ -38,13 +38,11 @@ def distance(lon1, lat1, lon2, lat2):
in decimal degrees on the earth using the Haversine algorithm.
"""
# convert decimal degrees to radians
lon1, lat1, lon2, lat2 = map(radians, [lon1, lat1, lon2, lat2])
lon1, lat1, lon2, lat2 = (radians(val) for val in (lon1, lat1, lon2, lat2))
# haversine formula
dlon = lon2 - lon1
dlat = lat2 - lat1
a = sin(dlat/2)**2 + cos(lat1) * cos(lat2) * sin(dlon/2)**2
c = 2 * asin(sqrt(a))
angle = sin(dlat/2)**2 + cos(lat1) * cos(lat2) * sin(dlon/2)**2
# Radius of earth in meters.
radius = 6371000
return c * radius
return 2 * radius * asin(sqrt(angle))