From fcee1a85cdff8f323d86378edf7c180a17329eb4 Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Tue, 30 Aug 2016 17:49:31 -0400 Subject: [PATCH] [ios] Allow implicit animation of annotation views - Allows the user location annotation to again animate its movements while no tracking mode is enabled. --- platform/ios/src/MGLAnnotationView.mm | 10 ---------- platform/ios/src/MGLUserLocationAnnotationView.m | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm index c37adc556..96ed8c733 100644 --- a/platform/ios/src/MGLAnnotationView.mm +++ b/platform/ios/src/MGLAnnotationView.mm @@ -246,16 +246,6 @@ return otherGestureRecognizer == _longPressRecognizer || otherGestureRecognizer == _panGestureRecognizer; } -- (id)actionForLayer:(CALayer *)layer forKey:(NSString *)event -{ - // Allow mbgl to drive animation of this view’s bounds. - if ([event isEqualToString:@"bounds"] || [event isEqualToString:@"position"]) - { - return [NSNull null]; - } - return [super actionForLayer:layer forKey:event]; -} - #pragma mark UIAccessibility methods - (BOOL)isAccessibilityElement { diff --git a/platform/ios/src/MGLUserLocationAnnotationView.m b/platform/ios/src/MGLUserLocationAnnotationView.m index cda269531..3b8d97614 100644 --- a/platform/ios/src/MGLUserLocationAnnotationView.m +++ b/platform/ios/src/MGLUserLocationAnnotationView.m @@ -97,14 +97,4 @@ } } -- (id)actionForLayer:(CALayer *)layer forKey:(NSString *)event -{ - // Allow mbgl to drive animation of this view’s bounds. - if ([event isEqualToString:@"bounds"]) - { - return [NSNull null]; - } - return [super actionForLayer:layer forKey:event]; -} - @end