[Qt] Implement a GeoJSON coverter from QByteArray

3 files changed, 48 insertions, 3 deletions

diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp
index 7968dbc3ad..33bd5779a1 100644
--- a/platform/qt/platform.gyp
+++ b/platform/qt/platform.gyp
@@ -74,6 +74,8 @@
       'variables': {
         'cflags': [
           '<@(boost_cflags)',
+          '<@(geojson_cflags)',
+          '<@(libjpeg-turbo_cflags)',
           '<@(nunicode_cflags)',
           '<@(opengl_cflags)',
           '<@(qt_core_cflags)',
@@ -93,6 +95,8 @@
           '<@(zlib_ldflags)',
         ],
         'libraries': [
+          '<@(geojson_static_libs)',
+          '<@(libjpeg-turbo_static_libs)',
           '<@(nunicode_static_libs)',
           '<@(sqlite_static_libs)',
           '<@(zlib_static_libs)',
diff --git a/platform/qt/src/qt_conversion.hpp b/platform/qt/src/qt_conversion.hpp
index ebcbdbdc04..dc20aa4753 100644
--- a/platform/qt/src/qt_conversion.hpp
+++ b/platform/qt/src/qt_conversion.hpp
@@ -28,7 +28,7 @@ inline QVariant arrayMember(const QVariant& value, std::size_t i) {
 }
 
 inline bool isObject(const QVariant& value) {
-    return value.canConvert(QVariant::Map);
+    return value.canConvert(QVariant::Map) || value.type() == QVariant::ByteArray;
 }
 
 inline optional<QVariant> objectMember(const QVariant& value, const char* key) {
diff --git a/platform/qt/src/qt_geojson.hpp b/platform/qt/src/qt_geojson.hpp
index cc0b15a6cd..ff7ee2eada 100644
--- a/platform/qt/src/qt_geojson.hpp
+++ b/platform/qt/src/qt_geojson.hpp
@@ -1,12 +1,53 @@
+#pragma once
+
+#include <mapbox/geojson.hpp>
 #include <mbgl/style/conversion/geojson.hpp>
+#include <mbgl/util/rapidjson.hpp>
+
+#include <sstream>
+#include <string>
+
+#include <QByteArray>
+#include <QVariant>
 
 namespace mbgl {
 namespace style {
 namespace conversion {
 
 template <>
-Result<GeoJSON> convertGeoJSON(const QVariant&) {
-    return Error { "not implemented" };
+Result<GeoJSON> convertGeoJSON(const QVariant& value) {
+    if (value.type() != QVariant::ByteArray) {
+        return Error { "JSON data must be in QByteArray" };
+    }
+
+    auto data = value.toByteArray();
+
+    rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> d;
+    if (data.endsWith(char(0))) {
+        d.Parse<0>(value.toByteArray().data());
+    } else {
+        d.Parse<0>(value.toByteArray().constData());
+    }
+
+    // Needed to keep the error message alive
+    // when we go out of this scope.
+    static std::string error;
+
+    if (d.HasParseError()) {
+        std::stringstream message;
+        message << d.GetErrorOffset() << " - " << rapidjson::GetParseError_En(d.GetParseError());
+
+        error = message.str();
+        return Error { error.c_str() };
+    }
+
+    conversion::Result<GeoJSON> geoJSON = conversion::convertGeoJSON<JSValue>(d);
+    if (!geoJSON) {
+        error = geoJSON.error().message;
+        return Error { error.c_str() };
+    }
+
+    return geoJSON;
 }
 
 } // namespace conversion