altosdroid: TabMap needs to expose () constructor

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TabMap.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 66669ad04208c15787775b209292e346324743c1..5cbd7469afd90fd5d530425f3fcaaee6dee27fb6 100644 (file)
--- 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_5.*;
 
 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,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);
                                }
@@ -193,4 +199,6 @@ public class TabMap extends Fragment implements AltosDroidTab {
 
        }
 
+       public TabMap() {
+       }
 }