summaryrefslogtreecommitdiff
path: root/platform/ios/src/MGLAnnotationView.mm
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-07-02 18:41:11 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-07-02 18:41:11 -0700
commitf2fdc23ec7b39d1ee6c9e4b37ad4952e4a5f5447 (patch)
treebade627480750c3b775e44e1dcbd3313dfef2e07 /platform/ios/src/MGLAnnotationView.mm
parent1f026c624668298c5736a8ba4ef480de8bab425a (diff)
downloadqtlocation-mapboxgl-f2fdc23ec7b39d1ee6c9e4b37ad4952e4a5f5447.tar.gz
[ios] Removed MGLAnnotationView.flat
Removed MGLAnnotationView’s option to lie flat against a tilted map to work around #5090.
Diffstat (limited to 'platform/ios/src/MGLAnnotationView.mm')
-rw-r--r--platform/ios/src/MGLAnnotationView.mm13
1 files changed, 1 insertions, 12 deletions
diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm
index 3bbe2fcc84..656b1c0f3e 100644
--- a/platform/ios/src/MGLAnnotationView.mm
+++ b/platform/ios/src/MGLAnnotationView.mm
@@ -71,23 +71,12 @@
return;
}
- if (self.flat)
- {
- [self updatePitch:pitch];
- }
-
if (self.scalesWithViewingDistance)
{
[self updateScaleForPitch:pitch];
}
}
-- (void)updatePitch:(CGFloat)pitch
-{
- CATransform3D t = CATransform3DRotate(CATransform3DIdentity, MGLRadiansFromDegrees(pitch), 1.0, 0, 0);
- self.layer.transform = t;
-}
-
- (void)updateScaleForPitch:(CGFloat)pitch
{
CGFloat superviewHeight = CGRectGetHeight(self.superview.frame);
@@ -112,7 +101,7 @@
// reduction is then normalized for a scale of 1.0.
CGFloat pitchAdjustedScale = 1.0 - maxScaleReduction * pitchIntensity;
- CATransform3D transform = self.flat ? self.layer.transform : CATransform3DIdentity;
+ CATransform3D transform = self.layer.transform;
self.layer.transform = CATransform3DScale(transform, pitchAdjustedScale, pitchAdjustedScale, 1);
}
}