replace location with coordinate

maxsokolov · Nov 27, 2014 · 938bf5d · 938bf5d
1 parent 0338b4b
commit 938bf5d
Show file tree

Hide file tree

Showing 25 changed files with 49 additions and 45 deletions.
diff --git a/GoogleKit.podspec b/GoogleKit.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name                  = "GoogleKit"
-  s.version               = "0.3"
+  s.version               = "0.3.1"
   s.summary               = "An objective-c wrapper around the various Google API's"
   s.homepage              = "https://github.com/maxsokolov/GoogleKit"
   s.license               = { :type => "MIT", :file => "LICENSE" }
   s.authors               = { "Max Sokolov" => "[email protected]" }
   s.social_media_url      = "https://twitter.com/max_sokolov"
   s.platform              = :ios, "7.0"
-  s.source                = { :git => "https://github.com/maxsokolov/GoogleKit.git", :tag => "0.3" }
+  s.source                = { :git => "https://github.com/maxsokolov/GoogleKit.git", :tag => "0.3.1" }
   s.source_files          = "GoogleKit"
   s.requires_arc          = true
 end
diff --git a/GoogleKit/GKGeocoderPlace.h b/GoogleKit/GKGeocoderPlace.h
@@ -51,6 +51,6 @@
 @property (nonatomic, strong, readonly) NSString *streetNumber;
 @property (nonatomic, strong, readonly) NSString *floor;
 @property (nonatomic, strong, readonly) NSString *room;
-@property (nonatomic, strong, readonly) CLLocation *location;
+@property (nonatomic, assign, readonly) CLLocationCoordinate2D coordinate;
 
 @end
diff --git a/GoogleKit/GKGeocoderPlace.m b/GoogleKit/GKGeocoderPlace.m
@@ -132,7 +132,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
         CGFloat lat = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lat"] floatValue];
         CGFloat lng = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lng"] floatValue];
 
-        _location = [[CLLocation alloc] initWithLatitude:lat longitude:lng];
+        _coordinate = CLLocationCoordinate2DMake(lat, lng);
     }
     return self;
 }

diff --git a/GoogleKit/GKGeocoderQuery.h b/GoogleKit/GKGeocoderQuery.h
@@ -36,7 +36,7 @@
 //@property (nonatomic, strong) NSArray *bounds;
 
 // Reverse Geocoding (Address Lookup)
-@property (nonatomic, assign) CLLocationCoordinate2D location;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, strong) NSArray *locationType;
 @property (nonatomic, strong) NSArray *resultType;
 @property (nonatomic, strong) NSString *postalCode;

diff --git a/GoogleKit/GKGeocoderQuery.m b/GoogleKit/GKGeocoderQuery.m
@@ -35,7 +35,7 @@ - (id)init {
     self = [super init];
     if (self) {
 
-        self.location = kCLLocationCoordinate2DInvalid;
+        self.coordinate = kCLLocationCoordinate2DInvalid;
     }
     return self;
 }
