altosui: add elevation and range information

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java
index c13dfe68..3ef00f35 100644
--- a/ao-tools/altosui/AltosState.java
+++ b/ao-tools/altosui/AltosState.java
@@ -64,6 +64,8 @@ public class AltosState {
 	boolean	gps_ready;
 
 	AltosGreatCircle from_pad;
+	double	elevation;	/* from pad */
+	double	range;		/* total distance */
 
 	double	gps_height;
 
@@ -124,7 +126,7 @@ public class AltosState {
 		}
 
 		if (state == Altos.ao_flight_pad) {
-			if (data.gps != null && data.gps.locked && data.gps.nsat >= 4) {
+			if (data.gps != null && data.gps.locked) {
 				npad++;
 				if (npad > 1) {
 					/* filter pad position */
@@ -161,11 +163,18 @@ public class AltosState {
 		if (data.gps != null) {
 			if (gps == null || !gps.locked || data.gps.locked)
 				gps = data.gps;
-			if (npad > 0 && gps.locked)
+			if (npad > 0 && gps.locked) {
 				from_pad = new AltosGreatCircle(pad_lat, pad_lon, gps.lat, gps.lon);
+			}
 		}
+		elevation = 0;
+		range = -1;
 		if (npad > 0) {
 			gps_height = gps.alt - pad_alt;
+			if (from_pad != null) {
+				elevation = Math.atan2(height, from_pad.distance) * 180 / Math.PI;
+				range = Math.sqrt(height * height + from_pad.distance * from_pad.distance);
+			}
 		} else {
 			gps_height = 0;
 		}