From 94f8176b60cef13c6d019acc4283299b58c618f1 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Thu, 21 Apr 2016 19:49:19 +0300 Subject: [PATCH] Returned double instead of GFLoat. --- api/MapsWithMeAPI.h | 10 +++++----- api/MapsWithMeAPI.m | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/MapsWithMeAPI.h b/api/MapsWithMeAPI.h index 6a6cf3b..10c830b 100644 --- a/api/MapsWithMeAPI.h +++ b/api/MapsWithMeAPI.h @@ -35,17 +35,17 @@ // Wrapper for a pin on a map @interface MWMPin : NSObject /// [required] pin latitude -@property (nonatomic) CGFloat lat; +@property (nonatomic) double lat; /// [required] pin longitude -@property (nonatomic) CGFloat lon; +@property (nonatomic) double lon; /// [optional] pin title @property (nullable, copy, nonatomic) NSString * title; /// [optional] passed back to the app when pin is clicked, OR, if it's a valid url, /// it will be opened from MapsWithMe after selecting "More Details..." for the pin @property (nullable, copy, nonatomic) NSString * idOrUrl; -- (nullable instancetype)initWithLat:(CGFloat)lat - lon:(CGFloat)lon +- (nullable instancetype)initWithLat:(double)lat + lon:(double)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl; @@ -65,7 +65,7 @@ + (BOOL)showMap; /// Displays given point on a map, title and id are optional. /// If id contains valid url, it will be opened from MapsWithMe after selecting "More Details..." for the pin -+ (BOOL)showLat:(CGFloat)lat lon:(CGFloat)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl; ++ (BOOL)showLat:(double)lat lon:(double)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl; /// The same as above but using pin wrapper + (BOOL)showPin:(nullable MWMPin *)pin; /// Displays any number of pins diff --git a/api/MapsWithMeAPI.m b/api/MapsWithMeAPI.m index ea168bb..371aac9 100644 --- a/api/MapsWithMeAPI.m +++ b/api/MapsWithMeAPI.m @@ -46,8 +46,8 @@ static BOOL kOpenUrlOnBalloonClick = NO; return self; } -- (nullable instancetype)initWithLat:(CGFloat)lat - lon:(CGFloat)lon +- (nullable instancetype)initWithLat:(double)lat + lon:(double)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl { @@ -169,7 +169,7 @@ static NSString * const mapsWithMeIsNotInstalledPage = return [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[kMWMUrlScheme stringByAppendingFormat:@"map?v=%f", MAPSWITHME_API_VERSION]]]; } -+ (BOOL)showLat:(CGFloat)lat lon:(CGFloat)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl ++ (BOOL)showLat:(double)lat lon:(double)lon title:(nullable NSString *)title idOrUrl:(nullable NSString *)idOrUrl { MWMPin * pin = [[MWMPin alloc] initWithLat:lat lon:lon title:title idOrUrl:idOrUrl]; return [MWMApi showPin:pin];