refs #568: attempt to hint to Swift compiler about singleton constructor

mapbox · Jan 26, 2015 · d2f11be · d2f11be
1 parent 99eb0c1
commit d2f11be
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/MapView/Map/RMConfiguration.h b/MapView/Map/RMConfiguration.h
@@ -32,9 +32,13 @@
 
 /** @name Accessing the Configuration */
 
+/** Access the shared instance of the configuration.
+*   @return The shared configuration instance. */
++ (instancetype)sharedInstance;
+
 /** Access the shared instance of the configuration. 
 *   @return The shared configuration instance. */
-+ (instancetype)configuration;
++ (instancetype)configuration DEPRECATED_MSG_ATTRIBUTE("use +[RMConfiguration sharedInstance]");
 
 - (RMConfiguration *)initWithPath:(NSString *)path;
 

diff --git a/MapView/Map/RMConfiguration.m b/MapView/Map/RMConfiguration.m
@@ -37,7 +37,7 @@ + (NSData *)sendBrandedSynchronousRequest:(NSURLRequest *)request returningRespo
                                                               cachePolicy:request.cachePolicy
                                                           timeoutInterval:request.timeoutInterval];
 
-    [newRequest setValue:[[RMConfiguration configuration] userAgent] forHTTPHeaderField:@"User-Agent"];
+    [newRequest setValue:[[RMConfiguration sharedInstance] userAgent] forHTTPHeaderField:@"User-Agent"];
 
     return [NSURLConnection sendSynchronousRequest:newRequest returningResponse:response error:error];
 }
@@ -52,7 +52,7 @@ + (instancetype)brandedDataWithContentsOfURL:(NSURL *)aURL
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:aURL];
 
-    [request setValue:[[RMConfiguration configuration] userAgent] forHTTPHeaderField:@"User-Agent"];
+    [request setValue:[[RMConfiguration sharedInstance] userAgent] forHTTPHeaderField:@"User-Agent"];
 
     return [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:nil];
 }
@@ -67,7 +67,7 @@ + (instancetype)brandedStringWithContentsOfURL:(NSURL *)url encoding:(NSStringEn
 {
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
 
-    [request setValue:[[RMConfiguration configuration] userAgent] forHTTPHeaderField:@"User-Agent"];
+    [request setValue:[[RMConfiguration sharedInstance] userAgent] forHTTPHeaderField:@"User-Agent"];
 
     NSData *returnData = [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:error];
 
@@ -89,7 +89,7 @@ @implementation RMConfiguration
 @synthesize userAgent=_userAgent;
 @synthesize accessToken=_accessToken;
 
-+ (instancetype)configuration
++ (instancetype)sharedInstance
 {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -99,6 +99,11 @@ + (instancetype)configuration
     return RMConfigurationSharedInstance;
 }
 
++ (instancetype)configuration
+{
+    return [[self class] sharedInstance];
+}
+
 - (RMConfiguration *)initWithPath:(NSString *)path
 {
     if (!(self = [super init]))

diff --git a/MapView/Map/RMMapboxSource.m b/MapView/Map/RMMapboxSource.m
@@ -184,8 +184,8 @@ - (void)dealloc
 
 - (NSURL *)canonicalURLForMapID:(NSString *)mapID
 {
-    NSString *version     = ([[RMConfiguration configuration] accessToken] ? @"v4" : @"v3");
-    NSString *accessToken = ([[RMConfiguration configuration] accessToken] ? [@"&access_token=" stringByAppendingString:[[RMConfiguration configuration] accessToken]] : @"");
+    NSString *version     = ([[RMConfiguration sharedInstance] accessToken] ? @"v4" : @"v3");
+    NSString *accessToken = ([[RMConfiguration sharedInstance] accessToken] ? [@"&access_token=" stringByAppendingString:[[RMConfiguration sharedInstance] accessToken]] : @"");
 
     return [NSURL URLWithString:[NSString stringWithFormat:@"https://api.tiles.mapbox.com/%@/%@.json?secure%@", version, mapID, accessToken]];
 }
@@ -358,7 +358,7 @@ - (float)centerZoom
 
 + (BOOL)isUsingLargeTiles
 {
-    return ([[RMConfiguration configuration] accessToken] && [[UIScreen mainScreen] scale] > 1.0);
+    return ([[RMConfiguration sharedInstance] accessToken] && [[UIScreen mainScreen] scale] > 1.0);
 }
 
 - (NSString *)uniqueTilecacheKey

diff --git a/MapView/Map/RMMarker.m b/MapView/Map/RMMarker.m
@@ -140,8 +140,8 @@ - (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)
 
 - (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString
 {
-    NSString *version     = ([[RMConfiguration configuration] accessToken] ? @"v4" : @"v3");
-    NSString *accessToken = ([[RMConfiguration configuration] accessToken] ? [@"?access_token=" stringByAppendingString:[[RMConfiguration configuration] accessToken]] : @"");
+    NSString *version     = ([[RMConfiguration sharedInstance] accessToken] ? @"v4" : @"v3");
+    NSString *accessToken = ([[RMConfiguration sharedInstance] accessToken] ? [@"?access_token=" stringByAppendingString:[[RMConfiguration sharedInstance] accessToken]] : @"");
     BOOL useRetina        = ([[UIScreen mainScreen] scale] > 1.0);
 
     NSURL *imageURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://api.tiles.mapbox.com/%@/marker/pin-%@%@%@%@.png%@",

diff --git a/MapView/Map/RMTileCache.m b/MapView/Map/RMTileCache.m
@@ -78,7 +78,7 @@ - (id)initWithExpiryPeriod:(NSTimeInterval)period
     _activeTileSource = nil;
     _backgroundFetchQueue = nil;
 
-    id cacheCfg = [[RMConfiguration configuration] cacheConfiguration];
+    id cacheCfg = [[RMConfiguration sharedInstance] cacheConfiguration];
     if (!cacheCfg)
         cacheCfg = [NSArray arrayWithObjects:
                     [NSDictionary dictionaryWithObject: @"memory-cache" forKey: @"type"],