1 files changed, 46 insertions, 1 deletions
diff --git a/platform/android/src/geojson/geometry.cpp b/platform/android/src/geojson/geometry.cpp
index ca19d8fb03..5635b5a0f5 100644
--- a/platform/android/src/geojson/geometry.cpp
+++ b/platform/android/src/geojson/geometry.cpp
@@ -6,6 +6,7 @@
 #include "multi_line_string.hpp"
 #include "polygon.hpp"
 #include "multi_polygon.hpp"
+#include "geometry_collection.hpp"
 
 #include <string>
 
@@ -13,7 +14,49 @@ namespace mbgl {
 namespace android {
 namespace geojson {
 
-mapbox::geojson::geometry Geometry::convert(jni::JNIEnv &env, jni::Object<Geometry> jGeometry) {
+/**
+ * Turn mapbox::geometry type into Java GeoJson Geometries
+ */
+class GeometryEvaluator {
+public:
+
+    jni::JNIEnv& env;
+
+    jni::Object<Geometry> operator()(const mbgl::Point<double> &geometry) const {
+        return jni::Cast(env, Point::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry> operator()(const mbgl::LineString<double> &geometry) const {
+        return jni::Cast(env, LineString::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry>  operator()(const mbgl::MultiLineString<double> &geometry) const {
+        return jni::Cast(env, MultiLineString::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry> operator()(const mbgl::MultiPoint<double> &geometry) const {
+        return jni::Cast(env, MultiPoint::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry> operator()(const mbgl::Polygon<double> &geometry) const {
+        return jni::Cast(env, Polygon::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry>  operator()(const mbgl::MultiPolygon<double> &geometry) const {
+        return jni::Cast(env, MultiPolygon::New(env, geometry), Geometry::javaClass);
+    }
+
+    jni::Object<Geometry>  operator()(const mapbox::geometry::geometry_collection<double> &geometry) const {
+        return jni::Cast(env, GeometryCollection::New(env, geometry), Geometry::javaClass);
+    }
+};
+
+jni::Object<Geometry> Geometry::New(jni::JNIEnv& env, mbgl::Geometry<double> geometry) {
+    GeometryEvaluator evaluator { env } ;
+    return mbgl::Geometry<double>::visit(geometry, evaluator);
+}
+
+mbgl::Geometry<double> Geometry::convert(jni::JNIEnv &env, jni::Object<Geometry> jGeometry) {
     auto type = Geometry::getType(env, jGeometry);
     if (type == Point::Type()) {
         return { Point::convert(env, jni::Object<Point>(jGeometry.Get())) };
@@ -27,6 +70,8 @@ mapbox::geojson::geometry Geometry::convert(jni::JNIEnv &env, jni::Object<Geomet
         return { Polygon::convert(env, jni::Object<Polygon>(jGeometry.Get())) };
     } else if (type == MultiPolygon::Type()) {
         return { MultiPolygon::convert(env, jni::Object<MultiPolygon>(jGeometry.Get())) };
+    } else if (type == GeometryCollection::Type()) {
+        return { GeometryCollection::convert(env, jni::Object<GeometryCollection>(jGeometry.Get())) };
     }
 
     throw std::runtime_error(std::string {"Unsupported GeoJSON type: " } + type);