From ecfc8a08147cfd179b341475333d68a39c978f0f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 20 Apr 2013 17:16:50 -0500
Subject: [PATCH] altosdroid: Update distance/bearing on map tab

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_pad.xml              | 18 +++++++++---------
 .../src/org/altusmetrum/AltosDroid/TabMap.java |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index 00d5ea12..e8f759eb 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -251,14 +251,14 @@
 	<RelativeLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingLeft="69dp"
-		android:paddingTop="5dp" >
+		android:paddingLeft="69dp">
 
 		<TextView
 			android:id="@+id/pad_lat_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android.paddingRight="4dp"
+			android:width="100sp"
+			android.paddingRight="10sp"
 			android:layout_toRightOf="@id/gps_ready_greenled"
 			android:text="@string/pad_lat_label" />
 
@@ -274,14 +274,14 @@
 	<RelativeLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingLeft="69dp"
-		android:paddingTop="5dp" >
+		android:paddingLeft="69dp">
 
 		<TextView
 			android:id="@+id/pad_lon_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android.paddingRight="4dp"
+			android:width="100sp"
+			android.paddingRight="10sp"
 			android:layout_toRightOf="@id/gps_ready_greenled"
 			android:text="@string/pad_lon_label" />
 
@@ -297,14 +297,14 @@
 	<RelativeLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingLeft="69dp"
-		android:paddingTop="5dp" >
+		android:paddingLeft="69dp">
 
 		<TextView
 			android:id="@+id/pad_alt_label"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android.paddingRight="4dp"
+			android:width="100sp"
+			android.paddingRight="10sp"
 			android:layout_toRightOf="@id/gps_ready_greenled"
 			android:text="@string/pad_alt_label" />
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 66669ad0..3fb695a2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -152,11 +152,12 @@ public class TabMap extends Fragment implements AltosDroidTab {
 		}
 	}
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (from_receiver != null) {
+			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+		}
+
 		if (state != null) {
-			if (state.from_pad != null) {
-				mDistanceView.setText(String.format("%6.0f m", state.from_pad.distance));
-				mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
-			}
 			if (mapLoaded) {
 				if (state.gps != null) {
 					mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-- 
2.30.2