#894 - Wiring up getTopOffsetPixelsForAnnotationSymbol in JNI

2 files changed, 16 insertions, 2 deletions

diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index 34bef770d8..140cc9f3ca 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -1227,6 +1227,14 @@ jobject JNICALL nativeLatLngForPixel(JNIEnv *env, jobject obj, jlong nativeMapVi
     return ret;
 }
 
+jdouble JNICALL nativeGetTopOffsetPixelsForAnnotationSymbol(JNIEnv *env, jobject obj, jlong nativeMapViewPtr, jstring symbolName) {
+    mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetTopOffsetPixelsForAnnotationSymbol");
+    assert(nativeMapViewPtr != 0);
+    NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
+    return nativeMapView->getMap().getTopOffsetPixelsForAnnotationSymbol(std_string_from_jstring(env, symbolName));
+}
+
+
 }
 
 extern "C" {
@@ -1708,6 +1716,8 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
          reinterpret_cast<void *>(&nativePixelForLatLng)},
         {"nativeLatLngForPixel", "(JLandroid/graphics/PointF;)Lcom/mapbox/mapboxgl/geometry/LatLng;",
          reinterpret_cast<void *>(&nativeLatLngForPixel)},
+        {"nativeGetTopOffsetPixelsForAnnotationSymbol", "(JLjava/lang/String;)D",
+         reinterpret_cast<void *>(&nativeGetTopOffsetPixelsForAnnotationSymbol)},
     };
 
     if (env->RegisterNatives(nativeMapViewClass, methods.data(), methods.size()) < 0) {
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 ca57049876..121402dcff 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
@@ -3,7 +3,6 @@ package com.mapbox.mapboxgl.views;
 import android.graphics.PointF;
 import android.view.Surface;
 
-import com.mapbox.mapboxgl.annotations.Annotation;
 import com.mapbox.mapboxgl.annotations.Marker;
 import com.mapbox.mapboxgl.annotations.Polygon;
 import com.mapbox.mapboxgl.annotations.Polyline;
@@ -12,7 +11,6 @@ import com.mapbox.mapboxgl.geometry.LatLng;
 import com.mapbox.mapboxgl.geometry.LatLngZoom;
 import com.mapbox.mapboxgl.geometry.ProjectedMeters;
 
-import java.util.ArrayList;
 import java.util.List;
 
 // Class that wraps the native methods for convenience
@@ -424,6 +422,10 @@ class NativeMapView {
         return nativeLatLngForPixel(mNativeMapViewPtr, pixel);
     }
 
+    public double getTopOffsetPixelsForAnnotationSymbol(String symbolName) {
+        return nativeGetTopOffsetPixelsForAnnotationSymbol(mNativeMapViewPtr, symbolName);
+    }
+
     //
     // Callbacks
     //
@@ -606,4 +608,6 @@ class NativeMapView {
     private native PointF nativePixelForLatLng(long nativeMapViewPtr, LatLng latLng);
 
     private native LatLng nativeLatLngForPixel(long nativeMapViewPtr, PointF pixel);
+
+    private native double nativeGetTopOffsetPixelsForAnnotationSymbol(long nativeMapViewPtr, String symbolName);
 }