From 4f6f2c19fd58f07a39a43c8547fe75534ec12905 Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Thu, 8 Oct 2015 16:24:46 -0500
Subject: [PATCH] [android] #2519 - Adding LatLon and XY data to Marker for
 display in InfoWindow.  Added NavDrawer icon.

---
 .../testapp/PressForMarkerActivity.java       |  21 ++++++++++--------
 .../drawable-hdpi/ic_pin_drop_white_24dp.png  | Bin 0 -> 330 bytes
 .../drawable-mdpi/ic_pin_drop_white_24dp.png  | Bin 0 -> 233 bytes
 .../drawable-xhdpi/ic_pin_drop_white_24dp.png | Bin 0 -> 417 bytes
 .../ic_pin_drop_white_24dp.png                | Bin 0 -> 584 bytes
 .../ic_pin_drop_white_24dp.png                | Bin 0 -> 769 bytes
 .../src/main/res/menu/menu_drawer.xml         |   2 ++
 7 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
index 5b8447663..b6b0207c3 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java
@@ -14,6 +14,7 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.utils.ApiAccess;
 import com.mapbox.mapboxsdk.views.MapView;
+import java.text.DecimalFormat;
 
 public class PressForMarkerActivity extends AppCompatActivity {
 
@@ -21,6 +22,8 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
     private MapView mMapView;
 
+    private static final DecimalFormat latLonFormatter = new DecimalFormat("#.#####");
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -37,13 +40,11 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
         mMapView = (MapView) findViewById(R.id.pressForMarkerMapView);
         mMapView.setAccessToken(ApiAccess.getToken(this));
-        mMapView.setStyleUrl(MapView.StyleUrls.MAPBOX_STREETS);
+        mMapView.setStyleUrl(MapView.StyleUrls.EMERALD);
         mMapView.onCreate(savedInstanceState);
 
-
-        mMapView.setCenterCoordinate(new LatLng(47.798202, 7.573781));
-        mMapView.setZoomLevel(4);
-
+        mMapView.setCenterCoordinate(new LatLng(45.1855569, 5.7215506));
+        mMapView.setZoomLevel(11);
 
         final GestureDetector gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
             public void onLongPress(final MotionEvent e) {
@@ -52,11 +53,13 @@ public class PressForMarkerActivity extends AppCompatActivity {
 
                 final LatLng position = mMapView.fromScreenLocation(new PointF(x, y));
 
-                Marker marker = mMapView.addMarker(new MarkerOptions()
+                String title = latLonFormatter.format(position.getLatitude()) + ", " + latLonFormatter.format(position.getLongitude());
+                String snippet = "X = " + (int)x + ", Y = " + (int)y;
+
+                mMapView.addMarker(new MarkerOptions()
                         .position(position)
-                        .title("Dropped Pin")
-                        .snippet("Tap for directions")
-                        .sprite("default_marker"));
+                        .title(title)
+                        .snippet(snippet));
             }
         });
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d545f6f1571ea5fd0e98e6bfd3878308054a9912
GIT binary patch
literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003INkl<ZNDbw|
zPf7w|9LM4BEQ^w9Ar!b5PZ2?X@B(^^VQ$d7i=Ylsx-Rez5iV<2k;`mVl$6dwJ`s$(
zAv*qMT(t0cq*X*foi;rZ5}s*sq#~%%W!f!O<-;BWX8B}ScGMU!&j(f65YQ#djclm1
z$e}D~<Bf<2DG`z2UC4qSUZfNe-jggy@Is{s@kX-X8!uFf5bsMCJmSSl5#v3`f)-vv
z%oZUr3ErhFXtGE{7OeA5mN(X9!#P>bWW^3c<{7drJ5HJBM0rr6&nz#Lln+g2X(&Ig
znRcZjDD%o+eab3^1IA2@*;jEmCXTfX0y_Na5NJ7Ua?c$bS{@ZD`ZqYNoU-7sa>|0k
c%4t>n0Dko4;$U0=y#N3J07*qoM6N<$g1Rk)y8r+H

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..523fd099965fa44c6fbba727c0bdcf79710ffa54
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i4W2HJAr^vr5BhR37Rnrdm@mTj
zAhoejCeQgsv5?;a3ubM7?jm06#hPCn|6egV`#xW6*7J!)?yZXKN=n~&G*0)Mr9bjB
zNnLzs<`QMqNQp_y^tsvRu!d&o6qaogco_24P4>AOx1yhKzDa>o<c)_qD=#OsZl2nz
znW?tv!b8VPa~;f{shoY{+&y83w(d_uwY(+q8k-(w`#SCyEO_|XX+h45k54?qZyGLG
hzyGjv=7)g3xRB35yPICG%>ufe!PC{xWt~$(697;FTh9Oh

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cebaab8182e14ef92629c59367b526fda5fea65
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004KNkl<ZSPAXH
zPf8n60LSs4;K~e%dH^+UMY~j}HxMOm6>lI)a1oqU@e1M@r0ueTl-!~ig5bYWbfvV=
zq+oRN6(PdB!8Gr^nSeq*A8A1E1Ji_5xuHdiYpU!rrL0ioD-lT%pP5v8Y|x~e2J1?P
z3cc*e9~;<MlOKvSvGJD)`QQt-4&{z%B5XxW$`v6=HI^75$1-)2Dsn{?Q;objC{V}r
zU9Pynw4@kTF#VD%T9`%@LxAaCuK0&3rx*fEO}XMHre(!Y!gM899AT<cPzPh2V)`am
zge28jAt0c{DM_JRF^h{Cxub@y6Zv2ZTbuGho<G?5O<sQ3!^S81Vw5|2xuqa~Y}3n@
z(qNbq{^tk7N{2<-bkpXe(&K<`_LT(!&UwulIc0+d9!Yv&UfCfeX;)cdh-2c88B(?w
z=aLr}j4OM5puw{SbLtOPiHInve<)MdfP^R6!jo*_Nw)B$0lh^}>{|<jt~1Mx00000
LNkvXXu0mjf#6z^G

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..abd69668254c7c79ce3eb6109bd936eef0735ef1
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006HNkl<ZXa()T
zzf06{9LMpO9&#Sk)VbsmIh2Tps5v-B;2)4!HaG-F=vMzjZQ@N4sPv2c3u<mKgp&g|
z%@T)_g7O@_AHzMPArN_gyC0v==X(y{$3sda5*HXlEV023W$M%^v%@<Uxvuz;VxBFc
zeBwU6iVrjF)65=s6bCY_(yABqD=Y>m(T;7h3Wotc)2>~z3WE$KI#HxwA+SoPp36UG
zaB*9HkzyYgyY$K@=5aMApV-3Hru<=uXcd+jCrz3OR;UuC!8Q595>dV}qB9ufh$xTb
z3me!fjOZM4)UdskFYI7jmVpAcl6;|zZCnN>vHg}W)Ul;yAcL(YUpU2<mVpemx_sd~
zwh0-yh3%Jop@eNk1`60p@`W{QRYr9VIcnHm$rtiOIU=Vs$Z<rJMft)FqE#s{NrnuQ
z6sQqxSpKkws{{GOQ(QfhPu#@Su>9g9E;i*Gv$&X(Z>0E2rw&NTKOWMlyh5OlLppIt
zpTc0CPCQU3^iZT-+w>?LrfJZQ2Ga_Qb=vV#p>c&{T6IiT;juug78DQO(~1v@3xk}{
z%n5^v4|6ngPx0an|MOaL<1$}}vd<;Ok1?uPDvYT+$YaT?dsyeZHFXpHY;#tTw7QEy
ze)7)`uB!W(qQYONOzC1^mIe*(>f+!DkCjLm2tY0fKrRSCE(ky_2tY0fK#4@6tNs8d
W6D$2=S`1YH0000<MNUMnLSTXjyaDe3

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..09dc9a68138cf9b419615c588eb0114da068bc95
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0008WNkl<ZcmeIf
z-)oI=0LSsqBRl8D-843m)HW+>SISD_Mv<Zw+3m`iSriFNR$Ou6$I6etz=aELkX?~X
ziMBH<H|EM6W@UDc9d_Pwq0r9vd3MhC`+c5M&+8?nQmIrbWfjfzFw6*3OjDx7G*gUl
zokOfvvayomyvF1e$7oa%v6f*9L@~!TT9hPY7-Wv6_{M1(lnk^pK{fKUDSmV_OSNX%
zuXxeV0<~Bmr}%IL8*+*V-7H|k0{i42?aX4!S6by4878o4oCf*CAhw;7KdfaA+rH5(
zUl_)PEAoSt6mVgVM)|;TTp5rLye5h<a<q~mLmPeMiQ=W)qnU68di4(iauf+urb({R
zLzn{Fv<S9SB+Nm%#xP-eRRMj3xhmHf!E8(w5s=61kz8X6vz!d*$LyV4V;Zwo8L$zv
zPjZbCW*Hff#cW=#QNS!C1G1Qv<Qg9^Ym)&Tn9ayF#xd)Y0Rx!5m1{i2EKi^c2zZ0p
zBe}*!!sJu|M+tLTuCbReMYd}Z?BF|L4$3uF5w1v%Kz||NDBlU!BKMdiiah;nBukbK
z26#ghZ{-6QaOIMGpc7ZN$PcD);k|s}EH0drFElZaZ9iBef4GBfcjXgZ*w!V#c!EvO
z<QqG&X_x%tIkvn|9N2*^I~5NeV8dg@g${mFtDkIEe7HreZYxeS@|jvp)2MjSODzs7
zZUl@{tx*ESk4?-|jd?aH88}ZhhLjX6XPl*)ph3w&Cnc7mM5mI4Gc3hfB@N4XN>tBS
zrsQEAGej}NIwcd`MA5C};s#-ED#^$)hRGONB^w*~LM30=pyXpWWfoIrkLm+MEM`dc
zf`I${?;e5b2P>H5Z<DN0ePKNx`Qsz&Re$KB$Ztiqsy=amGGz{^esPi$N~KasfM>D|
z&tw~($u>NbZFnZz@JzPhnQX%|rBbO>Diy&m6??MKA1dd100000NkvXXu0mjfPF+>r

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index 1a1c1d830..c90555d10 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -86,6 +86,8 @@
                 android:title="@string/action_map_fragment" />
 
             <item android:id="@+id/action_press_for_marker"
+                  android:checkable="false"
+                  android:icon="@drawable/ic_pin_drop_white_24dp"
                   android:title="@string/action_press_for_marker"/>
         </menu>
     </item>