[android] Update toGeoJSON in android_conversion.hpp

mapbox · Mar 2, 2020 · 7a367b1 · 7a367b1
1 parent 6bed207
commit 7a367b1
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp
@@ -110,11 +110,24 @@ class ConversionTraits<mbgl::android::Value> {
     }
 
     static optional<GeoJSON> toGeoJSON(const mbgl::android::Value &value, Error &error) {
-        if (value.isNull() || !value.isString()) {
+        if (value.isNull()) {
             error = { "no json data found" };
             return {};
+        } else if (value.isString()) {
+            return parseGeoJSON(value.toString(), error);
+        } else if (value.isObject()) {
+            mbgl::android::Value keys = value.keyArray();
+            std::size_t length = arrayLength(keys);
+            for (std::size_t i = 0; i < length; ++i) {
+                const auto k = keys.get(i).toString();
+                if (k == "json") {
+                    auto v = value.get(k.c_str());
+                    return parseGeoJSON(v.toString(), error);
+                }
+            }
         }
-        return parseGeoJSON(value.toString(), error);
+        error = {"no json data found"};
+        return {};
     }
 };