1 files changed, 35 insertions, 6 deletions
diff --git a/platform/android/src/geojson/point.cpp b/platform/android/src/geojson/point.cpp
index 3d19a119d7..e95376cd2e 100644
--- a/platform/android/src/geojson/point.cpp
+++ b/platform/android/src/geojson/point.cpp
@@ -1,19 +1,48 @@
 #include "point.hpp"
+#include "../java/util.hpp"
+#include "../java_types.hpp"
+#include "../style/value.hpp"
 
 namespace mbgl {
 namespace android {
 namespace geojson {
 
 mapbox::geojson::point Point::convert(jni::JNIEnv &env, jni::Object<Point> jPoint) {
-    auto jPosition = Point::getPosition(env, jPoint);
-    auto point = Position::convert(env, jPosition);
-    jni::DeleteLocalRef(env, jPosition);
+    mapbox::geojson::point point;
+
+    if (jPoint) {
+        auto jDoubleList = Point::coordinates(env, jPoint);
+        point = Point::convert(env, jDoubleList);
+        jni::DeleteLocalRef(env, jDoubleList);
+    }
+
+    return point;
+}
+
+mapbox::geojson::point Point::convert(jni::JNIEnv &env, jni::Object<java::util::List/*<Double>*/> jDoubleList) {
+    mapbox::geojson::point point;
+
+    if (jDoubleList) {
+        auto jDoubleArray = java::util::List::toArray<jobject>(env, jDoubleList);
+
+        auto lonObject = jDoubleArray.Get(env, 0);
+        auto latObject = jDoubleArray.Get(env, 1);
+
+        point.x = jni::CallMethod<jni::jdouble>(env, lonObject,
+                                                *java::Number::doubleValueMethodId);
+        point.y = jni::CallMethod<jni::jdouble>(env, latObject,
+                                                *java::Number::doubleValueMethodId);
+
+        jni::DeleteLocalRef(env, lonObject);
+        jni::DeleteLocalRef(env, latObject);
+        jni::DeleteLocalRef(env, jDoubleArray);
+    }
     return point;
 }
 
-jni::Object<Position> Point::getPosition(JNIEnv& env, jni::Object<Point> jPoint) {
-    static auto method = Point::javaClass.GetMethod<jni::Object<Position> ()>(env, "getCoordinates");
-    return jPoint.Call(env, method);
+jni::Object<java::util::List> Point::coordinates(jni::JNIEnv &env, jni::Object<Point> jPoint) {
+     static auto method = Point::javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
+     return jPoint.Call(env, method);
 }
 
 void Point::registerNative(jni::JNIEnv &env) {