X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabMap.java;h=9e3cb530cc3a821ddd796ca2212c69cdf978c688;hp=a625aa19478cde8f45224bb5b5a932e8d0f038e6;hb=97adfff4cfb67c17a96f3ff46606b4e439422b01;hpb=47956ac01397c0a7fafc6b0a4840113186924b2e

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index a625aa19..9e3cb530 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -17,186 +17,154 @@
 
 package org.altusmetrum.AltosDroid;
 
-import java.util.Arrays;
+import java.util.*;
+import java.io.*;
 
-import org.altusmetrum.altoslib_5.*;
-
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.Polyline;
-import com.google.android.gms.maps.model.PolylineOptions;
+import org.altusmetrum.altoslib_11.*;
 
 import android.app.Activity;
-import android.graphics.Color;
+import android.graphics.*;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-//import android.support.v4.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
+import android.content.*;
 
-public class TabMap extends AltosDroidTab {
-	AltosDroid mAltosDroid;
-
-	private SupportMapFragment mMapFragment;
-	private GoogleMap mMap;
-	private boolean mapLoaded = false;
+public class TabMap extends AltosDroidTab implements AltosDroidMapSourceListener {
 
-	private Marker mRocketMarker;
-	private Marker mPadMarker;
-	private boolean pad_set;
-	private Polyline mPolyline;
+	AltosLatLon	here;
 
 	private TextView mDistanceView;
+	private TextView mBearingLabel;
 	private TextView mBearingView;
 	private TextView mTargetLatitudeView;
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
-
-	private double mapAccuracy = -1;
+	private AltosMapOffline map_offline;
+	private AltosMapOnline map_online;
+	private View view;
+	private int map_source;
 
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-		mAltosDroid = (AltosDroid) activity;
-		mAltosDroid.registerTab(this);
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-
-		mMapFragment = new SupportMapFragment() {
-			@Override
-			public void onActivityCreated(Bundle savedInstanceState) {
-				super.onActivityCreated(savedInstanceState);
-				setupMap();
-			}
-		};
-
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		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);
-		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;
+		view = inflater.inflate(R.layout.tab_map, container, false);
+		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);
+		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value);
+		map_offline = (AltosMapOffline)view.findViewById(R.id.map_offline);
+		map_offline.onCreateView(altos_droid);
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid);
+		map_source_changed(AltosDroidPreferences.map_source());
+		AltosDroidPreferences.register_map_source_listener(this);
+		return view;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
+		if (map_online != null)
+			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
 	}
 
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-
-		//Fragment fragment = (getFragmentManager().findFragmentById(R.id.map));
-		//FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-		//ft.remove(fragment);
-		//ft.commit();
+		map_offline.onDestroyView();
+		map_online.onDestroyView();
+		AltosDroidPreferences.unregister_map_source_listener(this);
 	}
 
-	private void setupMap() {
-		mMap = mMapFragment.getMap();
-		if (mMap != null) {
-			mMap.setMyLocationEnabled(true);
-			mMap.getUiSettings().setTiltGesturesEnabled(false);
-			mMap.getUiSettings().setZoomControlsEnabled(false);
-
-			mRocketMarker = mMap.addMarker(
-					// From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
-					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.rocket))
-					                   .position(new LatLng(0,0))
-					                   .visible(false)
-					);
-
-			mPadMarker = mMap.addMarker(
-					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
-					                   .position(new LatLng(0,0))
-					                   .visible(false)
-					);
-
-			mPolyline = mMap.addPolyline(
-					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
-					                     .width(3)
-					                     .color(Color.BLUE)
-					                     .visible(false)
-					);
-
-			mapLoaded = true;
-		}
-	}
+	public String tab_name() { return AltosDroid.tab_map_name; }
 
 	private void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
-			mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(lat, lon),14));
-			mapAccuracy = accuracy;
-		}
+		if (map_offline != null)
+			map_offline.center(lat, lon, accuracy);
+		if (map_online != null)
+			map_online.center(lat, lon, accuracy);
 	}
 
-	public String tab_name() { return "map"; }
-
-	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	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) {
-			if (mapLoaded) {
-				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);
-				}
-
-				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, "E", "W"));
-				if (state.gps.locked && state.gps.nsat >= 4)
-					center (state.gps.lat, state.gps.lon, 10);
 			}
 		}
 
 		if (receiver != null) {
 			double accuracy;
 
+			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
 			if (receiver.hasAccuracy())
 				accuracy = receiver.getAccuracy();
 			else
 				accuracy = 1000;
-			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
-			center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
+			mReceiverLatitudeView.setText(AltosDroid.pos(here.lat, "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
+			center (here.lat, here.lon, accuracy);
+		}
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_offline != null)
+				map_offline.show(telem_state, state, from_receiver, receiver);
+		} else {
+			if (map_online != null)
+				map_online.show(telem_state, state, from_receiver, receiver);
 		}
+	}
 
+	public void map_source_changed(int map_source) {
+		this.map_source = map_source;
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_online != null)
+				map_online.set_visible(false);
+			if (map_offline != null) {
+				map_offline.set_visible(true);
+				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		} else {
+			if (map_offline != null)
+				map_offline.set_visible(false);
+			if (map_online != null) {
+				map_online.set_visible(true);
+				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		}
 	}
 
 	public TabMap() {