diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 13:47:22 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:29:26 +0300 |
commit | 6fdf07e3a7df8b94fbb78bd534b032006b70b470 (patch) | |
tree | 8016449137f8803e3f08d5787ba0bfbf2d09643b /src/mbgl/style/layers/background_layer.cpp | |
parent | 788508984fa35b97129cd4ef310986c5d15f30a8 (diff) | |
download | qtlocation-mapboxgl-6fdf07e3a7df8b94fbb78bd534b032006b70b470.tar.gz |
[core] Use mbgl::underlying_type in style properties
Diffstat (limited to 'src/mbgl/style/layers/background_layer.cpp')
-rw-r--r-- | src/mbgl/style/layers/background_layer.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index 3c7a2a7569..1693c47204 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -9,6 +9,7 @@ #include <mbgl/style/conversion/transition_options.hpp> #include <mbgl/style/conversion/json.hpp> #include <mbgl/style/conversion_impl.hpp> +#include <mbgl/util/traits.hpp> #include <mapbox/eternal.hpp> @@ -147,7 +148,7 @@ TransitionOptions BackgroundLayer::getBackgroundPatternTransition() const { using namespace conversion; optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const Convertible& value) { - enum class Property : uint8_t { + enum class Property { BackgroundColor, BackgroundOpacity, BackgroundPattern, @@ -157,12 +158,12 @@ optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const }; MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({ - { "background-color", static_cast<uint8_t>(Property::BackgroundColor) }, - { "background-opacity", static_cast<uint8_t>(Property::BackgroundOpacity) }, - { "background-pattern", static_cast<uint8_t>(Property::BackgroundPattern) }, - { "background-color-transition", static_cast<uint8_t>(Property::BackgroundColorTransition) }, - { "background-opacity-transition", static_cast<uint8_t>(Property::BackgroundOpacityTransition) }, - { "background-pattern-transition", static_cast<uint8_t>(Property::BackgroundPatternTransition) } + { "background-color", mbgl::underlying_type(Property::BackgroundColor) }, + { "background-opacity", mbgl::underlying_type(Property::BackgroundOpacity) }, + { "background-pattern", mbgl::underlying_type(Property::BackgroundPattern) }, + { "background-color-transition", mbgl::underlying_type(Property::BackgroundColorTransition) }, + { "background-opacity-transition", mbgl::underlying_type(Property::BackgroundOpacityTransition) }, + { "background-pattern-transition", mbgl::underlying_type(Property::BackgroundPatternTransition) } }); const auto it = properties.find(name.c_str()); |