Merge remote-tracking branch 'origin/master' into feature/custom-vector-source

1 files changed, 31 insertions, 0 deletions

diff --git a/platform/android/src/annotation/marker.cpp b/platform/android/src/annotation/marker.cpp
new file mode 100644
index 0000000000..a1fe436dbd
--- /dev/null
+++ b/platform/android/src/annotation/marker.cpp
@@ -0,0 +1,31 @@
+#include "marker.hpp"
+
+namespace mbgl {
+namespace android {
+
+jni::Class<Marker> Marker::javaClass;
+
+mbgl::Point<double> Marker::getPosition(jni::JNIEnv& env, jni::Object<Marker> marker) {
+    static auto positionField = Marker::javaClass.GetField<jni::Object<LatLng>>(env, "position");
+    auto jPosition = marker.Get(env, positionField);
+    auto position = LatLng::getGeometry(env, jPosition);
+    jni::DeleteLocalRef(env, jPosition);
+    return position;
+}
+
+std::string Marker::getIconId(jni::JNIEnv& env, jni::Object<Marker> marker) {
+    static auto iconIdField = Marker::javaClass.GetField<jni::String>(env, "iconId");
+    auto jIconId = marker.Get(env, iconIdField);
+    auto iconId = jni::Make<std::string>(env, jIconId);
+    jni::DeleteLocalRef(env, jIconId);
+    return iconId;
+}
+
+void Marker::registerNative(jni::JNIEnv& env) {
+    // Lookup the class
+    Marker::javaClass = *jni::Class<Marker>::Find(env).NewGlobalRef(env).release();
+}
+
+
+} // namespace android
+} // namespace mbgl
\ No newline at end of file