From dc8b2cc7ac7451739e3b2c2e32f02c366bab4506 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Wed, 3 Oct 2018 19:50:49 -0400 Subject: [ios] Ignore deprecation warnings for MGLMapView.userLocationVerticalAlignment --- platform/ios/src/MGLMapView.mm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 8fdd393e48..e9fd568a04 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -5254,10 +5254,15 @@ public: self.targetCoordinate, }; UIEdgeInsets inset = self.edgePaddingForFollowingWithCourse; + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" if (self.userLocationVerticalAlignment == MGLAnnotationVerticalAlignmentCenter) { inset.bottom = CGRectGetMaxY(self.bounds) - CGRectGetMidY(self.contentFrame); } +#pragma clang diagnostic pop + [self _setVisibleCoordinates:foci count:sizeof(foci) / sizeof(foci[0]) edgePadding:inset @@ -5317,10 +5322,13 @@ public: if (direction >= 0) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" if (self.userLocationVerticalAlignment == MGLAnnotationVerticalAlignmentTop) { direction += 180; } +#pragma clang diagnostic pop } } return direction; @@ -6012,7 +6020,9 @@ public: } CGPoint center = CGPointMake(CGRectGetMidX(contentFrame), CGRectGetMidY(contentFrame)); - + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" switch (self.userLocationVerticalAlignment) { case MGLAnnotationVerticalAlignmentCenter: break; @@ -6023,6 +6033,7 @@ public: center.y = CGRectGetMaxY(contentFrame); break; } +#pragma clang dianostic pop return center; } -- cgit v1.2.1