From fc1f744fbb210bd30b03a159952b0149d86797e9 Mon Sep 17 00:00:00 2001
From: Jason Wray <jason@mapbox.com>
Date: Tue, 27 Nov 2018 15:44:00 -0500
Subject: [PATCH] [darwin] Add platform-agnostic MGLStringFromSize() method

---
 platform/darwin/src/MGLGeometry_Private.h | 18 ++++++++++++++----
 platform/darwin/src/MGLMapSnapshotter.mm  | 13 ++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/platform/darwin/src/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h
index adf9036ba..b91d4e0f8 100644
--- a/platform/darwin/src/MGLGeometry_Private.h
+++ b/platform/darwin/src/MGLGeometry_Private.h
@@ -19,10 +19,6 @@ typedef struct MGLRadianCoordinate2D {
     MGLLocationRadians longitude;
 } MGLRadianCoordinate2D;
 
-NS_INLINE NSString *MGLStringFromCLLocationCoordinate2D(CLLocationCoordinate2D coordinate) {
-    return [NSString stringWithFormat:@"(lat: %f, lon: %f)", coordinate.latitude, coordinate.longitude];
-}
-
 /**
  Creates a new `MGLRadianCoordinate2D` from the given latitudinal and longitudinal.
  */
@@ -37,6 +33,20 @@ NS_INLINE MGLRadianCoordinate2D MGLRadianCoordinate2DMake(MGLLocationRadians lat
 /// the given point.
 CGRect MGLExtendRect(CGRect rect, CGPoint point);
 
+#if TARGET_OS_IPHONE
+NS_INLINE NSString *MGLStringFromSize(CGSize size) {
+    return NSStringFromCGSize(size);
+}
+#else
+NS_INLINE NSString *MGLStringFromSize(NSSize size) {
+    return NSStringFromSize(size);
+}
+#endif
+
+NS_INLINE NSString *MGLStringFromCLLocationCoordinate2D(CLLocationCoordinate2D coordinate) {
+    return [NSString stringWithFormat:@"(lat: %f, lon: %f)", coordinate.latitude, coordinate.longitude];
+}
+
 mbgl::LatLng MGLLatLngFromLocationCoordinate2D(CLLocationCoordinate2D coordinate);
 
 NS_INLINE mbgl::Point<double> MGLPointFromLocationCoordinate2D(CLLocationCoordinate2D coordinate) {
diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm
index 3d2a2525b..65937fde6 100644
--- a/platform/darwin/src/MGLMapSnapshotter.mm
+++ b/platform/darwin/src/MGLMapSnapshotter.mm
@@ -31,16 +31,12 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64;
 
 @implementation MGLMapSnapshotOptions
 
-- (instancetype _Nonnull)initWithStyleURL:(nullable NSURL *)styleURL camera:(MGLMapCamera *)camera size:(CGSize) size
+- (instancetype _Nonnull)initWithStyleURL:(nullable NSURL *)styleURL camera:(MGLMapCamera *)camera size:(CGSize)size
 {
-#if TARGET_OS_IPHONE
-    NSString *sizeString = NSStringFromCGSize(size);
-#else
-    NSString *sizeString = NSStringFromSize(size);
-#endif
-    MGLLogDebug(@"Initializing withStyleURL: %@ camera: %@ size: %@", styleURL, camera, sizeString);
+    MGLLogDebug(@"Initializing withStyleURL: %@ camera: %@ size: %@", styleURL, camera, MGLStringFromSize(size));
     self = [super init];
-    if (self) {
+    if (self)
+    {
         if ( !styleURL)
         {
             styleURL = [MGLStyle streetsStyleURLWithVersion:MGLStyleDefaultVersion];
@@ -53,7 +49,6 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64;
 #else
         _scale = [NSScreen mainScreen].backingScaleFactor;
 #endif
-        
     }
     return self;
 }