X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabMap.java;h=de74420fb4af475e3e8f733d99a83d488a0c17bd;hb=21d176f161b90f18f236ef887cef9676d712eee3;hp=0ee202a46da696b35529e8dddfe9b4424697e6e4;hpb=a761b34ed8fc64435f5a49623f4a5c55e2dda33a;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 0ee202a4..de74420f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -20,7 +20,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_10.*;
 
 import android.app.Activity;
 import android.graphics.*;
@@ -37,6 +37,7 @@ public class TabMap extends AltosDroidTab {
 	AltosLatLon	here;
 
 	private TextView mDistanceView;
+	private TextView mBearingLabel;
 	private TextView mBearingView;
 	private TextView mTargetLatitudeView;
 	private TextView mTargetLongitudeView;
@@ -63,6 +64,7 @@ public class TabMap extends AltosDroidTab {
 		int map_source = AltosDroidPreferences.map_source();
 
 		mDistanceView  = (TextView)view.findViewById(R.id.distance_value);
+		mBearingLabel  = (TextView)view.findViewById(R.id.bearing_label);
 		mBearingView   = (TextView)view.findViewById(R.id.bearing_value);
 		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value);
 		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value);
@@ -99,8 +101,19 @@ public class TabMap extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			String	direction = AltosDroid.direction(from_receiver, receiver);
+			if (direction != null) {
+				mBearingLabel.setText("Direction");
+				mBearingView.setText(direction);
+			} else {
+				mBearingLabel.setText("Bearing");
+				mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			}
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+		} else {
+			mBearingLabel.setText("Bearing");
+			mBearingView.setText("");
+			set_value(mDistanceView, AltosConvert.distance, 6, AltosLib.MISSING);
 		}
 
 		if (state != null) {