[ios] Remove annotation view from container view when annotation removed

boundsj · boundsj · commit 9d36092f50ea · 2017-05-17T10:34:17.000-07:00
The annotation container view keeps an array of annotation views that is separate from the array of subviews that is a property of the UIView parent class. This removes an annotation view from that container view array when the associated annotation is removed. This avoids issue related to previously removed annotation views continuing to be involved in map view logic around annotation view selection due to taps.
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
@@ -3501,6 +3501,7 @@ - (void)removeAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations
 
         annotationView.annotation = nil;
         [annotationView removeFromSuperview];
+        [self.annotationContainerView.annotationViews removeObject:annotationView];
 
         if (annotationTag == _selectedAnnotationTag)
         {

Original file line number	Diff line number	Diff line change
`@@ -3501,6 +3501,7 @@ - (void)removeAnnotations:(NS_ARRAY_OF(id <MGLAnnotation>) *)annotations`
`3501`	`3501`
`3502`	`3502`	`annotationView.annotation = nil;`
`3503`	`3503`	`[annotationView removeFromSuperview];`
	`3504`	`+ [self.annotationContainerView.annotationViews removeObject:annotationView];`
`3504`	`3505`
`3505`	`3506`	`if (annotationTag == _selectedAnnotationTag)`
`3506`	`3507`	`{`