From 685f237d0286ef13aac52cbbab93fed82a0b31b8 Mon Sep 17 00:00:00 2001 From: Anand Thakker Date: Wed, 15 Feb 2017 17:16:54 -0500 Subject: Refactor: use conversion system to convert MGLStyleFunction to mbgl core types (#8026) This leverages the work already happening in `mbgl::style::conversion` to convert style functions from style-spec definitions into `mbgl::style::{Camera,Source,Composite}Function`s. In particular, this allows the conversions system to handle the differing typing requirements based on whether the output type of the style function is interpolatable or non-interpolatable. --- include/mbgl/style/conversion/function.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/mbgl/style/conversion') diff --git a/include/mbgl/style/conversion/function.hpp b/include/mbgl/style/conversion/function.hpp index 1f7a3fe778..a5979e6799 100644 --- a/include/mbgl/style/conversion/function.hpp +++ b/include/mbgl/style/conversion/function.hpp @@ -200,7 +200,7 @@ struct Converter> { template Result> convertDefaultValue(const V& value) { - auto defaultValueValue = objectMember(value, "defaultValue"); + auto defaultValueValue = objectMember(value, "default"); if (!defaultValueValue) { return {}; } -- cgit v1.2.1