From b691fc48f5e879045e68e070162af56cd08f03b4 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 10 Mar 2013 23:27:28 +1300 Subject: [PATCH] altosdroid: Add rocket and pad map markers Signed-off-by: Mike Beattie --- altosdroid/res/drawable/pad.png | Bin 0 -> 584 bytes altosdroid/res/drawable/rocket.png | Bin 0 -> 1286 bytes .../org/altusmetrum/AltosDroid/TabMap.java | 25 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 altosdroid/res/drawable/pad.png create mode 100644 altosdroid/res/drawable/rocket.png diff --git a/altosdroid/res/drawable/pad.png b/altosdroid/res/drawable/pad.png new file mode 100644 index 0000000000000000000000000000000000000000..b2e65c8af452302f35ec01df91fef958d3b88bfd GIT binary patch literal 584 zcmV-O0=NB%P)Nhb)01k)49gqRJtasctdf)ByHRXhg@$y@-k z8;M^8paX(rSJ!oKthFj$0{5~O?^J;Rw7^N$PET2g_$TlEPu?+{bKlac7;EiL#P{C& zKUGyxmL)||+*CM(K-;!7O@njpGjIe>Y2y{ZDsf{B+Qe_g;F;QInRdJ8%}+i7an;l= z&-nk5eU$KPiVa``*Z?+w4PXP<06sGQY4SD3yt-aGnoU*UvQ&6%4vaBg_f~oZGMU#k z2_ei5pem*i>AhahO~#2w=z%^<>{0+|+jbNpJ#{KRwKp}E>#bTeW3A1B9q=$`OscA4 zzuzya?eTb|X_`4>@(lb1&P%LW2H?H_u>?ZJopav@{WWUMmYCD)4DY>vnuAEh9|yfP zZBE~?=ejCf>An9o29bz=mDA~aP65X4`CJHCA$_tFh~FthBK}3h&yqofCO_>ZKadfK zomK)!Pkvq_z8GKx;$9%0q_ZDI^t48N6~F+Zl+0zTlhU_q#8(3(5c%L!?bFU)^Sl>j W>mYy&s4Uk200001d~Zb zK~z}7wU=LLTU8v#Kj+@$HVNr$n{IAax2T;%Wi&Mi8$N7>)FA`^FvbR=Ltg|%6b19> zgCN|wfe#Y~z7@8;49n(d+4?lxCJ57Y>!8#Lf%Oh1C9F3g&C;9u^TBgV7LzWKtocsGJ5dmO)d^`jgfTi0Ioh=^V0~NrZnVInbl!yf477)?Z(f~$>#C;7= z0m`~oW@ctQmC0lR@fff{w~;Q*Kp7|ju5K&ATSm0_Cfl}urHdt-&F-$96_v?k;#z#b zw(VQVWRh4cMkEqhcc7J(6(%Pq$>;NgLLoAl48z02P5YP2WlE(Ixm=EHHoFtZ18%MH zB0x*xBEp3W7f7emBoYZc&*RdiOZ4~mlSm{QK2tYl;4>p|dr%)M4v@>`=;`TUFp(fE zf@PY#zHc8B6BFw`S2OmSX5jL++w-nmF@y8EiGYL78TFq>%)in%yHO|N>Nb?-}l+JZ5xF`f!^NU*4Lrk zB>+%LQ7V^-Y~090!1sMbge_aP;5ZI#8KIqGSr)eBUP?k2k#^ zKm<@72UuNQePjlj9a3EbFbo6V_a70f7gkE4l)S-RFhpo+Tva zzyIZOEZm%BMOL_RW1g*Bx3Ycv_Ra!Cqfs2kVfXGaV&PZm{Wwg|wTGDRAL6O+jxqd= zN%?n=XWsgNE58g;C@gjsV03hp2M^I;Ps1F6+gLlVH@!~YFpin;n2k)_CN0FmP?apsQrS2olLj~kVg*;)9 zJ_E6RapY4$mO;n^H;G20-S`&#i4qsSG=OnbY6uP~kO>q~)G2|#e1tn~A4GmDokfZ| zvhD+p0b$@}Q12k}Inob24@wG%R9ndvFm${gRLbS@I?tpLQi%MFQacg(2$3^-dA>!- z7brm3iBe|6$ham)@BlAVlP;A3N~IFbf>Wh70oQ7-zpCqS95_y+PeBlt2bV#LrZSm~ z1;q8dHcd>D$s_{<11+siUx~lpTsr9 zY%N5M_=pxS>RJwjnjUVg1P%=#;=xP=shWQCVmsn312llxpdqenXQ#EO+m3i!0Cf;C wT`hg9qNl#pj(FPuH4s+aR`qI~-OhOb0OR64%NJW2O8@`>07*qoM6N<$g1#tIYXATM literal 0 HcmV?d00001 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java index 7161a340..87e4f0bf 100644 --- 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); + } } } -- 2.30.2