X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabRecover.java;h=b0fe9e5fe4001c1aeb0ce9b08a39ff2432ca8cbf;hb=085336c45ce0577031a7af5de117a8b856160708;hp=0ab20f5f6c8f9890f3e09fe65cde17cf5a502522;hpb=2b6768ed32d7be444c49caa40d30b520177bb22a;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
index 0ab20f5f..b0fe9e5f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -30,6 +30,7 @@ import android.location.Location;
 
 public class TabRecover extends AltosDroidTab {
 	private TextView mBearingView;
+	private TextView mDirectionView;
 	private TextView mDistanceView;
 	private TextView mTargetLatitudeView;
 	private TextView mTargetLongitudeView;
@@ -44,6 +45,7 @@ public class TabRecover extends AltosDroidTab {
 		View v = inflater.inflate(R.layout.tab_recover, container, false);
 
 		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
+		mDirectionView = (TextView) v.findViewById(R.id.direction_value);
 		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
 		mTargetLatitudeView  = (TextView) v.findViewById(R.id.target_lat_value);
 		mTargetLongitudeView = (TextView) v.findViewById(R.id.target_lon_value);
@@ -56,12 +58,17 @@ public class TabRecover extends AltosDroidTab {
 		return v;
 	}
 
-	public String tab_name() { return "recover"; }
+	public String tab_name() { return AltosDroid.tab_recover_name; }
 
 	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));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+			String direction = AltosDroid.direction(from_receiver, receiver);
+			if (direction == null)
+				mDirectionView.setText("");
+			else
+				mDirectionView.setText(direction);
 		}
 		if (state != null && state.gps != null) {
 			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));