@@ -48,8 +48,8 @@ - (NSURL *)queryURL {
 
     if (self.isReverseGeocoding) {
 
-        if (CLLocationCoordinate2DIsValid(self.location)) {
-            [url appendFormat:@"&latlng=%f,%f", self.location.latitude, self.location.longitude];
+        if (CLLocationCoordinate2DIsValid(self.coordinate)) {
+            [url appendFormat:@"&latlng=%f,%f", self.coordinate.latitude, self.coordinate.longitude];
         }
         if (self.resultType && self.resultType.count > 0) {
             [url appendFormat:@"&result_type=%@", [self.resultType componentsJoinedByString:@"|"]];

diff --git a/GoogleKit/GKPlace.h b/GoogleKit/GKPlace.h
@@ -27,7 +27,7 @@
 @interface GKPlace : GKObject
 
 @property (nonatomic, strong, readonly) NSString *formattedAddress;
-@property (nonatomic, strong, readonly) CLLocation *location;
+@property (nonatomic, assign, readonly) CLLocationCoordinate2D coordinate;
 @property (nonatomic, strong, readonly) NSString *icon;
 @property (nonatomic, strong, readonly) NSString *name;
 @property (nonatomic, assign, readonly) CGFloat rating;

diff --git a/GoogleKit/GKPlace.m b/GoogleKit/GKPlace.m
@@ -32,7 +32,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
         CGFloat lat = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lat"] floatValue];
         CGFloat lng = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lng"] floatValue];
 
-        _location = [[CLLocation alloc] initWithLatitude:lat longitude:lng];
+        _coordinate = CLLocationCoordinate2DMake(lat, lng);
 
         _icon = [dictionary objectForKey:@"icon"];
         _name = [dictionary objectForKey:@"name"];

diff --git a/GoogleKit/GKPlaceAutocompleteQuery.h b/GoogleKit/GKPlaceAutocompleteQuery.h
@@ -30,7 +30,7 @@
 @property (nonatomic, strong) NSString *input;
 @property (nonatomic, assign) NSUInteger offset;
 @property (nonatomic, assign) NSUInteger radius;
-@property (nonatomic, assign) CLLocationCoordinate2D location;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 
 /*
  * Description

diff --git a/GoogleKit/GKPlaceAutocompleteQuery.m b/GoogleKit/GKPlaceAutocompleteQuery.m
@@ -37,7 +37,7 @@ - (id)init {
 
         self.radius = 10000.0f;
         self.offset = 0;
-        self.location = kCLLocationCoordinate2DInvalid;
+        self.coordinate = kCLLocationCoordinate2DInvalid;
     }
     return self;
 }
@@ -60,8 +60,8 @@ - (NSURL *)queryURL {
     if (self.offset != 0) {
         [url appendFormat:@"&offset=%@", @(self.offset)];
     }
-    if (self.location.latitude != -1) {
-        [url appendFormat:@"&location=%f,%f", self.location.latitude, self.location.longitude];
+    if (self.coordinate.latitude != -1) {
+        [url appendFormat:@"&location=%f,%f", self.coordinate.latitude, self.coordinate.longitude];
     }
     if (self.radius != 0) {
         [url appendFormat:@"&radius=%@", @(self.radius)];

diff --git a/GoogleKit/GKPlaceDetails.h b/GoogleKit/GKPlaceDetails.h
@@ -44,6 +44,6 @@
 @property (nonatomic, strong, readonly) NSURL *url;
 @property (nonatomic, strong, readonly) NSURL *website;
 @property (nonatomic, assign, readonly) CGFloat rating;
-@property (nonatomic, strong, readonly) CLLocation *location;
+@property (nonatomic, assign, readonly) CLLocationCoordinate2D coordinate;
 
 @end
diff --git a/GoogleKit/GKPlaceDetails.m b/GoogleKit/GKPlaceDetails.m
@@ -68,7 +68,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
 
         CGFloat lat = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lat"] floatValue];
         CGFloat lng = [[[[dictionary objectForKey:@"geometry"] objectForKey:@"location"] objectForKey:@"lng"] floatValue];
-        _location = [[CLLocation alloc] initWithLatitude:lat longitude:lng];
+        _coordinate = CLLocationCoordinate2DMake(lat, lng);
 
         _icon = [dictionary objectForKey:@"icon"];
         _name = [dictionary objectForKey:@"name"];

diff --git a/GoogleKit/GKPlacesNearbySearchQuery.h b/GoogleKit/GKPlacesNearbySearchQuery.h
@@ -30,7 +30,7 @@ typedef void (^GKPlacesNearbySearchQueryCompletionBlock)(NSArray *results, NSStr
 @interface GKPlacesNearbySearchQuery : GKQuery
 
 // required parameters
-@property (nonatomic, assign) CLLocationCoordinate2D location;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) NSUInteger radius;
 
 // optional parameters

diff --git a/GoogleKit/GKPlacesNearbySearchQuery.m b/GoogleKit/GKPlacesNearbySearchQuery.m
@@ -39,7 +39,7 @@ - (id)init {
         self.maxprice = -1;
         self.radius = -1;
         self.rankByDistance = NO;
-        self.location = kCLLocationCoordinate2DInvalid;
+        self.coordinate = kCLLocationCoordinate2DInvalid;
     }
     return self;
 }
@@ -56,8 +56,8 @@ - (NSURL *)queryURL {
         return [NSURL URLWithString:url];
     }
 
-    if (CLLocationCoordinate2DIsValid(self.location)) {
-        [url appendFormat:@"&location=%f,%f", self.location.latitude, self.location.longitude];
+    if (CLLocationCoordinate2DIsValid(self.coordinate)) {
+        [url appendFormat:@"&location=%f,%f", self.coordinate.latitude, self.coordinate.longitude];
     }
     if (self.rankByDistance) {
         [url appendString:@"&rankby=distance"];

diff --git a/GoogleKit/GKPlacesRadarSearchQuery.h b/GoogleKit/GKPlacesRadarSearchQuery.h
@@ -30,7 +30,7 @@ typedef void (^GKPlacesRadarSearchQueryCompletionBlock)(NSArray *results, NSErro
 @interface GKPlacesRadarSearchQuery : GKQuery
 
 // required parameters
-@property (nonatomic, assign) CLLocationCoordinate2D location;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) NSUInteger radius;
 
 // optional parameters

diff --git a/GoogleKit/GKPlacesRadarSearchQuery.m b/GoogleKit/GKPlacesRadarSearchQuery.m
@@ -38,7 +38,7 @@ - (id)init {
         self.minprice = -1;
         self.maxprice = -1;
         self.radius = -1;
-        self.location = kCLLocationCoordinate2DInvalid;
+        self.coordinate = kCLLocationCoordinate2DInvalid;
     }
     return self;
 }
@@ -49,8 +49,8 @@ - (NSURL *)queryURL {
 
     NSMutableString *url = [NSMutableString stringWithFormat:kGKPlacesRadarSearchQueryURL, self.key];
 
-    if (CLLocationCoordinate2DIsValid(self.location)) {
-        [url appendFormat:@"&location=%f,%f", self.location.latitude, self.location.longitude];
+    if (CLLocationCoordinate2DIsValid(self.coordinate)) {
+        [url appendFormat:@"&location=%f,%f", self.coordinate.latitude, self.coordinate.longitude];
     }
     if (self.radius != -1) {
         [url appendFormat:@"&radius=%@", @(self.radius)];

diff --git a/GoogleKit/GKPlacesTextSearchQuery.h b/GoogleKit/GKPlacesTextSearchQuery.h
@@ -33,7 +33,7 @@ typedef void (^GKPlacesTextSearchQueryCompletionBlock)(NSArray *results, NSError
 @property (nonatomic, strong) NSString *text; // becomes "query" param in request url
 
 // optional parameters
-@property (nonatomic, assign) CLLocationCoordinate2D location;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) NSUInteger radius;
 @property (nonatomic, assign) NSUInteger minprice; // 0...4
 @property (nonatomic, assign) NSUInteger maxprice; // 0...4

diff --git a/GoogleKit/GKPlacesTextSearchQuery.m b/GoogleKit/GKPlacesTextSearchQuery.m
@@ -32,7 +32,7 @@ - (id)init {
         self.minprice = -1;
         self.maxprice = -1;
         self.radius = -1;
-        self.location = kCLLocationCoordinate2DInvalid;
+        self.coordinate = kCLLocationCoordinate2DInvalid;
     }
     return self;
 }
@@ -46,8 +46,8 @@ - (NSURL *)queryURL {
     if (self.text) {
         [url appendFormat:@"&query=%@", [self.text stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
     }
-    if (CLLocationCoordinate2DIsValid(self.location)) {
-        [url appendFormat:@"&location=%f,%f", self.location.latitude, self.location.longitude];
+    if (CLLocationCoordinate2DIsValid(self.coordinate)) {
+        [url appendFormat:@"&location=%f,%f", self.coordinate.latitude, self.coordinate.longitude];
     }
     if (self.radius != -1) {
         [url appendFormat:@"&radius=%@", @(self.radius)];

diff --git a/...proj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/GoogleKitDemo/GoogleKitDemo/GKAutocompleteViewController.m b/GoogleKitDemo/GoogleKitDemo/GKAutocompleteViewController.m
@@ -43,7 +43,7 @@ - (void)textFieldDidChange:(UITextField *)textField {
 
     GKPlaceAutocompleteQuery *query = [GKPlaceAutocompleteQuery query];
     query.input = textField.text;
-    query.location = CLLocationCoordinate2DMake(55.738407f, 37.612306f); // New York City
+    query.coordinate = CLLocationCoordinate2DMake(55.738407f, 37.612306f); // New York City
     query.types = @[ @"geocode" ];
     query.radius = 10000;
     [query fetchPlaces:^(NSArray *results, NSError *error) {

diff --git a/GoogleKitDemo/GoogleKitDemo/GKMapGeocoderViewController.m b/GoogleKitDemo/GoogleKitDemo/GKMapGeocoderViewController.m
@@ -74,7 +74,7 @@ - (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated {
     CLLocationCoordinate2D coord = [mapView convertPoint:self.view.center toCoordinateFromView:self.view];
 
     GKGeocoderQuery *query = [GKGeocoderQuery query];
-    query.location = coord;
+    query.coordinate = coord;
     query.language = @"en";
     [query lookupAddress:^(NSArray *result, NSError *error) {
 

diff --git a/GoogleKitDemo/GoogleKitDemo/GKNearbySearchViewController.m b/GoogleKitDemo/GoogleKitDemo/GKNearbySearchViewController.m
@@ -53,7 +53,7 @@ - (void)loadPlaces {
     query.radius = 3000;
     query.types = @[ @"library" ];
     query.rankByDistance = NO;
-    query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
+    query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
     query.nextPageToken = self.nextPageToken;
 
     [query searchPlaces:^(NSArray *results, NSString *nextPageToken, NSError *error) {
@@ -69,7 +69,7 @@ - (void)buildAnnotations:(NSArray *)places {
 
     for (GKPlace *place in places) {
 
-        GKMapAnnotation *annotation = [[GKMapAnnotation alloc] initWithCoordinate:place.location.coordinate placeId:place.placeId];
+        GKMapAnnotation *annotation = [[GKMapAnnotation alloc] initWithCoordinate:place.coordinate placeId:place.placeId];
         [self.mapView addAnnotation:annotation];
     }
 }

diff --git a/GoogleKitDemo/GoogleKitDemo/GKRootViewController.m b/GoogleKitDemo/GoogleKitDemo/GKRootViewController.m
@@ -36,7 +36,7 @@ - (void)viewDidLoad {
 
     [GKQuery provideAPIKey:GOOGLE_API_KEY];
     [GKQuery loggingEnabled:YES];
-    
+
     self.dataSource = @[@"Geocoder", @"Autocomplete places", @"Nearby Search & Place Details", @"Text search"];
 
     [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];

diff --git a/...proj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/GoogleKitTests/GoogleKitTests/GoogleKitTests.m b/GoogleKitTests/GoogleKitTests/GoogleKitTests.m
@@ -70,7 +70,7 @@ - (void)testLocationGeocoder {
 
     GKGeocoderQuery *query = [GKGeocoderQuery query];
     query.key = kGoogleKitKey;
-    query.location = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
+    query.coordinate = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
     query.language = @"en";
     query.resultType = @[ @"street_address" ];
     query.locationType = @[ @"ROOFTOP" ];
@@ -92,7 +92,7 @@ - (void)testNearbySearch {
 
     GKPlacesNearbySearchQuery *query = [GKPlacesNearbySearchQuery query];
     query.key = kGoogleKitKey;
-    query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
+    query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
     query.rankByDistance = NO;
     query.radius = 3000;
     query.language = @"en";
@@ -122,7 +122,7 @@ - (void)testTextSearch {
     query.key = kGoogleKitKey;
     query.text = @"library";
     query.language = @"en";
-    query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
+    query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
     query.radius = 3000;
     query.minprice = 0;
     query.maxprice = 4;
@@ -146,7 +146,7 @@ - (void)testRadarSearch {
 
     GKPlacesRadarSearchQuery *query = [GKPlacesRadarSearchQuery query];
     query.key = kGoogleKitKey;
-    query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
+    query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
     query.radius = 3000;
     query.language = @"en";
     query.keyword = @"library";
@@ -174,7 +174,7 @@ - (void)testPlaceAutocomplete {
     GKPlaceAutocompleteQuery *query = [GKPlaceAutocompleteQuery query];
     query.key = kGoogleKitKey;
     query.input = @"wall street";
-    query.location = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
+    query.coordinate = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
     query.types = @[ @"geocode" ];
     query.components = @[ @"country:us" ];
     query.radius = 10000;
@@ -199,7 +199,7 @@ - (void)testPlaceDetails {
     GKPlaceAutocompleteQuery *query = [GKPlaceAutocompleteQuery query];
     query.key = kGoogleKitKey;
     query.input = @"wall street";
-    query.location = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
+    query.coordinate = CLLocationCoordinate2DMake(55.738407f, 37.612306f);
     query.types = @[ @"geocode" ];
     query.components = @[ @"country:us" ];
     query.radius = 10000;
@@ -208,6 +208,10 @@ - (void)testPlaceDetails {
     [query fetchPlaces:^(NSArray *results, NSError *error) {
 
         GKPlaceAutocomplete *place = [results firstObject];
+
+        XCTAssertNil(error);
+        XCTAssertTrue(results.count > 0);
+        XCTAssertTrue([place isKindOfClass:[GKPlaceAutocomplete class]]);
 
         GKPlaceDetailsQuery *query = [GKPlaceDetailsQuery query];
         query.key = kGoogleKitKey;

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Supports iOS 7 and higher. ARC is required.
 
 GoogleKit is available via CocoaPods. Simply add the following line to your Podfile:
 
-	pod "GoogleKit", "0.3"
+	pod "GoogleKit", "~> 0.3"
 
 ## Usage
 
@@ -73,7 +73,7 @@ GKGeocoderQuery *query = [GKGeocoderQuery query];
 
 // required parameters
 query.key = @"key";
-query.location = CLLocationCoordinate2DMake(0.0f, 0.0f);
+query.coordinate = CLLocationCoordinate2DMake(0.0f, 0.0f);
 
 // optional parameters
 query.language = @"en";
@@ -100,7 +100,7 @@ query.key = @"key";
 query.input = @"wall street";
 
 // optional parameters
-query.location = CLLocationCoordinate2DMake(55.738407f, 37.612306f); // New York City
+query.coordinate = CLLocationCoordinate2DMake(55.738407f, 37.612306f); // New York City
 query.types = @[ @"geocode" ];
 query.components = @[ @"country:us" ];
 query.radius = 10000;
@@ -123,7 +123,7 @@ GKPlacesNearbySearchQuery *query = [GKPlacesNearbySearchQuery query];
 
 // required parameters
 query.key = @"key";
-query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
+query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
 query.rankByDistance = NO; // if rankByDistance sets to YES radius will be ignored
 query.radius = 3000;
 
@@ -157,7 +157,7 @@ query.text = @"pizza in New York";
 
 // optional parameters
 query.language = @"en";
-query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
+query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f);
 query.radius = 3000;
 query.minprice = 0;
 query.maxprice = 4;
@@ -180,7 +180,7 @@ GKPlacesRadarSearchQuery *query = [GKPlacesRadarSearchQuery query];
 
 // required parameters
 query.key = @"key";
-query.location = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
+query.coordinate = CLLocationCoordinate2DMake(40.71448f, -74.00598f); // New York City
 query.radius = 3000;
 
 // optional parameters