brbupstream/tvn-remove-api-function

1 files changed, 31 insertions, 11 deletions

diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp
index b1383a788e..a8686baeff 100644
--- a/platform/android/src/style/conversion/property_value.hpp
+++ b/platform/android/src/style/conversion/property_value.hpp
@@ -10,6 +10,26 @@ namespace mbgl {
 namespace android {
 namespace conversion {
 
+//template <class T>
+//struct Converter<jni::jobject*, mbgl::style::PropertyValue<T>> {
+//
+//    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::PropertyValue<T>& value) const {
+//
+//         if(value.isUndefined()) {
+//             //Return a nullptr representing a Java null value
+//             return {nullptr};
+//         } else if (value.isConstant()) {
+//             //Time to convert the constant value
+//             Result<jni::jobject*> result = convert<jni::jobject*, T>(env, value.asConstant());
+//             return {*result};
+//             //return converted;
+//         } else {
+//             throw std::runtime_error("Unknown property value type");
+//         }
+//    }
+//};
+
+
 /**
  * Conversion from core property value types to Java property value types
  */
@@ -28,17 +48,17 @@ public:
         return *result;
     }
 
-//    jni::jobject* operator()(const mbgl::style::CameraFunction<T> &value) const {
-//        return *convert<jni::jobject*, mbgl::style::CameraFunction<T>>(env, value);
-//    }
-//
-//    jni::jobject* operator()(const mbgl::style::SourceFunction<T> &value) const {
-//        return *convert<jni::jobject*, mbgl::style::SourceFunction<T>>(env, value);
-//    }
-//
-//    jni::jobject* operator()(const mbgl::style::CompositeFunction<T> &value) const {
-//      return *convert<jni::jobject*, mbgl::style::CompositeFunction<T>>(env, value);
-//    }
+    jni::jobject* operator()(const mbgl::style::CameraFunction<T> &value) const {
+        return *convert<jni::jobject*, mbgl::style::CameraFunction<T>>(env, value);
+    }
+
+    jni::jobject* operator()(const mbgl::style::SourceFunction<T> &value) const {
+        return *convert<jni::jobject*, mbgl::style::SourceFunction<T>>(env, value);
+    }
+
+    jni::jobject* operator()(const mbgl::style::CompositeFunction<T> &value) const {
+      return *convert<jni::jobject*, mbgl::style::CompositeFunction<T>>(env, value);
+    }
 
 private:
     jni::JNIEnv& env;