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

[core] Use convertJSON instead of RapidJSON directly

Browse Source
This commit is contained in:
John Firebaugh
2017-10-16 15:40:07 -07:00
parent b8654b3b04
commit 12f78fc874
9 changed files with 40 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/style/conversion/function.test.cpp
View File

@@ -1,10 +1,8 @@
#include <mbgl/test/util.hpp>
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/rapidjson_conversion.hpp>
#include <mbgl/style/conversion/json.hpp>
#include <mbgl/style/conversion/constant.hpp>
#include <mbgl/style/conversion/function.hpp>
#include <mbgl/util/rapidjson.hpp>
using namespace mbgl;
using namespace mbgl::style;
@@ -13,10 +11,8 @@ using namespace mbgl::style::conversion;
TEST(StyleConversion, Function) {
Error error;
auto parseFunction = [&](const std::string& src) {
JSDocument doc;
doc.Parse<0>(src);
return convert<CameraFunction<float>, JSValue>(doc, error);
auto parseFunction = [&](const std::string& json) {
return convertJSON<CameraFunction<float>>(json, error);
};
auto fn1 = parseFunction(R"({"stops":[]})");