summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-10-09 15:59:07 -0700
committerAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-10-09 16:05:04 -0700
commit88f69ffd1678db195d262e1f9ba9c26b99e49c0c (patch)
tree5f2cfe5e13b2fe7b26d60b98e1caa0d65f25f2fb
parent9e79659007131450cde7e6e1a361f8ba3321fe98 (diff)
downloadqtlocation-mapboxgl-88f69ffd1678db195d262e1f9ba9c26b99e49c0c.tar.gz
[ios][macos] Use CLLocationDegrees for direction parameter in -[MGLMapView cameraThatFitsShape:shape direction: edgePadding:]upstream/use-cllocationdegress
-rw-r--r--platform/ios/src/MGLMapView.h2
-rw-r--r--platform/ios/src/MGLMapView.mm2
-rw-r--r--platform/macos/src/MGLMapView.h2
-rw-r--r--platform/macos/src/MGLMapView.mm2
4 files changed, 4 insertions, 4 deletions
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index 843fb3d280..3e1b877f25 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -901,7 +901,7 @@ MGL_EXPORT IB_DESIGNABLE
(close to the ground) as possible while still including the entire shape. The
camera object uses the current pitch.
*/
-- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(double)direction edgePadding:(UIEdgeInsets)insets;
+- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(CLLocationDegrees)direction edgePadding:(UIEdgeInsets)insets;
/**
Returns the point in this view’s coordinate system on which to "anchor" in
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index cc6c6bde6d..5b24164a6d 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -3012,7 +3012,7 @@ public:
return [self cameraForCameraOptions:cameraOptions];
}
-- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(double)direction edgePadding:(UIEdgeInsets)insets {
+- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(CLLocationDegrees)direction edgePadding:(UIEdgeInsets)insets {
mbgl::EdgeInsets padding = MGLEdgeInsetsFromNSEdgeInsets(insets);
padding += MGLEdgeInsetsFromNSEdgeInsets(self.contentInset);
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
index 242f3f1e13..bfb1b721f2 100644
--- a/platform/macos/src/MGLMapView.h
+++ b/platform/macos/src/MGLMapView.h
@@ -487,7 +487,7 @@ MGL_EXPORT IB_DESIGNABLE
(close to the ground) as possible while still including the entire shape. The
camera object uses the current pitch.
*/
-- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(double)direction edgePadding:(NSEdgeInsets)insets;
+- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(CLLocationDegrees)direction edgePadding:(NSEdgeInsets)insets;
/**
A Boolean value indicating whether the receiver automatically adjusts its
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 2966f378a0..727a3a3fae 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -1272,7 +1272,7 @@ public:
return [self cameraForCameraOptions:cameraOptions];
}
-- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(double)direction edgePadding:(NSEdgeInsets)insets {
+- (MGLMapCamera *)cameraThatFitsShape:(MGLShape *)shape direction:(CLLocationDegrees)direction edgePadding:(NSEdgeInsets)insets {
mbgl::EdgeInsets padding = MGLEdgeInsetsFromNSEdgeInsets(insets);
padding += MGLEdgeInsetsFromNSEdgeInsets(self.contentInsets);