From cb3e5b204a8fb2aaebc923afde3ad690db785ef3 Mon Sep 17 00:00:00 2001 From: Martin Blech Date: Thu, 26 Feb 2015 16:55:14 -0300 Subject: [PATCH] Fix CLRegion deprecation warnings CLRegion's radius and center properties were deprecated in iOS 7, we should use CLCircularRegion instead. --- SVGeocoder/SVGeocoder.h | 8 ++++---- SVGeocoder/SVGeocoder.m | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SVGeocoder/SVGeocoder.h b/SVGeocoder/SVGeocoder.h index 3d1e3b0..0e8f7d6 100644 --- a/SVGeocoder/SVGeocoder.h +++ b/SVGeocoder/SVGeocoder.h @@ -39,17 +39,17 @@ typedef void (^SVGeocoderCompletionHandler)(NSArray *placemarks, NSHTTPURLRespon + (SVGeocoder*)geocode:(NSString *)address completion:(SVGeocoderCompletionHandler)block; -+ (SVGeocoder*)geocode:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block; ++ (SVGeocoder*)geocode:(NSString *)address region:(CLCircularRegion *)region completion:(SVGeocoderCompletionHandler)block; + (SVGeocoder*)geocode:(NSString *)address components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; -+ (SVGeocoder*)geocode:(NSString *)address region:(CLRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; ++ (SVGeocoder*)geocode:(NSString *)address region:(CLCircularRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; + (SVGeocoder*)reverseGeocode:(CLLocationCoordinate2D)coordinate completion:(SVGeocoderCompletionHandler)block; - (SVGeocoder*)initWithAddress:(NSString *)address completion:(SVGeocoderCompletionHandler)block; -- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block; +- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLCircularRegion *)region completion:(SVGeocoderCompletionHandler)block; - (SVGeocoder*)initWithAddress:(NSString *)address components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; -- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; +- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLCircularRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block; - (SVGeocoder*)initWithCoordinate:(CLLocationCoordinate2D)coordinate completion:(SVGeocoderCompletionHandler)block; diff --git a/SVGeocoder/SVGeocoder.m b/SVGeocoder/SVGeocoder.m index 8513a48..616f026 100644 --- a/SVGeocoder/SVGeocoder.m +++ b/SVGeocoder/SVGeocoder.m @@ -45,7 +45,7 @@ - (void)addParametersToRequest:(NSMutableDictionary*)parameters; - (void)finish; - (NSString*)createComponentsStringFromDictionary:(NSDictionary *)components; -- (NSString*)createBoundsStringFromRegion:(CLRegion *)region; +- (NSString*)createBoundsStringFromRegion:(CLCircularRegion *)region; - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error; @@ -77,7 +77,7 @@ + (SVGeocoder *)geocode:(NSString *)address completion:(SVGeocoderCompletionHand return geocoder; } -+ (SVGeocoder *)geocode:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block { ++ (SVGeocoder *)geocode:(NSString *)address region:(CLCircularRegion *)region completion:(SVGeocoderCompletionHandler)block { SVGeocoder *geocoder = [[self alloc] initWithAddress:address region:region completion:block]; [geocoder start]; return geocoder; @@ -89,7 +89,7 @@ + (SVGeocoder*)geocode:(NSString *)address components:(NSDictionary *)components return geocoder; } -+ (SVGeocoder*)geocode:(NSString *)address region:(CLRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block { ++ (SVGeocoder*)geocode:(NSString *)address region:(CLCircularRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block { SVGeocoder *geocoder = [[self alloc] initWithAddress:address region:region components:components completion:block]; [geocoder start]; return geocoder; @@ -124,7 +124,7 @@ - (SVGeocoder*)initWithAddress:(NSString*)address completion:(SVGeocoderCompleti return [self initWithParameters:parameters completion:block]; } -- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block { +- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLCircularRegion *)region completion:(SVGeocoderCompletionHandler)block { NSString *bounds = [self createBoundsStringFromRegion:region]; NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: @@ -144,7 +144,7 @@ - (SVGeocoder*)initWithAddress:(NSString *)address components:(NSDictionary *)co return [self initWithParameters:parameters completion:block]; } -- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block { +- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLCircularRegion *)region components:(NSDictionary *)components completion:(SVGeocoderCompletionHandler)block { NSString *bounds = [self createBoundsStringFromRegion:region]; NSString *componentsValue = [self createComponentsStringFromDictionary:components]; @@ -219,7 +219,7 @@ - (NSString*)createComponentsStringFromDictionary:(NSDictionary *)components { return componentsValue; } -- (NSString*)createBoundsStringFromRegion:(CLRegion *)region { +- (NSString*)createBoundsStringFromRegion:(CLCircularRegion *)region { MKCoordinateRegion coordinateRegion = MKCoordinateRegionMakeWithDistance(region.center, region.radius, region.radius); NSString *bounds = [NSString stringWithFormat:@"%f,%f|%f,%f",