X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabMap.java;h=5376d423ec341c064795c4a6d482d7adcdba5d48;hp=66669ad04208c15787775b209292e346324743c1;hb=85013045ca505096064aaf45c312b158d0263d2a;hpb=c6f85cb149dff8732104521cb62b355e8a0d7148

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 66669ad0..5376d423 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_1.*;
+import org.altusmetrum.altoslib_7.*;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -35,14 +35,14 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+//import android.support.v4.app.FragmentTransaction;
 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 {
+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;
@@ -151,12 +152,16 @@ public class TabMap extends Fragment implements AltosDroidTab {
 			mapAccuracy = accuracy;
 		}
 	}
-	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));
+			set_value(mDistanceView, AltosConvert.distance, 6, 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));
@@ -166,14 +171,15 @@ 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);
 				}
 			}
 			if (state.gps != null) {
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
 				if (state.gps.locked && state.gps.nsat >= 4)
 					center (state.gps.lat, state.gps.lon, 10);
 			}
@@ -187,10 +193,25 @@ public class TabMap extends Fragment implements AltosDroidTab {
 			else
 				accuracy = 1000;
 			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
 			center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
 		}
 
 	}
 
+	public void set_map_type(int map_type) {
+		if (mMap != null) {
+			if (map_type == AltosMap.maptype_hybrid)
+				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+			else if (map_type == AltosMap.maptype_satellite)
+				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+			else if (map_type == AltosMap.maptype_terrain)
+				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+			else
+				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		}
+	}
+
+	public TabMap() {
+	}
 }