[core] Obey "transition" property from style and its default value

This commit is contained in:
John Firebaugh
2017-06-12 15:21:15 -07:00
parent ae5b0391b6
commit 5a87291826
6 changed files with 22 additions and 4 deletions

View File

@@ -86,6 +86,10 @@ StyleParseResult Parser::parse(const std::string& json) {
}
}
if (document.HasMember("transition")) {
parseTransition(document["transition"]);
}
if (document.HasMember("light")) {
parseLight(document["light"]);
}
@@ -115,6 +119,17 @@ StyleParseResult Parser::parse(const std::string& json) {
return nullptr;
}
void Parser::parseTransition(const JSValue& value) {
conversion::Error error;
optional<TransitionOptions> converted = conversion::convert<TransitionOptions>(value, error);
if (!converted) {
Log::Warning(Event::ParseStyle, error.message);
return;
}
transition = std::move(*converted);
}
void Parser::parseLight(const JSValue& value) {
conversion::Error error;
optional<Light> converted = conversion::convert<Light>(value, error);