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 /macosx/mapboxgl-app.gypi | |
| 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 'macosx/mapboxgl-app.gypi')
| -rw-r--r-- | macosx/mapboxgl-app.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/macosx/mapboxgl-app.gypi b/macosx/mapboxgl-app.gypi index 3f16e8e89d..283e001c44 100644 --- a/macosx/mapboxgl-app.gypi +++ b/macosx/mapboxgl-app.gypi @@ -27,8 +27,6 @@ '../platform/darwin/reachability.m', '../platform/default/glfw_view.hpp', '../platform/default/glfw_view.cpp', - '../platform/default/default_styles.hpp', - '../platform/default/default_styles.cpp', ], 'variables' : { |