From 2a4eeadb295775236fe1a89b50f9179b790b127a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Tue, 19 Apr 2016 21:15:30 -0700 Subject: [core, ios, osx] Version default style URL APIs; deprecated Emerald MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated default styles from v8 to v9. Deprecated the MGLMapView class methods in favor of new methods that take a version parameter. Deprecated Emerald outright in favor of Outdoors. Replaced usage of the unversioned MGLStyle methods with the corresponding versioned methods and MGLStyleCurrentVersion to ensure consistency. Expanded MGLStyle unit tests to also assert that MGLStyle has the right number of style URL methods and that they’re all public. Linked the OS X SDK unit test bundle to libmbgl-core.a. Removed an unnecessary dependency on osxapp. Replaced Emerald with Outdoors in iosapp and osxapp. Fixes the iOS and OS X side of #4577 and #4702. --- include/mbgl/util/default_styles.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp index 3f5b6bd312..2043dd3f5b 100644 --- a/include/mbgl/util/default_styles.hpp +++ b/include/mbgl/util/default_styles.hpp @@ -14,17 +14,19 @@ struct DefaultStyle { }; extern const DefaultStyle streets; -extern const DefaultStyle emerald; +extern const DefaultStyle outdoors; extern const DefaultStyle light; extern const DefaultStyle dark; extern const DefaultStyle satellite; extern const DefaultStyle hybrid; const DefaultStyle orderedStyles[] = { - streets, emerald, light, dark, satellite, hybrid, + streets, outdoors, light, dark, satellite, hybrid, }; const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle); +static const unsigned currentVersion = 9; + } // end namespace default_styles } // end namespace util } // end namespace mbgl -- cgit v1.2.1