From 6fbed62f6f5a545121bb8373b4021b89d8f32356 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 25 Aug 2020 10:37:08 -0400 Subject: [PATCH 1/2] Fix great circle formula in gpsnav --- apps/gpsnav/app.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/gpsnav/app.js b/apps/gpsnav/app.js index 1e70b0cd3..3bbc756b7 100644 --- a/apps/gpsnav/app.js +++ b/apps/gpsnav/app.js @@ -93,9 +93,8 @@ function bearing(a,b){ } function distance(a,b){ - var x = radians(a.lon-b.lon) * Math.cos(radians((a.lat+b.lat)/2)); - var y = radians(b.lat-a.lat); - return Math.round(Math.sqrt(x*x + y*y) * 6371000); + var dsigma = Math.acos(Math.sin(radians(a.lat))*Math.sin(radians(b.lat))+Math.cos(radians(a.lat))*Math.cos(radians(b.lat))*Math.cos(radians(a.lon-b.lon))); + return Math.round(dsigma*6371000); } var selected = false; From a2397ca4215347b250cca3212b3ba41b244ac0ff Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 25 Aug 2020 10:38:40 -0400 Subject: [PATCH 2/2] Fix great circle formula in gpsnav --- apps.json | 2 +- apps/gpsnav/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps.json b/apps.json index 3c9124446..27cb24894 100644 --- a/apps.json +++ b/apps.json @@ -361,7 +361,7 @@ { "id": "gpsnav", "name": "GPS Navigation", "icon": "icon.png", - "version":"0.03", + "version":"0.04", "description": "Displays GPS Course and Speed, + Directions to waypoint and waypoint recording, now with waypoint editor", "tags": "tool,outdoors,gps", "readme": "README.md", diff --git a/apps/gpsnav/ChangeLog b/apps/gpsnav/ChangeLog index d28ad53ac..ee8b61d7b 100644 --- a/apps/gpsnav/ChangeLog +++ b/apps/gpsnav/ChangeLog @@ -1,4 +1,4 @@ 0.01: New App! 0.02: Add SCREENACCESS interface 0.03: Add Waypoint Editor - +0.04: Fix great circle formula