Skip to content

Commit c52040e

Browse files
committed
Replace "bounds" with "region" (now CLRegion).
1 parent fa16da0 commit c52040e

File tree

4 files changed

+12
-29
lines changed

4 files changed

+12
-29
lines changed

Demo/Classes/SVGeocoderAppViewController.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ @implementation SVGeocoderAppViewController
1313

1414

1515
- (void)reverseGeocode {
16-
1716
[SVGeocoder reverseGeocode:CLLocationCoordinate2DMake(latField.text.floatValue, lngField.text.floatValue)
1817
completion:^(NSArray *placemarks, NSHTTPURLResponse *urlResponse, NSError *error) {
1918
NSLog(@"placemarks = %@", placemarks);

README.textile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ In it's simplest form, geocoding an address is as simple as:
2424

2525
Where @placemarks@ is an array of @SVPlacemark@ objects (see more about that below).
2626

27-
Additionally, you can use Google Geocoding API's @region@ and @bounds@ parameters to fine-tune your search:
27+
Additionally, you can use Google Geocoding API's @region@ parameter to fine-tune your search:
2828

2929
<pre>
3030
+ (SVGeocoder*)geocode:(NSString *)address bounds:(MKCoordinateRegion)bounds completion:(SVGeocoderCompletionHandler)block;
31-
+ (SVGeocoder*)geocode:(NSString *)address region:(NSString *)regionString completion:(SVGeocoderCompletionHandler)block;
31+
+ (SVGeocoder*)geocode:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block;
3232
</pre>
3333

3434
h3. Using the Reverse Geocoding API

SVGeocoder/SVGeocoder.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#import <Foundation/Foundation.h>
1212
#import <CoreLocation/CoreLocation.h>
13-
#import <MapKit/MapKit.h>
1413

1514
#import "SVPlacemark.h"
1615

@@ -28,14 +27,12 @@ typedef void (^SVGeocoderCompletionHandler)(NSArray *placemarks, NSHTTPURLRespon
2827
@interface SVGeocoder : NSOperation
2928

3029
+ (SVGeocoder*)geocode:(NSString *)address completion:(SVGeocoderCompletionHandler)block;
31-
+ (SVGeocoder*)geocode:(NSString *)address bounds:(MKCoordinateRegion)bounds completion:(SVGeocoderCompletionHandler)block;
32-
+ (SVGeocoder*)geocode:(NSString *)address region:(NSString *)regionString completion:(SVGeocoderCompletionHandler)block;
30+
+ (SVGeocoder*)geocode:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block;
3331

3432
+ (SVGeocoder*)reverseGeocode:(CLLocationCoordinate2D)coordinate completion:(SVGeocoderCompletionHandler)block;
3533

3634
- (SVGeocoder*)initWithAddress:(NSString *)address completion:(SVGeocoderCompletionHandler)block;
37-
- (SVGeocoder*)initWithAddress:(NSString *)address bounds:(MKCoordinateRegion)bounds completion:(SVGeocoderCompletionHandler)block;
38-
- (SVGeocoder*)initWithAddress:(NSString *)address region:(NSString *)regionString completion:(SVGeocoderCompletionHandler)block;
35+
- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block;
3936

4037
- (SVGeocoder*)initWithCoordinate:(CLLocationCoordinate2D)coordinate completion:(SVGeocoderCompletionHandler)block;
4138

SVGeocoder/SVGeocoder.m

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
//
1010

1111
#import "SVGeocoder.h"
12+
#import <MapKit/MapKit.h>
1213

1314
#define kSVGeocoderTimeoutInterval 20
1415

@@ -72,13 +73,7 @@ + (SVGeocoder *)geocode:(NSString *)address completion:(SVGeocoderCompletionHand
7273
return geocoder;
7374
}
7475

75-
+ (SVGeocoder *)geocode:(NSString *)address bounds:(MKCoordinateRegion)bounds completion:(SVGeocoderCompletionHandler)block {
76-
SVGeocoder *geocoder = [[self alloc] initWithAddress:address bounds:bounds completion:block];
77-
[geocoder start];
78-
return geocoder;
79-
}
80-
81-
+ (SVGeocoder *)geocode:(NSString *)address region:(NSString *)region completion:(SVGeocoderCompletionHandler)block {
76+
+ (SVGeocoder *)geocode:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block {
8277
SVGeocoder *geocoder = [[self alloc] initWithAddress:address region:region completion:block];
8378
[geocoder start];
8479
return geocoder;
@@ -108,23 +103,15 @@ - (SVGeocoder*)initWithAddress:(NSString*)address completion:(SVGeocoderCompleti
108103
}
109104

110105

111-
- (SVGeocoder*)initWithAddress:(NSString *)address bounds:(MKCoordinateRegion)region completion:(SVGeocoderCompletionHandler)block {
106+
- (SVGeocoder*)initWithAddress:(NSString *)address region:(CLRegion *)region completion:(SVGeocoderCompletionHandler)block {
107+
MKCoordinateRegion coordinateRegion = MKCoordinateRegionMakeWithDistance(region.center, region.radius, region.radius);
112108
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
113109
address, @"address",
114110
[NSString stringWithFormat:@"%f,%f|%f,%f",
115-
region.center.latitude-(region.span.latitudeDelta/2.0),
116-
region.center.longitude-(region.span.longitudeDelta/2.0),
117-
region.center.latitude+(region.span.latitudeDelta/2.0),
118-
region.center.longitude+(region.span.longitudeDelta/2.0)], @"bounds", nil];
119-
120-
return [self initWithParameters:parameters completion:block];
121-
}
122-
123-
124-
- (SVGeocoder*)initWithAddress:(NSString *)address region:(NSString *)regionString completion:(SVGeocoderCompletionHandler)block {
125-
NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithObjectsAndKeys:
126-
address, @"address",
127-
regionString, @"region", nil];
111+
coordinateRegion.center.latitude-(coordinateRegion.span.latitudeDelta/2.0),
112+
coordinateRegion.center.longitude-(coordinateRegion.span.longitudeDelta/2.0),
113+
coordinateRegion.center.latitude+(coordinateRegion.span.latitudeDelta/2.0),
114+
coordinateRegion.center.longitude+(coordinateRegion.span.longitudeDelta/2.0)], @"bounds", nil];
128115

129116
return [self initWithParameters:parameters completion:block];
130117
}

0 commit comments

Comments
 (0)