altosdroid: Check state.gps != null before using it

[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 87e4f0bfea1a5a55f995c438aeb6c7ffff91cbe7..371fd9c1c617f92e3166f0254209842b8da671a5 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -17,6 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.util.Arrays;
 
 import org.altusmetrum.altoslib_1.*;
 
@@ -27,8 +28,11 @@ 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 android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
@@ -36,6 +40,7 @@ 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 {
        AltosDroid mAltosDroid;
@@ -46,6 +51,9 @@ public class TabMap extends Fragment implements AltosDroidTab {
 
        private Marker mRocketMarker;
        private Marker mPadMarker;
+       private Marker mReceiverMarker;
+       private Polyline mPolyline;
+
        private TextView mDistanceView;
        private TextView mBearingView;
        private TextView mLatitudeView;
@@ -122,26 +130,51 @@ public class TabMap extends Fragment implements AltosDroidTab {
                                                           .visible(false)
                                        );
 
+                       mReceiverMarker = 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 void update_ui(AltosState state) {
+       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));
                }
-               mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+               if (state.gps != null) {
+                       mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+                       mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+               }
 
                if (mapLoaded) {
-                       mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-                       mRocketMarker.setVisible(true);
+                       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 (receiver != null) {
+                               mReceiverMarker.setPosition(new LatLng(receiver.getLatitude(), receiver.getLongitude()));
+                               mReceiverMarker.setVisible(true);
+                       }
                }
        }