summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-04-23 18:15:01 -0500
committerBrad Leege <bleege@gmail.com>2015-04-23 18:15:01 -0500
commit7e145780ebbd5d35a74f263c51827ae2a37c4eb8 (patch)
tree65b802c19ce520c2c0b1a1c99ab976ba84cbb23b /include
parent19b5ef367ead43c9e156807ed86da065b0fd3ba2 (diff)
downloadqtlocation-mapboxgl-7e145780ebbd5d35a74f263c51827ae2a37c4eb8.tar.gz
#1225 - Initial conversion of Mapbox GL app to set access token in AppDelegate and exposing MGLMapView.initWithFrame to support it
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/ios/MGLMapView.h5
-rw-r--r--include/mbgl/ios/MapboxGL.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h
index 8717b5e8a1..eb9a770dcb 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/include/mbgl/ios/MGLMapView.h
@@ -20,6 +20,11 @@ IB_DESIGNABLE
/** @name Initializing a Map View */
+/** Initialize a map view with the default style, given frame, and access token set in MapboxGL singleton.
+* @param frame The frame with which to initialize the map view.
+* @return An initialized map view, or `nil` if the map view was unable to be initialized. */
+- (instancetype)initWithFrame:(CGRect)frame;
+
/** Initialize a map view with the default style and a given frame and access token.
* @param frame The frame with which to initialize the map view.
* @param accessToken A Mapbox API access token.
diff --git a/include/mbgl/ios/MapboxGL.h b/include/mbgl/ios/MapboxGL.h
index 84c3f45429..4e5ff09b26 100644
--- a/include/mbgl/ios/MapboxGL.h
+++ b/include/mbgl/ios/MapboxGL.h
@@ -5,6 +5,7 @@
@interface MapboxGL : NSObject
-+ (void) sharedInstanceWithAccessToken:(NSString *)token;
++ (id) sharedInstanceWithAccessToken:(NSString *)token;
++ (NSString *) getAccessToken;
@end \ No newline at end of file