[core] Use convertJSON instead of RapidJSON directly

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

View File

@@ -2,20 +2,16 @@
#include <mbgl/style/filter.hpp>
#include <mbgl/style/filter_evaluator.hpp>
#include <mbgl/style/rapidjson_conversion.hpp>
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/conversion/json.hpp>
#include <mbgl/style/conversion/filter.hpp>
#include <mbgl/tile/geometry_tile_data.hpp>
#include <rapidjson/document.h>
using namespace mbgl;
style::Filter parse(const char* expression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
doc.Parse<0>(expression);
style::conversion::Error error;
return *style::conversion::convert<style::Filter, JSValue>(doc, error);
return *style::conversion::convertJSON<style::Filter>(expression, error);
}
static void Parse_Filter(benchmark::State& state) {