X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabMap.java;h=29696dbf3dcd636675534044e48000f200ddb4c1;hb=e4b6fc3238ad9911fd40ef25accf82a401cb190f;hp=8fc8f59278ac2c59062c8bcb80d1a27a15179e5c;hpb=d7973de32adff5402844cc1e1da3eced05265074;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 8fc8f592..29696dbf 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -40,6 +40,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.location.Location;
 
 public class TabMap extends Fragment implements AltosDroidTab {
 	AltosDroid mAltosDroid;
@@ -54,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) {
@@ -83,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;
 	}
 
@@ -139,20 +144,29 @@ public class TabMap extends Fragment implements AltosDroidTab {
 		}
 	}
 
-	public void update_ui(AltosState state) {
+	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		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));
 		}
-		mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-		mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+		if (state.gps != null) {
+			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) {
-			mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-			mRocketMarker.setVisible(true);
+			if (state.gps != null) {
+				mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
+				mRocketMarker.setVisible(true);
 
-			mPolyline.setPoints(Arrays.asList(new LatLng(state.pad_lat, state.pad_lon), new LatLng(state.gps.lat, state.gps.lon)));
-			mPolyline.setVisible(true);
+				mPolyline.setPoints(Arrays.asList(new LatLng(state.pad_lat, state.pad_lon), new LatLng(state.gps.lat, state.gps.lon)));
+				mPolyline.setVisible(true);
+			}
 
 			if (state.state == AltosLib.ao_flight_pad) {
 				mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));