java: Bump java library versions for next release

[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 29696dbf3dcd636675534044e48000f200ddb4c1..15dc8bf7de029f9437720807fc53ea580a570c23 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,7 +35,7 @@ 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;
@@ -60,6 +60,8 @@ public class TabMap extends Fragment implements AltosDroidTab {
        private TextView mReceiverLatitudeView;
        private TextView mReceiverLongitudeView;
 
+       private double mapAccuracy = -1;
+
        @Override
        public void onAttach(Activity activity) {
                super.onAttach(activity);
@@ -118,7 +120,6 @@ public class TabMap extends Fragment implements AltosDroidTab {
                        mMap.setMyLocationEnabled(true);
                        mMap.getUiSettings().setTiltGesturesEnabled(false);
                        mMap.getUiSettings().setZoomControlsEnabled(false);
-                       mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(40.8,-104.7),8));
 
                        mRocketMarker = mMap.addMarker(
                                        // From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
@@ -144,35 +145,54 @@ public class TabMap extends Fragment implements AltosDroidTab {
                }
        }
 
+       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;
+               }
+       }
+
        public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-               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 (from_receiver != null) {
+                       mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+                       mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
                }
-               if (state.gps != null) {
-                       mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-                       mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+
+               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 (state.state == AltosLib.ao_flight_pad) {
+                                       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"));
+                               if (state.gps.locked && state.gps.nsat >= 4)
+                                       center (state.gps.lat, state.gps.lon, 10);
+                       }
                }
 
                if (receiver != null) {
+                       double accuracy;
+
+                       if (receiver.hasAccuracy())
+                               accuracy = receiver.getAccuracy();
+                       else
+                               accuracy = 1000;
                        mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
                        mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+                       center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
                }
 
-               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 (state.state == AltosLib.ao_flight_pad) {
-                               mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
-                               mPadMarker.setVisible(true);
-                       }
-               }
        }
 
 }