tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework expression conversion (#11490)

Browse Source 
* [android] - rework expression conversion
This commit is contained in:
Tobrun
2018-04-10 11:09:42 +02:00
committed by GitHub
parent 351ac83c75
commit 44ce5ab087
26 changed files with 318 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platform/android/src/gson/json_array.cpp
View File

@@ -6,7 +6,22 @@ namespace mbgl {
namespace android {
namespace gson {
std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv &env, jni::Object<JsonArray> jsonArray) {
jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox::geometry::value>& values){
static auto constructor = JsonArray::javaClass.GetConstructor(env);
static auto addMethod = JsonArray::javaClass.GetMethod<void (jni::Object<JsonElement>)>(env, "add");
auto jsonArray = JsonArray::javaClass.New(env, constructor);
for (const auto &v : values) {
auto jsonElement = JsonElement::New(env, v);
jsonArray.Call(env, addMethod, jsonElement);
jni::DeleteLocalRef(env, jsonElement);
}
return jsonArray;
}
std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray> jsonArray) {
std::vector<mapbox::geometry::value> values;
if (jsonArray) {
@@ -28,7 +43,7 @@ std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv &env, jni::O
return values;
}
void JsonArray::registerNative(jni::JNIEnv &env) {
void JsonArray::registerNative(jni::JNIEnv& env) {
// Lookup the class
javaClass = *jni::Class<JsonArray>::Find(env).NewGlobalRef(env).release();
}