diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-02-07 13:36:21 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2019-02-07 15:41:54 +0100 |
commit | 7ad9f3450d038dd2f90f03b55dca51194bc1f587 (patch) | |
tree | 934becf731de338c4976a9839912427afd61f304 /platform/android/src/gson/json_element.cpp | |
parent | 47fa19444e6c21326d99fbe38a3c25716e009971 (diff) | |
download | qtlocation-mapboxgl-7ad9f3450d038dd2f90f03b55dca51194bc1f587.tar.gz |
[android] - remove faulty conversion, explict casting for cluster API
Diffstat (limited to 'platform/android/src/gson/json_element.cpp')
-rw-r--r-- | platform/android/src/gson/json_element.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/platform/android/src/gson/json_element.cpp b/platform/android/src/gson/json_element.cpp index 405efe71ca..ba22304d07 100644 --- a/platform/android/src/gson/json_element.cpp +++ b/platform/android/src/gson/json_element.cpp @@ -2,7 +2,6 @@ #include "json_array.hpp" #include "json_object.hpp" #include "json_primitive.hpp" -#include "../math/math.hpp" namespace mbgl { namespace android { @@ -59,21 +58,13 @@ mbgl::Value JsonElement::convert(jni::JNIEnv &env, const jni::Object<JsonElement static auto getAsBoolean = primitiveClass.GetMethod<jni::jboolean ()>(env, "getAsBoolean"); static auto getAsString = primitiveClass.GetMethod<jni::String ()>(env, "getAsString"); static auto getAsDouble = primitiveClass.GetMethod<jni::jdouble ()>(env, "getAsDouble"); - static auto getAsInteger = primitiveClass.GetMethod<jni::jint ()>(env, "getAsInt"); if (jsonElement.Call(env, isJsonPrimitive)) { auto primitive = jni::Cast(env, primitiveClass, jsonElement); if (primitive.Call(env, isBoolean)) { return bool(primitive.Call(env, getAsBoolean)); } else if (primitive.Call(env, isNumber)) { - auto value = primitive.Call(env, getAsDouble); - if (value == math::Math::rint(env, value)) { - // uint64_t - return static_cast<uint64_t>(primitive.Call(env, getAsInteger)); - } else { - // double - return value; - } + return primitive.Call(env, getAsDouble); } else if (primitive.Call(env, isString)) { return jni::Make<std::string>(env, primitive.Call(env, getAsString)); } else { |