Skip to content

Add possibility to set custom language #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add possibility to set custom language #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72ab900
Add possibility to set custom locale
MrZoidberg Dec 21, 2013
5ab3be8
rename
MrZoidberg Mar 27, 2014
71f3968
fix warning
MrZoidberg Apr 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions SVGeocoder/SVGeocoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,18 @@ 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;

- (void)start;
- (void)cancel;

+ (void)setLanguage:(NSString *)language;

@end
18 changes: 15 additions & 3 deletions SVGeocoder/SVGeocoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ @interface NSString (URLEncoding)
- (NSString*)encodedURLParameterString;
@end

static NSString *customLanguage;

@interface SVGeocoder ()

Expand Down Expand Up @@ -73,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;
Expand Down Expand Up @@ -103,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",
Expand All @@ -116,6 +117,13 @@ - (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region com
return [self initWithParameters:parameters completion:block];
}

#pragma mark - Custom language

+ (void)setLanguage:(NSString *)language;
{
customLanguage = language;
}


#pragma mark - Private Utility Methods

Expand All @@ -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 (customLanguage == nil) {
[parameters setValue:[NSLocale preferredLanguages][0] forKey:@"language"];
} else {
[parameters setValue:customLanguage forKey:@"language"];
}
[self addParametersToRequest:parameters];

self.state = SVGeocoderStateReady;
Expand Down