X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosState.java;h=3ef00f35d7d87375cf4967553f5e28c3bdd6edd6;hp=deeb4c771dcec9fb825d918bea922f75c3ff4024;hb=63bd34cd1b5a411489e8c3ab377f0fe0eec11f67;hpb=0e917f3ff822616adb147517ac961422e5fedbfd

diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java
index deeb4c77..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,12 +126,7 @@ public class AltosState {
 		}
 
 		if (state == Altos.ao_flight_pad) {
-			if (data.gps == null)
-				System.out.printf("on pad, gps null\n");
-			else
-				System.out.printf ("on pad gps lat %f lon %f locked %d nsat %d\n",
-						   data.gps.lat, data.gps.lon, data.gps.locked ? 1 : 0, data.gps.nsat);
-			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 */
@@ -166,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;
 		}