fixes #421: no longer allow callouts for non-markers

mapbox · Mar 18, 2014 · cda3185 · cda3185
1 parent c08d08f
commit cda3185
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/MapView/Map/RMMapLayer.h b/MapView/Map/RMMapLayer.h
@@ -77,7 +77,7 @@
 *
 *   If the value of this property is `NO`, the value of the title string is ignored and the annotation remains enabled by default. You can still disable the annotation explicitly using the enabled property. 
 *
-*   Note that callouts are not supported on cluster annotation layers. These annotations can be interacted with, but do not remain consistent visually during map pan and zoom events; thus, callout behavior would be inconsistent. */
+*   Note that callouts are not supported on non-marker or cluster annotation layers. These annotations can be interacted with, but do not remain consistent visually during map pan and zoom events; thus, callout behavior would be inconsistent. */
 @property (nonatomic, assign) BOOL canShowCallout;
 
 /** The offset (in pixels) at which to place the callout bubble.

diff --git a/MapView/Map/RMMapLayer.m b/MapView/Map/RMMapLayer.m
@@ -29,6 +29,7 @@
 #import "RMPixel.h"
 #import "RMAnnotation.h"
 #import "RMMapView.h"
+#import "RMMarker.h"
 
 @interface RMMapView (PrivateMethods)
 
@@ -74,8 +75,13 @@ - (id)initWithLayer:(id)layer
 
 - (void)setCanShowCallout:(BOOL)canShowCallout
 {
-    if ( ! self.annotation.isClusterAnnotation)
-        _canShowCallout = canShowCallout;
+    if (canShowCallout)
+    {
+        NSAssert([self isKindOfClass:[RMMarker class]],  @"Callouts are not supported on non-marker annotation layers");
+        NSAssert( ! self.annotation.isClusterAnnotation, @"Callouts are not supported on cluster annotation layers");
+    }
+
+    _canShowCallout = canShowCallout;
 }
 
 - (void)setPosition:(CGPoint)position animated:(BOOL)animated

diff --git a/MapView/Map/RMMapView.m b/MapView/Map/RMMapView.m
@@ -1606,22 +1606,6 @@ - (void)observeValueForKeyPath:(NSString *)aKeyPath ofObject:(id)anObject change
     {
         [self correctPositionOfAllAnnotationsIncludingInvisibles:NO animated:(_mapScrollViewIsZooming && !_mapScrollView.zooming)];
 
-        if (_currentAnnotation && ! [_currentAnnotation.layer isKindOfClass:[RMMarker class]])
-        {
-            // adjust shape annotation callouts for frame changes during zoom
-            //
-            _currentCallout.delegate = nil;
-
-            _currentCallout.permittedArrowDirection = SMCalloutArrowDirectionDown;
-
-            [_currentCallout presentCalloutFromRect:_currentAnnotation.layer.bounds
-                                            inLayer:_currentAnnotation.layer
-                                 constrainedToLayer:self.layer
-                                           animated:NO];
-
-            _currentCallout.delegate = self;
-        }
-
         _lastZoom = _zoom;
     }