[android] geojson conversion optimisation

1 files changed, 32 insertions, 2 deletions

diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index bd12cff3fa..54cb0867d0 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -11,12 +11,25 @@
 #include "conversion/conversion.hpp"
 #include "conversion/collection.hpp"
 #include "file_source.hpp"
-#include "geometry/feature.hpp"
+#include "geojson/feature.hpp"
+#include "geojson/feature_collection.hpp"
+#include "geojson/geometry.hpp"
+#include "geojson/line_string.hpp"
+#include "geojson/multi_line_string.hpp"
+#include "geojson/multi_point.hpp"
+#include "geojson/multi_polygon.hpp"
+#include "geojson/point.hpp"
+#include "geojson/polygon.hpp"
+#include "geojson/position.hpp"
 #include "geometry/lat_lng.hpp"
 #include "geometry/lat_lng_bounds.hpp"
 #include "geometry/projected_meters.hpp"
 #include "graphics/pointf.hpp"
 #include "graphics/rectf.hpp"
+#include "gson/json_array.hpp"
+#include "gson/json_element.hpp"
+#include "gson/json_object.hpp"
+#include "gson/json_primitive.hpp"
 #include "java_types.hpp"
 #include "native_map_view.hpp"
 #include "offline/offline_manager.hpp"
@@ -97,12 +110,29 @@ void registerNatives(JavaVM *vm) {
     PointF::registerNative(env);
     RectF::registerNative(env);
 
+    // GeoJSON
+    geojson::Feature::registerNative(env);
+    geojson::FeatureCollection::registerNative(env);
+    geojson::Geometry::registerNative(env);
+    geojson::LineString::registerNative(env);
+    geojson::MultiLineString::registerNative(env);
+    geojson::MultiPoint::registerNative(env);
+    geojson::MultiPolygon::registerNative(env);
+    geojson::Point::registerNative(env);
+    geojson::Polygon::registerNative(env);
+    geojson::Position::registerNative(env);
+
     // Geometry
-    Feature::registerNative(env);
     LatLng::registerNative(env);
     LatLngBounds::registerNative(env);
     ProjectedMeters::registerNative(env);
 
+    // GSon
+    gson::JsonArray::registerNative(env);
+    gson::JsonElement::registerNative(env);
+    gson::JsonObject::registerNative(env);
+    gson::JsonPrimitive::registerNative(env);
+
     //Annotation
     Marker::registerNative(env);
     Polygon::registerNative(env);