altosdroid: The Map already draws our location; no receiver marker needed

[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 607ded46693fc8de67dee0f0b3b1199650cafc3b..0a208fa8227c5fdb19473839fd130e671f83cd70 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -40,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;
@@ -139,20 +140,24 @@ public class TabMap extends Fragment implements AltosDroidTab {
                }
        }
 
-       public void update_ui(AltosState state, AltosGreatCircle from_receiver) {
+       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);
+                               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));