altosdroid: Show our position in the map tab. Squeeze to fit phones

Shrink everything to fit on phones, then add phone location to the map tab

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

3 files changed, 23 insertions, 7 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index cf4227ca..3715c3f9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -271,7 +271,7 @@ public class AltosDroid extends FragmentActivity {
 		}
 		int deg = (int) Math.floor(p);
 		double min = (p - Math.floor(p)) * 60.0;
-		return String.format("%d° %9.6f\" %s", deg, min, h);
+		return String.format("%d°%9.4f\" %s", deg, min, h);
 	}
 
 	@Override
@@ -312,6 +312,8 @@ public class AltosDroid extends FragmentActivity {
 		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator("Landed"), TabLanded.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator("Map"), TabMap.class, null);
 
+		for (int i = 0; i < 5; i++)
+			mTabHost.getTabWidget().getChildAt(i).getLayoutParams().height = 45;
 
 		// Set up the custom title
 		mTitle = (TextView) findViewById(R.id.title_left_text);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 0a208fa8..29696dbf 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -55,8 +55,10 @@ public class TabMap extends Fragment implements AltosDroidTab {
 
 	private TextView mDistanceView;
 	private TextView mBearingView;
-	private TextView mLatitudeView;
-	private TextView mLongitudeView;
+	private TextView mTargetLatitudeView;
+	private TextView mTargetLongitudeView;
+	private TextView mReceiverLatitudeView;
+	private TextView mReceiverLongitudeView;
 
 	@Override
 	public void onAttach(Activity activity) {
@@ -84,8 +86,10 @@ public class TabMap extends Fragment implements AltosDroidTab {
 		View v = inflater.inflate(R.layout.tab_map, container, false);
 		mDistanceView  = (TextView)v.findViewById(R.id.distance_value);
 		mBearingView   = (TextView)v.findViewById(R.id.bearing_value);
-		mLatitudeView  = (TextView)v.findViewById(R.id.lat_value);
-		mLongitudeView = (TextView)v.findViewById(R.id.lon_value);
+		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value);
+		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
+		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
 		return v;
 	}
 
@@ -146,8 +150,13 @@ public class TabMap extends Fragment implements AltosDroidTab {
 			mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
 		}
 		if (state.gps != null) {
-			mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-			mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+			mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+		}
+
+		if (receiver != null) {
+			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
 		}
 
 		if (mapLoaded) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 0ddfdfc3..f1304a95 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -245,6 +245,9 @@ public class TelemetryService extends Service {
 	}
 
 	private void startAltosBluetooth() {
+		if (device == null) {
+			return;
+		}
 		if (mAltosBluetooth == null) {
 			if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
 			mAltosBluetooth = new AltosBluetooth(device, mHandler);
@@ -274,6 +277,8 @@ public class TelemetryService extends Service {
 
 	private void connected() {
 		try {
+			if (mAltosBluetooth == null)
+				throw new InterruptedException("no bluetooth");
 			mConfigData = mAltosBluetooth.config_data();
 		} catch (InterruptedException e) {
 		} catch (TimeoutException e) {