From 3cd8ff18a7546c1e251747ba26240cb130003ef1 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 13 Apr 2013 12:13:18 -0700
Subject: altosdroid: Update UI even if no telem has been received. Center map.

This allows the receiver location to be displayed even when telemetry
is not.

Center the map on the first valid location, either receiver or
rocket. Update center if a significantly more precise location is received.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .../src/org/altusmetrum/AltosDroid/TabDescent.java | 50 +++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java')

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 698e89fc..49774a30 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -90,31 +90,33 @@ public class TabDescent extends Fragment implements AltosDroidTab {
 	}
 
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
-		mHeightView.setText(String.format("%6.0f m", state.height));
-		if (from_receiver != null) {
-			mElevationView.setText(String.format("%3.0f°", from_receiver.elevation));
-			mRangeView.setText(String.format("%6.0f m", from_receiver.range));
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
-			mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
-			mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
-		} else { 
-			mElevationView.setText("<unknown>");
-			mRangeView.setText("<unknown>");
-			mBearingView.setText("<unknown>");
-			mCompassView.setText("<unknown>");
-			mDistanceView.setText("<unknown>");
+		if (state != null) {
+			mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
+			mHeightView.setText(String.format("%6.0f m", state.height));
+			if (from_receiver != null) {
+				mElevationView.setText(String.format("%3.0f°", from_receiver.elevation));
+				mRangeView.setText(String.format("%6.0f m", from_receiver.range));
+				mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+				mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
+				mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+			} else { 
+				mElevationView.setText("<unknown>");
+				mRangeView.setText("<unknown>");
+				mBearingView.setText("<unknown>");
+				mCompassView.setText("<unknown>");
+				mDistanceView.setText("<unknown>");
+			}
+			if (state.gps != null) {
+				mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+			}
+
+			mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
+			mApogeeLights.set(state.drogue_sense > 3.2);
+
+			mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
+			mMainLights.set(state.main_sense > 3.2);
 		}
-		if (state.gps != null) {
-			mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-			mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
-		}
-
-		mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
-		mApogeeLights.set(state.drogue_sense > 3.2);
-
-		mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
-		mMainLights.set(state.main_sense > 3.2);
 	}
 
 }
-- 
cgit v1.2.3