altosdroid: Show our position in the map tab. Squeeze to fit phones

[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 371fd9c1c617f92e3166f0254209842b8da671a5..29696dbf3dcd636675534044e48000f200ddb4c1 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -51,13 +51,14 @@ 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;
-       private TextView mLongitudeView;
+       private TextView mTargetLatitudeView;
+       private TextView mTargetLongitudeView;
+       private TextView mReceiverLatitudeView;
+       private TextView mReceiverLongitudeView;
 
        @Override
        public void onAttach(Activity activity) {
@@ -85,8 +86,10 @@ public class TabMap extends Fragment implements AltosDroidTab {
                View v = inflater.inflate(R.layout.tab_map, container, false);
                mDistanceView  = (TextView)v.findViewById(R.id.distance_value);
                mBearingView   = (TextView)v.findViewById(R.id.bearing_value);
-               mLatitudeView  = (TextView)v.findViewById(R.id.lat_value);
-               mLongitudeView = (TextView)v.findViewById(R.id.lon_value);
+               mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value);
+               mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
+               mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value);
+               mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
                return v;
        }
 
@@ -130,12 +133,6 @@ 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)
@@ -153,8 +150,13 @@ public class TabMap extends Fragment implements AltosDroidTab {
                        mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
                }
                if (state.gps != null) {
-                       mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-                       mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+                       mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+                       mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+               }
+
+               if (receiver != null) {
+                       mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+                       mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
                }
 
                if (mapLoaded) {
@@ -170,11 +172,6 @@ public class TabMap extends Fragment implements AltosDroidTab {
                                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);
-                       }
                }
        }