Move MGLStringFromSize() to MGLGeometry_Private.hupstream/friedbunny-adds-mglstringfromsize-inline

2 files changed, 14 insertions, 11 deletions

diff --git a/platform/darwin/src/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h
index adf9036baa..b91d4e0f81 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/MGLLoggingConfiguration_Private.h b/platform/darwin/src/MGLLoggingConfiguration_Private.h
index 5d2962f524..34e999ca72 100644
--- a/platform/darwin/src/MGLLoggingConfiguration_Private.h
+++ b/platform/darwin/src/MGLLoggingConfiguration_Private.h
@@ -4,13 +4,6 @@ NS_INLINE NSString *MGLStringFromBOOL(BOOL value) {
     return value ? @"YES" : @"NO";
 }
 
-#if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-NS_INLINE NSString *MGLStringFromSize(CGSize size) { return NSStringFromCGSize(size); }
-#else
-NS_INLINE NSString *MGLStringFromSize(NSSize size) { return NSStringFromSize(size); }
-#endif
-
 #ifdef MGL_LOGGING_DISABLED
 
 #define MGLLogInfo(...)