diff options
author | Jason Wray <jason@mapbox.com> | 2018-11-27 15:44:00 -0500 |
---|---|---|
committer | Jason Wray <friedbunny@users.noreply.github.com> | 2018-11-28 14:02:19 -0500 |
commit | fc1f744fbb210bd30b03a159952b0149d86797e9 (patch) | |
tree | 916c5a501f42dfb9ae9595bdb8cceb36dc512577 /platform/darwin/src/MGLGeometry_Private.h | |
parent | dfeadc05e4909b8db7254b86ccbb68dc38dfc6d7 (diff) | |
download | qtlocation-mapboxgl-fc1f744fbb210bd30b03a159952b0149d86797e9.tar.gz |
[darwin] Add platform-agnostic MGLStringFromSize() method
Diffstat (limited to 'platform/darwin/src/MGLGeometry_Private.h')
-rw-r--r-- | platform/darwin/src/MGLGeometry_Private.h | 18 |
1 files changed, 14 insertions, 4 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) { |