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

[core] Split up and clean up conversion.hpp

Browse Source
This commit is contained in:
John Firebaugh
2016-06-22 12:31:49 -07:00
parent cb6a519f7c
commit 089c4e413f
10 changed files with 483 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mbgl/style/parser.cpp
View File

@@ -11,6 +11,7 @@
#include <mbgl/style/layers/background_layer.hpp>
#include <mbgl/style/rapidjson_conversion.hpp>
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/conversion/filter.hpp>
#include <mbgl/platform/log.hpp>
@@ -277,11 +278,11 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
}
if (value.HasMember("filter")) {
conversion::Result<Filter> filter = conversion::convertFilter(value["filter"]);
if (filter.is<Filter>()) {
impl->filter = filter.get<Filter>();
conversion::Result<Filter> filter = conversion::convert<Filter>(value["filter"]);
if (filter) {
impl->filter = *filter;
} else {
Log::Warning(Event::ParseStyle, filter.get<conversion::Error>().message);
Log::Warning(Event::ParseStyle, filter.error().message);
}
}