diff options
Diffstat (limited to 'include/mbgl/util/default_styles.hpp')
| -rw-r--r-- | include/mbgl/util/default_styles.hpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp index 335d3ea5f9..e1c53178b0 100644 --- a/include/mbgl/util/default_styles.hpp +++ b/include/mbgl/util/default_styles.hpp @@ -1,7 +1,8 @@ #pragma once -#include <vector> +#include <array> #include <string> +#include <vector> namespace mbgl { namespace util { @@ -13,17 +14,19 @@ struct DefaultStyle { const unsigned currentVersion; }; +// clang-format off constexpr const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v11", "Streets", 11 }; constexpr const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v11", "Outdoors", 11 }; constexpr const DefaultStyle light = { "mapbox://styles/mapbox/light-v10", "Light", 10 }; constexpr const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v10", "Dark", 10 }; constexpr const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite", 9 }; constexpr const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v11", "Satellite Streets", 11 }; +// clang-format on -const DefaultStyle orderedStyles[] = { - streets, outdoors, light, dark, satellite, satelliteStreets, -}; -const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle); +constexpr std::array<const DefaultStyle, 6> orderedStyles = { + {streets, outdoors, light, dark, satellite, satelliteStreets}}; + +constexpr size_t numOrderedStyles = orderedStyles.size(); } // end namespace default_styles } // end namespace util |