import java.util.Arrays;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_5.*;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
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;
private Marker mRocketMarker;
private Marker mPadMarker;
+ private boolean pad_set;
private Polyline mPolyline;
private TextView mDistanceView;
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));
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);
}
}
}
-
}