Limit callouts to point annotations

Also, include callout properties in object description.
mapbox · Jul 27, 2016 · 833a0a2 · 833a0a2
1 parent 8dc99e6
commit 833a0a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/platform/darwin/src/MGLPointAnnotation.h b/platform/darwin/src/MGLPointAnnotation.h
@@ -1,6 +1,11 @@
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#import "MGLCalloutView.h"
+#endif
+
 #import "MGLShape.h"
 
 #import "MGLTypes.h"
@@ -20,6 +25,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 
+#if TARGET_OS_IPHONE
+
+@property (nonatomic) BOOL canShowCallout;
+
+@property (nonatomic, nullable) UIView <MGLCalloutView> *calloutView;
+
+#endif
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/platform/darwin/src/MGLPointAnnotation.m b/platform/darwin/src/MGLPointAnnotation.m
@@ -3,14 +3,17 @@
 @implementation MGLPointAnnotation
 
 @synthesize coordinate;
+@synthesize canShowCallout;
+@synthesize calloutView;
 
 - (NSString *)description
 {
-    return [NSString stringWithFormat:@"<%@: %p; title = %@; subtitle = %@; coordinate = %f, %f>",
+    return [NSString stringWithFormat:@"<%@: %p; title = %@; subtitle = %@; coordinate = %f, %f; callout: %@ (%@)>",
             NSStringFromClass([self class]), (void *)self,
             self.title ? [NSString stringWithFormat:@"\"%@\"", self.title] : self.title,
             self.subtitle ? [NSString stringWithFormat:@"\"%@\"", self.subtitle] : self.subtitle,
-            coordinate.latitude, coordinate.longitude];
+            coordinate.latitude, coordinate.longitude,
+            canShowCallout ? @"yes" : @"no", calloutView];
 }
 
 @end
diff --git a/platform/darwin/src/MGLShape.h b/platform/darwin/src/MGLShape.h
@@ -1,10 +1,5 @@
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-#import "MGLCalloutView.h"
-#endif
-
 #import "MGLAnnotation.h"
 
 #import "MGLTypes.h"
@@ -31,14 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, nullable) NSString *subtitle;
 
-#if TARGET_OS_IPHONE
-
-@property (nonatomic) BOOL canShowCallout;
-
-@property (nonatomic, nullable) UIView <MGLCalloutView> *calloutView;
-
-#endif
-
 #if !TARGET_OS_IPHONE
 
 /**