added ability to specify sprite in marker #1716

5 files changed, 69 insertions, 9 deletions

diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index 7f4a817bdc..1e2288c61b 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -41,6 +41,11 @@ jmethodID latLngConstructorId = nullptr;
 jfieldID latLngLatitudeId = nullptr;
 jfieldID latLngLongitudeId = nullptr;
 
+jclass markerClass = nullptr;
+jmethodID markerConstructorId = nullptr;
+jfieldID markerPositionId = nullptr;
+jfieldID markerSpriteId = nullptr;
+
 jclass polylineClass = nullptr;
 jmethodID polylineConstructorId = nullptr;
 jfieldID polylineAlphaId = nullptr;
@@ -504,25 +509,34 @@ void JNICALL nativeSetLatLng(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, j
     nativeMapView->getMap().setLatLng(mbgl::LatLng(latitude, longitude), std::chrono::milliseconds(duration));
 }
 
-jlong JNICALL nativeAddMarker(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject latLng) {
+jlong JNICALL nativeAddMarker(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject marker) {
     mbgl::Log::Debug(mbgl::Event::JNI, "nativeAddMarker");
     assert(nativeMapViewPtr != 0);
     NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
 
-    jdouble latitude = env->GetDoubleField(latLng, latLngLatitudeId);
+    jobject position = env->GetObjectField(marker, markerPositionId);
     if (env->ExceptionCheck()) {
         env->ExceptionDescribe();
         return -1;
     }
 
-    jdouble longitude = env->GetDoubleField(latLng, latLngLongitudeId);
+    jstring jsprite = (jstring)env->GetObjectField(marker, markerSpriteId);
+    std::string sprite = std_string_from_jstring(env, jsprite);
+
+    jdouble latitude = env->GetDoubleField(position, latLngLatitudeId);
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        return -1;
+    }
+
+    jdouble longitude = env->GetDoubleField(position, latLngLongitudeId);
     if (env->ExceptionCheck()) {
         env->ExceptionDescribe();
         return -1;
     }
 
     // Because Java only has int, not unsigned int, we need to bump the annotation id up to a long.
-    return (jlong) nativeMapView->getMap().addPointAnnotation(mbgl::PointAnnotation(mbgl::LatLng(latitude, longitude), std::string("default_marker")));
+    return (jlong) nativeMapView->getMap().addPointAnnotation(mbgl::PointAnnotation(mbgl::LatLng(latitude, longitude), sprite));
 }
 
 jlong JNICALL nativeAddPolyline(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jobject polyline) {
@@ -1015,6 +1029,30 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
+    markerClass = env->FindClass("com/mapbox/mapboxgl/annotations/Marker");
+    if (markerClass == nullptr) {
+        env->ExceptionDescribe();
+        return JNI_ERR;
+    }
+
+    markerConstructorId = env->GetMethodID(markerClass, "<init>", "()V");
+    if (markerConstructorId == nullptr) {
+        env->ExceptionDescribe();
+        return JNI_ERR;
+    }
+
+    markerPositionId = env->GetFieldID(markerClass, "position", "Lcom/mapbox/mapboxgl/geometry/LatLng;");
+    if (markerPositionId == nullptr) {
+        env->ExceptionDescribe();
+        return JNI_ERR;
+    }
+    
+    markerSpriteId = env->GetFieldID(markerClass, "sprite", "Ljava/lang/String;");
+    if (markerSpriteId == nullptr) {
+        env->ExceptionDescribe();
+        return JNI_ERR;
+    }
+
     polylineClass = env->FindClass("com/mapbox/mapboxgl/annotations/Polyline");
     if (polylineClass == nullptr) {
         env->ExceptionDescribe();
@@ -1064,7 +1102,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     }
 
     polygonConstructorId = env->GetMethodID(polygonClass, "<init>", "()V");
-    if (polylineConstructorId == nullptr) {
+    if (polygonConstructorId == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
     }
@@ -1304,7 +1342,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         {"nativeMoveBy", "(JDDJ)V", reinterpret_cast<void *>(&nativeMoveBy)},
         {"nativeSetLatLng", "(JLcom/mapbox/mapboxgl/geometry/LatLng;J)V",
          reinterpret_cast<void *>(&nativeSetLatLng)},
-        {"nativeAddMarker", "(JLcom/mapbox/mapboxgl/geometry/LatLng;)J",
+        {"nativeAddMarker", "(JLcom/mapbox/mapboxgl/annotations/Marker;)J",
          reinterpret_cast<void *>(&nativeAddMarker)},
         {"nativeAddPolyline", "(JLcom/mapbox/mapboxgl/annotations/Polyline;)J",
          reinterpret_cast<void *>(&nativeAddPolyline)},
@@ -1361,6 +1399,12 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
+    markerClass = reinterpret_cast<jclass>(env->NewGlobalRef(markerClass));
+    if (markerClass == nullptr) {
+        env->ExceptionDescribe();
+        return JNI_ERR;
+    }
+
     polylineClass = reinterpret_cast<jclass>(env->NewGlobalRef(polylineClass));
     if (polylineClass == nullptr) {
         env->ExceptionDescribe();
@@ -1456,6 +1500,12 @@ extern "C" JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
     latLngLongitudeId = nullptr;
     latLngLatitudeId = nullptr;
 
+    env->DeleteGlobalRef(markerClass);
+    markerClass = nullptr;
+    markerConstructorId = nullptr;
+    markerPositionId = nullptr;
+    markerSpriteId = nullptr;
+
     env->DeleteGlobalRef(polylineClass);
     polylineClass = nullptr;
     polylineConstructorId = nullptr;
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
index ba8174a665..ea4fc41e20 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
@@ -14,6 +14,7 @@ public class Marker extends Annotation {
     LatLng position;
     float rotation;
     String snippet;
+    String sprite = "default_marker";
     String title;
 
     private boolean infoWindowShown = false;
@@ -113,6 +114,10 @@ public class Marker extends Annotation {
         this.snippet = snippet;
     }
 
+    void setSprite(String sprite) {
+        this.sprite = sprite;
+    }
+
     void setTitle(String title) {
         this.title = title;
     }
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java
index f1764df770..2e577067db 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java
@@ -98,6 +98,11 @@ public class MarkerOptions extends AnnotationOptions {
         return this;
     }
 
+    public MarkerOptions sprite(String sprite) {
+        ((Marker)annotation).sprite = sprite;
+        return this;
+    }
+
     public MarkerOptions title(String title) {
         ((Marker)annotation).title = title;
         return this;
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
index ac4f571a72..6cab4bbd0f 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java
@@ -217,8 +217,7 @@ class NativeMapView {
     }
 
     public long addMarker(Marker marker) {
-        LatLng latLng = marker.getPosition();
-        return nativeAddMarker(mNativeMapViewPtr, latLng);
+        return nativeAddMarker(mNativeMapViewPtr, marker);
     }
 
     public long addPolyline(Polyline polyline) {
@@ -467,7 +466,7 @@ class NativeMapView {
     private native void nativeSetLatLng(long nativeMapViewPtr, LatLng latLng,
                                         long duration);
 
-    private native long nativeAddMarker(long nativeMapViewPtr, LatLng latLng);
+    private native long nativeAddMarker(long nativeMapViewPtr, Marker marker);
 
     private native long nativeAddPolyline(long nativeMapViewPtr, Polyline polyline);
 
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index c017eb7905..f8c35897c2 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -300,6 +300,7 @@ public class MainActivity extends ActionBarActivity {
         LatLng cheeseRoom = new LatLng(38.531577,-122.010646);
         map.addMarker(new MarkerOptions()
                 .position(cheeseRoom)
+                .sprite("dog-park-15")
                 .title("Cheese Room")
                 .snippet("The only air conditioned room on the property!"));
     }