From 72ab9009f23c01ffa5599ee4c58f36c962cfb8c0 Mon Sep 17 00:00:00 2001 From: Mikhail Merkulov Date: Sat, 21 Dec 2013 17:44:53 +0200 Subject: [PATCH 1/3] Add possibility to set custom locale --- SVGeocoder/SVGeocoder.h | 2 ++ SVGeocoder/SVGeocoder.m | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/SVGeocoder/SVGeocoder.h b/SVGeocoder/SVGeocoder.h index 74995a0..eb3c960 100644 --- a/SVGeocoder/SVGeocoder.h +++ b/SVGeocoder/SVGeocoder.h @@ -39,4 +39,6 @@ typedef void (^SVGeocoderCompletionHandler)(NSArray *placemarks, NSHTTPURLRespon - (void)start; - (void)cancel; ++ (void)setCustomeLocale:(NSString *)locale; + @end \ No newline at end of file diff --git a/SVGeocoder/SVGeocoder.m b/SVGeocoder/SVGeocoder.m index 63861ad..2c6db71 100644 --- a/SVGeocoder/SVGeocoder.m +++ b/SVGeocoder/SVGeocoder.m @@ -26,6 +26,7 @@ @interface NSString (URLEncoding) - (NSString*)encodedURLParameterString; @end +static NSString *customLocale; @interface SVGeocoder () @@ -116,6 +117,13 @@ - (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region com return [self initWithParameters:parameters completion:block]; } +#pragma mark - Custom locale + ++ (void)setCustomeLocale:(NSString *)locale +{ + customLocale = locale; +} + #pragma mark - Private Utility Methods @@ -126,7 +134,11 @@ - (SVGeocoder*)initWithParameters:(NSMutableDictionary*)parameters completion:(S [self.operationRequest setTimeoutInterval:kSVGeocoderTimeoutInterval]; [parameters setValue:@"true" forKey:@"sensor"]; - [parameters setValue:[NSLocale preferredLanguages][0] forKey:@"language"]; + if (customLocale == nil) { + [parameters setValue:[NSLocale preferredLanguages][0] forKey:@"language"]; + } else { + [parameters setValue:customLocale forKey:@"language"]; + } [self addParametersToRequest:parameters]; self.state = SVGeocoderStateReady; From 5ab3be839b8e281f92626fe4545c2a78055eb868 Mon Sep 17 00:00:00 2001 From: Mikhail Merkulov Date: Thu, 27 Mar 2014 23:49:11 +0200 Subject: [PATCH 2/3] rename --- SVGeocoder/SVGeocoder.h | 2 +- SVGeocoder/SVGeocoder.m | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SVGeocoder/SVGeocoder.h b/SVGeocoder/SVGeocoder.h index eb3c960..07da221 100644 --- a/SVGeocoder/SVGeocoder.h +++ b/SVGeocoder/SVGeocoder.h @@ -39,6 +39,6 @@ typedef void (^SVGeocoderCompletionHandler)(NSArray *placemarks, NSHTTPURLRespon - (void)start; - (void)cancel; -+ (void)setCustomeLocale:(NSString *)locale; ++ (void)setLanguage:(NSString *)language; @end \ No newline at end of file diff --git a/SVGeocoder/SVGeocoder.m b/SVGeocoder/SVGeocoder.m index 2c6db71..91dab43 100644 --- a/SVGeocoder/SVGeocoder.m +++ b/SVGeocoder/SVGeocoder.m @@ -26,7 +26,7 @@ @interface NSString (URLEncoding) - (NSString*)encodedURLParameterString; @end -static NSString *customLocale; +static NSString *customLanguage; @interface SVGeocoder () @@ -117,11 +117,11 @@ - (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region com return [self initWithParameters:parameters completion:block]; } -#pragma mark - Custom locale +#pragma mark - Custom language -+ (void)setCustomeLocale:(NSString *)locale ++ (void)setLanguage:(NSString *)language; { - customLocale = locale; + customLanguage = language; } @@ -134,10 +134,10 @@ - (SVGeocoder*)initWithParameters:(NSMutableDictionary*)parameters completion:(S [self.operationRequest setTimeoutInterval:kSVGeocoderTimeoutInterval]; [parameters setValue:@"true" forKey:@"sensor"]; - if (customLocale == nil) { + if (customLanguage == nil) { [parameters setValue:[NSLocale preferredLanguages][0] forKey:@"language"]; } else { - [parameters setValue:customLocale forKey:@"language"]; + [parameters setValue:customLanguage forKey:@"language"]; } [self addParametersToRequest:parameters]; From 71f3968bc29d8809879774968c3b753b0b679d35 Mon Sep 17 00:00:00 2001 From: Mikhail Merkulov Date: Mon, 14 Apr 2014 23:06:18 +0300 Subject: [PATCH 3/3] fix warning --- SVGeocoder/SVGeocoder.h | 4 ++-- SVGeocoder/SVGeocoder.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SVGeocoder/SVGeocoder.h b/SVGeocoder/SVGeocoder.h index 07da221..bd85df1 100644 --- a/SVGeocoder/SVGeocoder.h +++ b/SVGeocoder/SVGeocoder.h @@ -27,12 +27,12 @@ typedef void (^SVGeocoderCompletionHandler)(NSArray *placemarks, NSHTTPURLRespon @interface SVGeocoder : NSOperation + (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*)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*)initWithCoordinate:(CLLocationCoordinate2D)coordinate completion:(SVGeocoderCompletionHandler)block; diff --git a/SVGeocoder/SVGeocoder.m b/SVGeocoder/SVGeocoder.m index 91dab43..b2213fa 100644 --- a/SVGeocoder/SVGeocoder.m +++ b/SVGeocoder/SVGeocoder.m @@ -74,7 +74,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; @@ -104,7 +104,7 @@ - (SVGeocoder*)initWithAddress:(NSString*)address completion:(SVGeocoderCompleti } -- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block { +- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLCircularRegion *)region completion:(SVGeocoderCompletionHandler)block { MKCoordinateRegion coordinateRegion = MKCoordinateRegionMakeWithDistance(region.center, region.radius, region.radius); NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys: address, @"address",