From c9885954a2d6b4a9b94a46a1dd66208eff2dbe1c Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Fri, 5 Jun 2015 17:41:00 -0700 Subject: [PATCH] Fixup ListFeatures demo --- objective-c/route_guide/ViewControllers.m | 26 +++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/objective-c/route_guide/ViewControllers.m b/objective-c/route_guide/ViewControllers.m index efcb2e7158f..93cb2bf963f 100644 --- a/objective-c/route_guide/ViewControllers.m +++ b/objective-c/route_guide/ViewControllers.m @@ -36,6 +36,20 @@ static NSString * const kHostAddress = @"http://localhost:50051"; +// Category to override RTGPoint's description. +@interface RTGPoint (Description) +- (NSString *)description; +@end + +@implementation RTGPoint (Description) +- (NSString *)description { + NSString *verticalDirection = self.latitude >= 0 ? @"N" : @"S"; + NSString *horizontalDirection = self.longitude >= 0 ? @"E" : @"W"; + return [NSString stringWithFormat:@"%.02f%@ %.02f%@", + abs(self.latitude) / 1E7f, verticalDirection, + abs(self.longitude) / 1E7f, horizontalDirection]; +} +@end #pragma mark Get Feature @@ -89,15 +103,15 @@ static NSString * const kHostAddress = @"http://localhost:50051"; RTGRouteGuide *client = [[RTGRouteGuide alloc] initWithHost:kHostAddress]; RTGRectangle *rectangle = [RTGRectangle message]; - rectangle.lo.latitude = 40E7; - rectangle.lo.longitude = -75E7; - rectangle.hi.latitude = 42E7; - rectangle.hi.longitude = -73E7; + rectangle.lo.latitude = 405E6; + rectangle.lo.longitude = -750E6; + rectangle.hi.latitude = 410E6; + rectangle.hi.longitude = -745E6; - NSLog(@"Looking for features between 40, -75 and 42, -73"); + NSLog(@"Looking for features between %@ and %@", rectangle.lo, rectangle.hi); [client listFeaturesWithRequest:rectangle handler:^(BOOL done, RTGFeature *response, NSError *error) { if (response) { - NSLog(@"Found feature called %@ at %@.", response.name, response.location); + NSLog(@"Found feature at %@ called %@.", response.location, response.name); } else if (error) { NSLog(@"RPC error: %@", error); }