diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-24 17:44:39 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-26 11:57:39 +0300 |
commit | 2b834001cca8c2b0552c106dd404da1b238f043b (patch) | |
tree | 0380a5255f99fd104999ddde0f4efd49d8ca5213 /include/mbgl | |
parent | 73a9d33b29fe4be9addf50c07a50de6131a6a002 (diff) | |
download | qtlocation-mapboxgl-2b834001cca8c2b0552c106dd404da1b238f043b.tar.gz |
[core] type aliases and conversion traits for mapbox::base::Value
Diffstat (limited to 'include/mbgl')
-rw-r--r-- | include/mbgl/style/conversion_impl.hpp | 54 | ||||
-rw-r--r-- | include/mbgl/util/feature.hpp | 10 |
2 files changed, 58 insertions, 6 deletions
diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp index f049ba4ffb..7ac4ec649b 100644 --- a/include/mbgl/style/conversion_impl.hpp +++ b/include/mbgl/style/conversion_impl.hpp @@ -1,11 +1,17 @@ #pragma once +#include <mbgl/style/color_ramp_property_value.hpp> #include <mbgl/style/conversion.hpp> -#include <mbgl/util/optional.hpp> +#include <mbgl/style/property_value.hpp> #include <mbgl/util/feature.hpp> #include <mbgl/util/geojson.hpp> +#include <mbgl/util/optional.hpp> +#include <mapbox/value.hpp> + +#include <array> #include <string> +#include <type_traits> namespace mbgl { namespace style { @@ -288,6 +294,52 @@ optional<T> convert(const Convertible& value, Error& error, Args&&...args) { return Converter<T>()(value, error, std::forward<Args>(args)...); } +template <typename T, typename = void> +struct ValueFactory; + +template <typename T> +struct ValueArrayFactory { + static Value make(const T& arg) { return mapbox::base::ValueArray(arg.begin(), arg.end()); } +}; + +template <> +struct ValueFactory<std::array<float, 2>> : public ValueArrayFactory<std::array<float, 2>> {}; + +template <> +struct ValueFactory<std::vector<float>> : public ValueArrayFactory<std::vector<float>> {}; + +template <> +struct ValueFactory<ColorRampPropertyValue> { + static Value make(const ColorRampPropertyValue& value) { return value.getExpression().serialize(); } +}; + +template <> +struct ValueFactory<Color> { + static Value make(const Color& color) { return color.toObject(); } +}; + +template <typename T> +struct ValueFactory<T, typename std::enable_if<!std::is_enum<T>::value>::type> { + static Value make(const T& arg) { return {arg}; } +}; + +template <typename T> +struct ValueFactory<T, typename std::enable_if<std::is_enum<T>::value>::type> { + static Value make(T arg) { return {int64_t(arg)}; } +}; + +template <typename T> +Value makeValue(T&& arg) { + return ValueFactory<std::decay_t<T>>::make(std::forward<T>(arg)); +} + +template <typename T> +Value makeValue(const PropertyValue<T>& value) { + return value.match([](const Undefined&) -> Value { return {}; }, + [](const T& t) -> Value { return makeValue(t); }, + [](const PropertyExpression<T>& fn) { return fn.getExpression().serialize(); }); +} + } // namespace conversion } // namespace style } // namespace mbgl diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp index 390cc65720..6080976945 100644 --- a/include/mbgl/util/feature.hpp +++ b/include/mbgl/util/feature.hpp @@ -3,16 +3,16 @@ #include <mbgl/util/optional.hpp> #include <mbgl/util/string.hpp> -#include <mapbox/feature.hpp> +#include <mapbox/value.hpp> namespace mbgl { -using Value = mapbox::feature::value; -using NullValue = mapbox::feature::null_value_t; -using PropertyMap = mapbox::feature::property_map; +using Value = mapbox::base::Value; +using NullValue = mapbox::base::NullValue; +using PropertyMap = mapbox::base::ValueObject; using FeatureIdentifier = mapbox::feature::identifier; using Feature = mapbox::feature::feature<double>; -using FeatureState = PropertyMap; +using FeatureState = mapbox::base::ValueObject; using FeatureStates = std::unordered_map<std::string, FeatureState>; // <featureID, FeatureState> using LayerFeatureStates = std::unordered_map<std::string, FeatureStates>; // <sourceLayer, FeatureStates> |