X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabMap.java;h=811e5482bcb442595d36777c9f820355a430ed31;hb=59dfe661fcb504f390d9726378c676f2b5b005f3;hp=5fe88f51c3a0c39818258b833e9ab7f2083e410f;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 5fe88f51..811e5482 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid;
 
 import java.util.Arrays;
 
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_5.*;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -42,7 +42,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.location.Location;
 
-public class TabMap extends Fragment implements AltosDroidTab {
+public class TabMap extends AltosDroidTab {
 	AltosDroid mAltosDroid;
 
 	private SupportMapFragment mMapFragment;
@@ -51,6 +51,7 @@ public class TabMap extends Fragment implements AltosDroidTab {
 
 	private Marker mRocketMarker;
 	private Marker mPadMarker;
+	private boolean pad_set;
 	private Polyline mPolyline;
 
 	private TextView mDistanceView;
@@ -152,7 +153,9 @@ public class TabMap extends Fragment implements AltosDroidTab {
 		}
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public String tab_name() { return "map"; }
+
+	public void show(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));
@@ -168,7 +171,8 @@ public class TabMap extends Fragment implements AltosDroidTab {
 					mPolyline.setVisible(true);
 				}
 
-				if (state.state == AltosLib.ao_flight_pad) {
+				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
+					pad_set = true;
 					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
 					mPadMarker.setVisible(true);
 				}
@@ -194,5 +198,4 @@ public class TabMap extends Fragment implements AltosDroidTab {
 		}
 
 	}
-
 }