Custom callout: move annotation check to annotationCanShowCallout

Examples/ObjectiveC/CustomCalloutViewExample.m

@@ -36,22 +36,16 @@ - (void)viewDidLoad {
 }
 
 - (BOOL)mapView:(MGLMapView *)mapView annotationCanShowCallout:(id <MGLAnnotation>)annotation {
-    // Always allow callouts to popup when annotations are tapped.
-    return YES;
+    // Only show callouts for `Hello world!` annotation.
+    return [annotation respondsToSelector:@selector(title)] && [annotation.title isEqualToString:@"Hello world!"];
 }
 
 - (UIView<MGLCalloutView> *)mapView:(__unused MGLMapView *)mapView calloutViewForAnnotation:(id<MGLAnnotation>)annotation
 {
-    // Only show callouts for `Hello world!` annotation.
-    if ([annotation respondsToSelector:@selector(title)]
-        && [annotation.title isEqualToString:@"Hello world!"])
-    {
-        // Instantiate and return our custom callout view.
-        CustomCalloutView *calloutView = [[CustomCalloutView alloc] init];
-        calloutView.representedObject = annotation;
-        return calloutView;
-    }
-    return nil;
+    // Instantiate and return our custom callout view.
+    CustomCalloutView *calloutView = [[CustomCalloutView alloc] init];
+    calloutView.representedObject = annotation;
+    return calloutView;
 }
 
 - (void)mapView:(MGLMapView *)mapView tapOnCalloutForAnnotation:(id<MGLAnnotation>)annotation

Examples/Swift/CustomCalloutViewExample.swift

@@ -30,18 +30,13 @@ class CustomCalloutViewExample_Swift: UIViewController, MGLMapViewDelegate {
     }
 
     func mapView(_ mapView: MGLMapView, annotationCanShowCallout annotation: MGLAnnotation) -> Bool {
-        // Always allow callouts to popup when annotations are tapped.
-        return true
+        // Only show callouts for `Hello world!` annotation.
+        return annotation.responds(to: #selector(getter: MGLAnnotation.title)) && annotation.title! == "Hello world!"
     }
 
     func mapView(_ mapView: MGLMapView, calloutViewFor annotation: MGLAnnotation) -> MGLCalloutView? {
-        // Only show callouts for `Hello world!` annotation.
-        if annotation.responds(to: #selector(getter: MGLAnnotation.title)) && annotation.title! == "Hello world!" {
-            // Instantiate and return our custom callout view.
-            return CustomCalloutView(representedObject: annotation)
-        }
-
-        return nil
+        // Instantiate and return our custom callout view.
+        return CustomCalloutView(representedObject: annotation)
     }
 
     func mapView(_ mapView: MGLMapView, tapOnCalloutFor annotation: MGLAnnotation) {