diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-22 11:28:07 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-07 09:44:12 -0700 |
| commit | 6be8302296147515e0b0d7ed7cc46d195227118e (patch) | |
| tree | 5c7e4c1407719058576b858230c77331fac3616d /platform/android/src/gson/json_object.hpp | |
| parent | 3948bbd7775ea336e54fa6f152f05a139ee88750 (diff) | |
| download | qtlocation-mapboxgl-6be8302296147515e0b0d7ed7cc46d195227118e.tar.gz | |
[android] Simplify JSON conversion
Diffstat (limited to 'platform/android/src/gson/json_object.hpp')
| -rw-r--r-- | platform/android/src/gson/json_object.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/android/src/gson/json_object.hpp b/platform/android/src/gson/json_object.hpp index 85e8828d91..256161f0d9 100644 --- a/platform/android/src/gson/json_object.hpp +++ b/platform/android/src/gson/json_object.hpp @@ -2,8 +2,6 @@ #include "json_element.hpp" -#include <mapbox/geometry.hpp> - #include <jni/jni.hpp> namespace mbgl { @@ -14,8 +12,8 @@ class JsonObject : public JsonElement { public: static constexpr auto Name() { return "com/google/gson/JsonObject"; }; - static jni::Object<JsonObject> New(jni::JNIEnv&, const std::unordered_map<std::string, mapbox::geometry::value>&); - static mapbox::geometry::property_map convert(JNIEnv&, jni::Object<JsonObject>); + static jni::Object<JsonObject> New(jni::JNIEnv&, const mbgl::PropertyMap&); + static mbgl::PropertyMap convert(JNIEnv&, jni::Object<JsonObject>); static void registerNative(jni::JNIEnv&); }; |