miaowware
/
qrm2
mirror of https://github.com/miaowware/qrm2.git
1
0
Fork 0
Code Issues Actions Projects Releases Wiki Activity

fix regression in grid (continuations)

This commit is contained in:
Abigail 2019-12-31 01:13:45 -05:00
parent ea8c3a9045
commit 74558c7f27
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
exts/grid.py
View File

@ -83,18 +83,21 @@ If two grid squares are given, the distance and azimuth between them is calculat
# Haversine formula
d_lat = math.radians(loc2[0] - loc[0])
d_lon = math.radians(loc2[1] - loc[1])
a = math.sin(d_lat/2) ** 2
a += math.cos(math.radians(loc[0])) * math.cos(math.radians(loc2[0]))
a *= math.sin(d_lon/2) ** 2
a = (math.sin(d_lat/2) ** 2
+ math.cos(math.radians(loc[0]))
* math.cos(math.radians(loc2[0]))
* math.sin(d_lon/2) ** 2)
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a))
d = radius * c
d_mi = 0.6213712 * d
# Bearing
y_dist = math.sin(math.radians(loc2[1]-loc[1])) * math.cos(math.radians(loc2[0]))
x_dist = math.cos(math.radians(loc[0])) * math.sin(math.radians(loc2[0]))
x_dist -= math.sin(math.radians(loc[0])) * math.cos(math.radians(loc2[0]))
x_dist *= math.cos(math.radians(loc2[1] - loc[1]))
x_dist = (math.cos(math.radians(loc[0]))
* math.sin(math.radians(loc2[0]))
- math.sin(math.radians(loc[0]))
* math.cos(math.radians(loc2[0]))
* math.cos(math.radians(loc2[1] - loc[1])))
bearing = (math.degrees(math.atan2(y_dist, x_dist)) + 360) % 360
embed = cmn.embed_factory(ctx)