Fix annotation selection

Author: maxep

ClusterKit/Core/CKClusterManager.m

@@ -160,8 +160,7 @@ - (void)deselectAnnotation:(id<MKAnnotation>)annotation animated:(BOOL)animated
 #pragma mark - Private
 
 - (void)updateMapRect:(MKMapRect)visibleMapRect animated:(BOOL)animated {
-    
-    if (! self.tree || MKMapRectIsNull(visibleMapRect) || MKMapRectIsEmpty(visibleMapRect)) {
+    if (!self.tree || MKMapRectIsNull(visibleMapRect) || MKMapRectIsEmpty(visibleMapRect)) {
         return;
     }
 
@@ -200,12 +199,12 @@ - (void)updateMapRect:(MKMapRect)visibleMapRect animated:(BOOL)animated {
 }
 
 - (void)setSelectedCluster:(CKCluster *)selectedCluster animated:(BOOL)animated {
-    if (selectedCluster == _selectedCluster) {
+    if (selectedCluster == self.selectedCluster) {
         return;
     }
 
-    CKCluster *prev = _selectedCluster;
-    _selectedCluster = selectedCluster;
+    CKCluster *prev = self.selectedCluster;
+    self.selectedCluster = selectedCluster;
 
     if (prev) {
         [_clusters addObject:prev];
@@ -219,6 +218,10 @@ - (void)setSelectedCluster:(CKCluster *)selectedCluster animated:(BOOL)animated
 }
 
 - (CKCluster *)clusterForAnnotation:(id<MKAnnotation>)annotation {
+    if ([self.selectedCluster containsAnnotation:annotation]) {
+        return self.selectedCluster;
+    }
+    
     for (CKCluster *cluster in _clusters) {
         if ([cluster containsAnnotation:annotation]) {
             return cluster;

ClusterKit/MapKit/MKMapView+ClusterKit.m

@@ -61,6 +61,18 @@ - (void)removeClusters:(NSArray<CKCluster *> *)clusters {
     [self removeAnnotations:clusters];
 }
 
+- (void)selectCluster:(CKCluster *)cluster animated:(BOOL)animated {
+    if (![self.selectedAnnotations containsObject:cluster]) {
+        [self selectAnnotation:cluster animated:animated];
+    }
+}
+
+- (void)deselectCluster:(CKCluster *)cluster animated:(BOOL)animated {
+    if ([self.selectedAnnotations containsObject:cluster]) {
+        [self deselectAnnotation:cluster animated:animated];
+    }
+}
+
 - (void)performAnimations:(NSArray<CKClusterAnimation *> *)animations completion:(void (^__nullable)(BOOL finished))completion {
 
     for (CKClusterAnimation *animation in animations) {
@@ -91,12 +103,4 @@ - (void)performAnimations:(NSArray<CKClusterAnimation *> *)animations completion
     }
 }
 
-- (void)selectCluster:(CKCluster *)cluster animated:(BOOL)animated {
-    [self selectAnnotation:cluster animated:animated];
-}
-
-- (void)deselectCluster:(CKCluster *)cluster animated:(BOOL)animated {
-    [self deselectAnnotation:cluster animated:animated];
-}
-
 @end

ClusterKit/Mapbox/MGLMapView+ClusterKit.m

@@ -88,14 +88,6 @@ - (MKMapRect)visibleMapRect {
     return MKMapRectMake(x, y, width, height);
 }
 
-- (void)selectCluster:(CKCluster *)cluster animated:(BOOL)animated {
-    [self selectAnnotation:cluster animated:animated];
-}
-
-- (void)deselectCluster:(CKCluster *)cluster animated:(BOOL)animated {
-    [self deselectAnnotation:cluster animated:animated];
-}
-
 - (void)addClusters:(NSArray<CKCluster *> *)clusters {
     [self addAnnotations:clusters];
 }
@@ -104,6 +96,18 @@ - (void)removeClusters:(NSArray<CKCluster *> *)clusters {
     [self removeAnnotations:clusters];
 }
 
+- (void)selectCluster:(CKCluster *)cluster animated:(BOOL)animated {
+    if (![self.selectedAnnotations containsObject:cluster]) {
+        [self selectAnnotation:cluster animated:animated];
+    }
+}
+
+- (void)deselectCluster:(CKCluster *)cluster animated:(BOOL)animated {
+    if ([self.selectedAnnotations containsObject:cluster]) {
+        [self deselectAnnotation:cluster animated:animated];
+    }
+}
+
 - (void)performAnimations:(NSArray<CKClusterAnimation *> *)animations completion:(void (^__nullable)(BOOL finished))completion {
 
     for (CKClusterAnimation *animation in animations) {