diff options
author | Anand Thakker <anandthakker@users.noreply.github.com> | 2017-02-15 17:16:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-15 17:16:54 -0500 |
commit | 685f237d0286ef13aac52cbbab93fed82a0b31b8 (patch) | |
tree | 78116f66e4212abbac7ea49359cabcc4124dad70 /include/mbgl/style | |
parent | eb8a1ef7aa43582202c8b385b9ee0665cc6c838c (diff) | |
download | qtlocation-mapboxgl-685f237d0286ef13aac52cbbab93fed82a0b31b8.tar.gz |
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.
Diffstat (limited to 'include/mbgl/style')
-rw-r--r-- | include/mbgl/style/conversion/function.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<CameraFunction<T>> { template <class T, class V> Result<optional<T>> convertDefaultValue(const V& value) { - auto defaultValueValue = objectMember(value, "defaultValue"); + auto defaultValueValue = objectMember(value, "default"); if (!defaultValueValue) { return {}; } |