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

[android] Simplify JSON conversion

Browse Source
This commit is contained in:
John Firebaugh
2018-08-22 11:28:07 -07:00
parent 3948bbd777
commit 6be8302296
8 changed files with 82 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,11 @@
#include "json_array.hpp"
#include "json_element.hpp"
namespace mbgl {
namespace android {
namespace gson {
jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox::geometry::value>& values){
jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mbgl::Value>& values){
static auto javaClass = jni::Class<JsonArray>::Singleton(env);
static auto constructor = javaClass.GetConstructor(env);
static auto addMethod = javaClass.GetMethod<void (jni::Object<JsonElement>)>(env, "add");
@@ -20,8 +19,8 @@ jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mapbox
return jsonArray;
}
std::vector<mapbox::geometry::value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray> jsonArray) {
std::vector<mapbox::geometry::value> values;
std::vector<mbgl::Value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray> jsonArray) {
std::vector<mbgl::Value> values;
if (jsonArray) {
static auto javaClass = jni::Class<JsonArray>::Singleton(env);