diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-10-29 12:23:50 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-10-30 13:09:37 -0700 |
commit | 557b8afb7c310a6330f741ca0f38fcec098f3156 (patch) | |
tree | 701483c58128279167261b55f6ecbdfc3353f9a5 /platform/default/default_styles.cpp | |
parent | 3b6dc37e396931c883fe6ab602802dbb00defed9 (diff) | |
download | qtlocation-mapboxgl-557b8afb7c310a6330f741ca0f38fcec098f3156.tar.gz |
[core][iOS] Source iOS styles from default_styles
Moved mbgl::util::default_styles to a more appropriate location, where iOS platform code can also find it. Moved -[MGLMapView bundledStyleURLs] (which is now deprecated) and the style switcher in iosapp to default_styles.
Added a collection of convenience methods for getting style URLs. It makes little sense to layer an enum atop this, as MapKit does, because MGLMapView styles aren’t limited to this set. A good analogy is UIColor. This also makes for a good entry point for future runtime styling APIs.
Introduced independent constants for each default style, because it’s more common to need access to a particular style than to iterate over them. This fact is apparent in the MGLStyle class, which now uses macros and assertions to ensure that it’s kept up-to-date with changes in default_styles.
/ref #1462
Diffstat (limited to 'platform/default/default_styles.cpp')
-rw-r--r-- | platform/default/default_styles.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/platform/default/default_styles.cpp b/platform/default/default_styles.cpp deleted file mode 100644 index 43af4767f5..0000000000 --- a/platform/default/default_styles.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "default_styles.hpp" - -namespace mbgl { -namespace util { - -const std::vector<std::pair<std::string, std::string>> defaultStyles = { - { "mapbox://styles/mapbox/streets-v8", "Streets" }, - { "mapbox://styles/mapbox/emerald-v8", "Emerald" }, - { "mapbox://styles/mapbox/light-v8", "Light" }, - { "mapbox://styles/mapbox/dark-v8", "Dark" }, - { "mapbox://styles/mapbox/satellite-v8", "Satellite" }, - { "mapbox://styles/mapbox/satellite-hybrid-v8", "Hybrid" }, -}; - -} // end namespace util -} // end namespace mbgl |