altosdroid: Add rocket and pad map markers

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/res/drawable/pad.png b/altosdroid/res/drawable/pad.png
new file mode 100644 (file)
index 0000000..b2e65c8
Binary files /dev/null and b/altosdroid/res/drawable/pad.png differ

diff --git a/altosdroid/res/drawable/rocket.png b/altosdroid/res/drawable/rocket.png
new file mode 100644 (file)
index 0000000..7e62f6c
Binary files /dev/null and b/altosdroid/res/drawable/rocket.png differ

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 7161a3409eacdaec47498eef5ac6ad00b80a5c9d..87e4f0bfea1a5a55f995c438aeb6c7ffff91cbe7 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -23,7 +23,10 @@ import org.altusmetrum.altoslib_1.*;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.SupportMapFragment;
+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 android.app.Activity;
 import android.os.Bundle;
@@ -41,6 +44,8 @@ public class TabMap extends Fragment implements AltosDroidTab {
        private GoogleMap mMap;
        private boolean mapLoaded = false;
 
+       private Marker mRocketMarker;
+       private Marker mPadMarker;
        private TextView mDistanceView;
        private TextView mBearingView;
        private TextView mLatitudeView;
@@ -104,6 +109,19 @@ public class TabMap extends Fragment implements AltosDroidTab {
                        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/
+                                       new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.rocket))
+                                                          .position(new LatLng(0,0))
+                                                          .visible(false)
+                                       );
+
+                       mPadMarker = mMap.addMarker(
+                                       new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
+                                                          .position(new LatLng(0,0))
+                                                          .visible(false)
+                                       );
+
                        mapLoaded = true;
                }
        }
@@ -117,6 +135,13 @@ public class TabMap extends Fragment implements AltosDroidTab {
                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.state == AltosLib.ao_flight_pad) {
+                               mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
+                               mPadMarker.setVisible(true);
+                       }
                }
        }