summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra <fabian.guerra@mapbox.com>2018-11-14 11:44:13 -0800
committerFabian Guerra <fabian.guerra@mapbox.com>2018-11-14 11:44:13 -0800
commitdd91bd451e3c28024e90e5150f1a3b24c3d7dafe (patch)
treee93565c0e26dc02310f758f4488341d62c44d7e1
parentd69e56c991a2ac0ad43abd2fbcec15abb8f7ac5c (diff)
downloadqtlocation-mapboxgl-dd91bd451e3c28024e90e5150f1a3b24c3d7dafe.tar.gz
[ios, macos] Rename NSStringFromCLLocationCoordinate2D to MGLStringFromCLLocationCoordinate2D.
-rw-r--r--platform/darwin/src/MGLGeometry_Private.h2
-rw-r--r--platform/darwin/src/MGLMapCamera.mm2
-rw-r--r--platform/ios/src/MGLMapView.mm10
3 files changed, 7 insertions, 7 deletions
diff --git a/platform/darwin/src/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h
index ae1b2c2fba..adf9036baa 100644
--- a/platform/darwin/src/MGLGeometry_Private.h
+++ b/platform/darwin/src/MGLGeometry_Private.h
@@ -19,7 +19,7 @@ typedef struct MGLRadianCoordinate2D {
MGLLocationRadians longitude;
} MGLRadianCoordinate2D;
-NS_INLINE NSString *NSStringFromCLLocationCoordinate2D(CLLocationCoordinate2D coordinate) {
+NS_INLINE NSString *MGLStringFromCLLocationCoordinate2D(CLLocationCoordinate2D coordinate) {
return [NSString stringWithFormat:@"(lat: %f, lon: %f)", coordinate.latitude, coordinate.longitude];
}
diff --git a/platform/darwin/src/MGLMapCamera.mm b/platform/darwin/src/MGLMapCamera.mm
index c124c8f463..0f5dd558a8 100644
--- a/platform/darwin/src/MGLMapCamera.mm
+++ b/platform/darwin/src/MGLMapCamera.mm
@@ -92,7 +92,7 @@ BOOL MGLEqualFloatWithAccuracy(CGFloat left, CGFloat right, CGFloat accuracy)
pitch:(CGFloat)pitch
heading:(CLLocationDirection)heading
{
- MGLLogDebug(@"Initializing withCenterCoordinate: %@ altitude: %.0fm pitch: %f° heading: %f°", NSStringFromCLLocationCoordinate2D(centerCoordinate), altitude, pitch, heading);
+ MGLLogDebug(@"Initializing withCenterCoordinate: %@ altitude: %.0fm pitch: %f° heading: %f°", MGLStringFromCLLocationCoordinate2D(centerCoordinate), altitude, pitch, heading);
if (self = [super init])
{
_centerCoordinate = centerCoordinate;
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 43a33ce493..a20936fda8 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -2999,13 +2999,13 @@ public:
- (void)setCenterCoordinate:(CLLocationCoordinate2D)coordinate animated:(BOOL)animated
{
- MGLLogDebug(@"Setting centerCoordinate: %@ animated: %@", NSStringFromCLLocationCoordinate2D(coordinate), MGLStringFromBOOL(animated));
+ MGLLogDebug(@"Setting centerCoordinate: %@ animated: %@", MGLStringFromCLLocationCoordinate2D(coordinate), MGLStringFromBOOL(animated));
[self setCenterCoordinate:coordinate zoomLevel:self.zoomLevel animated:animated];
}
- (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate
{
- MGLLogDebug(@"Setting centerCoordinate: %@", NSStringFromCLLocationCoordinate2D(centerCoordinate));
+ MGLLogDebug(@"Setting centerCoordinate: %@", MGLStringFromCLLocationCoordinate2D(centerCoordinate));
[self setCenterCoordinate:centerCoordinate animated:NO];
}
@@ -3018,7 +3018,7 @@ public:
- (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(double)zoomLevel animated:(BOOL)animated
{
MGLLogDebug(@"Setting centerCoordinate: %@ zoomLevel: %f animated: %@",
- NSStringFromCLLocationCoordinate2D(centerCoordinate),
+ MGLStringFromCLLocationCoordinate2D(centerCoordinate),
zoomLevel,
MGLStringFromBOOL(animated));
[self setCenterCoordinate:centerCoordinate zoomLevel:zoomLevel direction:self.direction animated:animated];
@@ -3027,7 +3027,7 @@ public:
- (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(double)zoomLevel direction:(CLLocationDirection)direction animated:(BOOL)animated
{
MGLLogDebug(@"Setting centerCoordinate: %@ zoomLevel: %f direction: %f animated: %@",
- NSStringFromCLLocationCoordinate2D(centerCoordinate),
+ MGLStringFromCLLocationCoordinate2D(centerCoordinate),
zoomLevel,
direction,
MGLStringFromBOOL(animated));
@@ -3037,7 +3037,7 @@ public:
- (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(double)zoomLevel direction:(CLLocationDirection)direction animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion
{
MGLLogDebug(@"Setting centerCoordinate: %@ zoomLevel: %f direction: %f animated: %@ completionHandler: %@",
- NSStringFromCLLocationCoordinate2D(centerCoordinate),
+ MGLStringFromCLLocationCoordinate2D(centerCoordinate),
zoomLevel,
direction,
MGLStringFromBOOL(animated),