3 files changed, 132 insertions, 185 deletions
diff --git a/platform/android/src/style/conversion/function.hpp b/platform/android/src/style/conversion/function.hpp
index ad01a7afc2..510efd3c94 100644
--- a/platform/android/src/style/conversion/function.hpp
+++ b/platform/android/src/style/conversion/function.hpp
@@ -5,14 +5,9 @@
 #include "../../conversion/constant.hpp"
 #include "types.hpp"
 #include "../../java/lang.hpp"
-#include "../functions/stop.hpp"
-#include "../functions/categorical_stops.hpp"
-#include "../functions/exponential_stops.hpp"
-#include "../functions/identity_stops.hpp"
-#include "../functions/interval_stops.hpp"
 
 #include <jni/jni.hpp>
-
+#include "gson.hpp"
 #include <tuple>
 #include <map>
 
@@ -20,160 +15,16 @@ namespace mbgl {
 namespace android {
 namespace conversion {
 
-/**
- * Conversion from core composite value to java type
- */
-class CategoricalValueEvaluator {
-public:
-
-    CategoricalValueEvaluator(jni::JNIEnv& _env) : env(_env) {}
-
-    template <class T>
-    jni::jobject* operator()(const T &value) const {
-        return *convert<jni::jobject*, T>(env, value);
-    }
-
-private:
-    jni::JNIEnv& env;
-};
-
-/**
- * Conversion from core composite value to java type
- */
-template <>
-struct Converter<jni::jobject*, mbgl::style::CategoricalValue> {
-
-    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::CategoricalValue& value) const {
-        CategoricalValueEvaluator evaluator(env);
-        return apply_visitor(evaluator, value);
-    }
-};
-
-template <class I, class O>
-jni::Array<jni::Object<Stop>> toFunctionStopJavaArray(jni::JNIEnv& env, std::map<I, O> value) {
-
-    auto jarray = jni::Array<jni::Object<Stop>>::New(env, value.size(), Stop::javaClass);
-
-    size_t i = 0;
-    for (auto const& stop : value) {
-        jni::jobject* in = *convert<jni::jobject*, I>(env, stop.first);
-        jni::jobject* out = *convert<jni::jobject*, O>(env, stop.second);
-
-        auto jstop = Stop::New(env, jni::Object<>(in), jni::Object<>(out));
-        jarray.Set(env, i, jstop);
-
-        jni::DeleteLocalRef(env, in);
-        jni::DeleteLocalRef(env, out);
-        jni::DeleteLocalRef(env, jstop);
-
-        i++;
-    }
-
-    return jarray;
-}
-
-template <class I, class O>
-jni::Array<jni::Object<Stop>> toFunctionStopJavaArray(jni::JNIEnv& env, std::map<float, std::map<I, O>> value) {
-
-    auto jarray = jni::Array<jni::Object<Stop>>::New(env, value.size(), Stop::javaClass);
-
-    for (auto const& zoomLevelMap : value) {
-        size_t i = 0;
-        for (auto const& stop: zoomLevelMap.second) {
-            auto zoom = jni::Object<java::lang::Number>(*convert<jni::jobject*>(env, zoomLevelMap.first));
-            auto in = jni::Object<>(*convert<jni::jobject*, I>(env, stop.first));
-            auto out = jni::Object<>(*convert<jni::jobject*, O>(env, stop.second));
-            auto compositeValue = Stop::CompositeValue::New(env, zoom, in);
-
-            auto jstop = Stop::New(env, compositeValue, out);
-            jarray.Set(env, i, jstop);
-
-            jni::DeleteLocalRef(env, zoom);
-            jni::DeleteLocalRef(env, in);
-            jni::DeleteLocalRef(env, out);
-            jni::DeleteLocalRef(env, compositeValue);
-            jni::DeleteLocalRef(env, jstop);
-
-            i++;
-        }
-    }
-
-    return jarray;
-}
-
-template <class I, typename O>
-inline jni::jobject* convertCompositeStopsArray(jni::JNIEnv& env, std::map<float, std::map<I, O>> value) {
-    static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/mapbox/mapboxsdk/style/functions/stops/Stop")).release();
-    static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-
-    jni::jarray<jni::jobject>& jarray = jni::NewObjectArray(env, value.size(), *javaClass);
-
-    size_t i = 0;
-    for (auto const& stop : value) {
-        jni::jobject* in = *convert<jni::jobject*, I>(env, stop.first);
-        jni::jobject* out = *convert<jni::jobject*, O>(env, stop.second);
-        jni::SetObjectArrayElement(env, jarray, i, &jni::NewObject(env, *javaClass, *constructor, in, out));
-        i++;
-        jni::DeleteLocalRef(env, in);
-        jni::DeleteLocalRef(env, out);
-    }
-
-    return &jarray;
-}
-
-/**
- * Conversion from core function stops to Stops java subclasses
- */
-template <class T>
-class StopsEvaluator {
-public:
-
-    StopsEvaluator(jni::JNIEnv& _env) : env(_env) {}
-
-    jni::jobject* operator()(const mbgl::style::CategoricalStops<T> &value) const {
-        return CategoricalStops::New(env, toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::CompositeCategoricalStops<T> &value) const {
-        return CategoricalStops::New(env, toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::ExponentialStops<T> &value) const {
-        return ExponentialStops::New(env, jni::Object<java::lang::Float>(*convert<jni::jobject*>(env, value.base)), toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::CompositeExponentialStops<T> &value) const {
-        return ExponentialStops::New(env, jni::Object<java::lang::Float>(*convert<jni::jobject*>(env, value.base)), toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::IdentityStops<T> &) const {
-        return IdentityStops::New(env).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::IntervalStops<T> &value) const {
-        return IntervalStops::New(env, toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-    jni::jobject* operator()(const mbgl::style::CompositeIntervalStops<T> &value) const {
-        return IntervalStops::New(env, toFunctionStopJavaArray(env, value.stops)).Get();
-    }
-
-private:
-    jni::JNIEnv& env;
-};
-
 template <class T>
 struct Converter<jni::jobject*, mbgl::style::CameraFunction<T>> {
 
     Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::CameraFunction<T>& value) const {
-        static jni::jclass* clazz = jni::NewGlobalRef(env, &jni::FindClass(env, "com/mapbox/mapboxsdk/style/functions/CameraFunction")).release();
-        static jni::jmethodID* constructor = &jni::GetMethodID(env, *clazz, "<init>", "(Lcom/mapbox/mapboxsdk/style/functions/stops/Stops;)V");
-
-        StopsEvaluator<T> evaluator(env);
-        jni::jobject* stops = apply_visitor(evaluator, value.stops);
-        jni::jobject* converted = &jni::NewObject(env, *clazz, *constructor, stops);
+        // Convert expressions
+        mbgl::Value expressionValue = value.getExpression().serialize();
+        JsonEvaluator jsonEvaluator{env};
+        jni::jobject* converted = apply_visitor(jsonEvaluator, expressionValue);
 
-        return { converted };
+        return converted;
     }
 };
 
@@ -181,21 +32,12 @@ template <class T>
 struct Converter<jni::jobject*, mbgl::style::SourceFunction<T>> {
 
     Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::SourceFunction<T>& value) const {
-        static jni::jclass* clazz = jni::NewGlobalRef(env, &jni::FindClass(env, "com/mapbox/mapboxsdk/style/functions/SourceFunction")).release();
-        static jni::jmethodID* constructor = &jni::GetMethodID(env, *clazz, "<init>",
-                                                               "(Ljava/lang/Object;Ljava/lang/String;Lcom/mapbox/mapboxsdk/style/functions/stops/Stops;)V");
-
-        // Convert stops
-        StopsEvaluator<T> evaluator(env);
-        jni::jobject* stops = apply_visitor(evaluator, value.stops);
-
-        // Convert default value
-        jni::jobject* defaultValue = nullptr;
-        if (value.defaultValue) {
-            defaultValue = *convert<jni::jobject*>(env, *value.defaultValue);
-        }
+        // Convert expressions
+        mbgl::Value expressionValue = value.getExpression().serialize();
+        JsonEvaluator jsonEvaluator{env};
+        jni::jobject* converted = apply_visitor(jsonEvaluator, expressionValue);
 
-        return { &jni::NewObject(env, *clazz, *constructor, defaultValue, jni::Make<jni::String>(env, value.property).Get(), stops) };
+        return converted;
     }
 };
 
@@ -203,22 +45,12 @@ template <class T>
 struct Converter<jni::jobject*, mbgl::style::CompositeFunction<T>> {
 
     Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::CompositeFunction<T>& value) const {
-        static jni::jclass* clazz = jni::NewGlobalRef(env, &jni::FindClass(env, "com/mapbox/mapboxsdk/style/functions/CompositeFunction")).release();
-        static jni::jmethodID* constructor = &jni::GetMethodID(env, *clazz, "<init>",
-                                                                "(Ljava/lang/Object;Ljava/lang/String;Lcom/mapbox/mapboxsdk/style/functions/stops/Stops;)V");
-
-        // Convert stops
-        StopsEvaluator<T> evaluator(env);
-        jni::jobject* stops = apply_visitor(evaluator, value.stops);
-
-
-        // Convert default value
-        jni::jobject* defaultValue = nullptr;
-        if (value.defaultValue) {
-            defaultValue = *convert<jni::jobject*>(env, *value.defaultValue);
-        }
+        // Convert expressions
+        mbgl::Value expressionValue = value.getExpression().serialize();
+        JsonEvaluator jsonEvaluator{env};
+        jni::jobject* converted = apply_visitor(jsonEvaluator, expressionValue);
 
-        return { &jni::NewObject(env, *clazz, *constructor, defaultValue, jni::Make<jni::String>(env, value.property).Get(), stops) };
+        return converted;
     }
 };
 
diff --git a/platform/android/src/style/conversion/gson.hpp b/platform/android/src/style/conversion/gson.hpp
new file mode 100644
index 0000000000..02c3fdd30d
--- /dev/null
+++ b/platform/android/src/style/conversion/gson.hpp
@@ -0,0 +1,114 @@
+#pragma once
+
+#include "../../conversion/constant.hpp"
+#include "../../conversion/collection.hpp"
+
+#include <mapbox/geometry.hpp>
+#include <jni/jni.hpp>
+#include "../../jni/local_object.hpp"
+#include "mapbox/geometry/feature.hpp"
+
+namespace mbgl {
+namespace android {
+namespace conversion {
+
+/**
+ * Turn mapbox::geometry::value type into Java Json
+ */
+class JsonEvaluator {
+public:
+
+    jni::JNIEnv& env;
+
+    jni::jobject* operator()(const mapbox::geometry::null_value_t) const {
+       return (jni::jobject*) nullptr;;
+    }
+
+    jni::jobject* operator()(const bool& value) const {
+        static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/google/gson/JsonPrimitive")).release();
+        static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "(Ljava/lang/Boolean;)V");
+
+        // Create JsonPrimitive
+        jni::LocalObject<jni::jobject> converted = jni::NewLocalObject(env, *convert<jni::jobject*, bool>(env, value));
+        jni::jobject* object = &jni::NewObject(env, *javaClass, *constructor, *converted);
+
+        return object;
+    }
+
+    template <class Number>
+    jni::jobject* operator()(const Number& value) const {
+        static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/google/gson/JsonPrimitive")).release();
+        static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "(Ljava/lang/Number;)V");
+
+        // Create JsonPrimitive
+        jni::LocalObject<jni::jobject> converted = jni::NewLocalObject(env, *convert<jni::jobject*, Number>(env, value));
+        jni::jobject* object = &jni::NewObject(env, *javaClass, *constructor, converted.get());
+
+        return object;
+    }
+
+    jni::jobject* operator()(const std::string value) const {
+        static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/google/gson/JsonPrimitive")).release();
+        static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "(Ljava/lang/String;)V");
+
+        // Create JsonPrimitive
+        jni::LocalObject<jni::jobject> converted = jni::NewLocalObject(env, *convert<jni::jobject*, std::string>(env, value));
+        jni::jobject* object = &jni::NewObject(env, *javaClass, *constructor, converted.get());
+
+        return object;
+    }
+
+    jni::jobject* operator()(const std::vector<mapbox::geometry::value> values) const {
+        static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/google/gson/JsonArray")).release();
+        static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "()V");;
+        static jni::jmethodID* add = &jni::GetMethodID(env, *javaClass, "add", "(Lcom/google/gson/JsonElement;)V");
+
+        // Create json array
+        jni::jobject* jarray = &jni::NewObject(env, *javaClass, *constructor);
+
+        // Add values
+        for (const auto &v : values) {
+            jni::LocalObject<jni::jobject> converted = jni::NewLocalObject(env, mapbox::geometry::value::visit(v, *this));
+            jni::CallMethod<void>(env, jarray, *add, converted.get());
+        }
+
+        return jarray;
+    }
+
+    jni::jobject* operator()(const std::unordered_map<std::string, mapbox::geometry::value> value) const {
+        static jni::jclass* javaClass = jni::NewGlobalRef(env, &jni::FindClass(env, "com/google/gson/JsonObject")).release();
+        static jni::jmethodID* constructor = &jni::GetMethodID(env, *javaClass, "<init>", "()V");;
+        static jni::jmethodID* add = &jni::GetMethodID(env, *javaClass, "add", "(Ljava/lang/String;Lcom/google/gson/JsonElement;)V");
+
+        // Create json object
+        jni::jobject* jsonObject = &jni::NewObject(env, *javaClass, *constructor);
+
+        // Add items
+        for (auto &item : value) {
+            jni::LocalObject<jni::jobject> converted = jni::NewLocalObject(env, mbgl::Value::visit(item.second, *this));
+            jni::LocalObject<jni::jobject> key = jni::NewLocalObject(env, *convert<jni::jobject*, std::string>(env, item.first));
+            jni::CallMethod<void>(env, jsonObject, *add, key.get(), converted.get());
+        }
+
+        return jsonObject;
+    }
+
+private:
+
+};
+
+/**
+ * mapbox::geometry::value -> Java Json
+ */
+template <>
+struct Converter<jni::jobject*, mapbox::geometry::value> {
+    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mapbox::geometry::value& value) const {
+        JsonEvaluator evaluator { env } ;
+        jni::jobject* converted = mapbox::geometry::value::visit(value, evaluator);
+        return { converted };
+    }
+};
+
+}
+}
+}
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp
index 53f210ac33..4ed25eac25 100644
--- a/platform/android/src/style/conversion/property_value.hpp
+++ b/platform/android/src/style/conversion/property_value.hpp
@@ -7,6 +7,7 @@
 #include "../../conversion/constant.hpp"
 #include "types.hpp"
 #include "function.hpp"
+#include "gson.hpp"
 
 namespace mbgl {
 namespace android {
@@ -39,7 +40,7 @@ public:
     }
 
     jni::jobject* operator()(const mbgl::style::CompositeFunction<T> &value) const {
-      return *convert<jni::jobject*, mbgl::style::CompositeFunction<T>>(env, value);
+        return *convert<jni::jobject*, mbgl::style::CompositeFunction<T>>(env, value);
     }
 
 private: