Fix for issue hulab#43.

dubraf · Dec 17, 2018 · bd39a0e · bd39a0e
1 parent 66146c7
commit bd39a0e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/ClusterKit/Core/CKCluster.h b/ClusterKit/Core/CKCluster.h
@@ -42,6 +42,7 @@ MK_EXTERN NSComparisonResult MKMapSizeCompare(MKMapSize size1, MKMapSize size2);
 
 #pragma mark - Cluster definitions
 
+
 /**
  CKCluster protocol that create a kind of CKCluster at the given coordinate.
  */
@@ -94,6 +95,8 @@ MK_EXTERN NSComparisonResult MKMapSizeCompare(MKMapSize size1, MKMapSize size2);
  */
 @property (nonatomic, readonly) MKMapRect bounds;
 
+- (NSMutableOrderedSet<id<MKAnnotation>> *) orderedSet;
+
 /**
  Adds a given annotation to the cluster, if it is not already a member.
  

diff --git a/ClusterKit/Core/CKCluster.m b/ClusterKit/Core/CKCluster.m
@@ -70,6 +70,10 @@ - (instancetype)init{
     return self;
 }
 
+- (NSMutableOrderedSet<id<MKAnnotation>> *) orderedSet {
+    return _annotations;
+}
+
 - (NSArray<id<MKAnnotation>> *)annotations {
     return _annotations.array;
 }

diff --git a/ClusterKit/Core/CKClusterManager.m b/ClusterKit/Core/CKClusterManager.m
@@ -180,32 +180,40 @@ - (void)updateMapRect:(MKMapRect)visibleMapRect animated:(BOOL)animated {
     CKClusterAlgorithm *algorithm = (zoom < self.maxZoomLevel)? self.algorithm : [CKClusterAlgorithm new];
     NSArray *clusters = [algorithm clustersInRect:clusterMapRect zoom:zoom tree:self.tree];
 
+    //------HERE the moment that delete all duplicates from clusters
+    for (CKCluster* cluster in clusters) {
+        for (CKCluster* secondCluster in clusters) {
+
+            if (![secondCluster isEqualToCluster:cluster] && [secondCluster intersectsCluster:cluster]) {
+
+                NSMutableSet<id<MKAnnotation>> *secondSet = secondCluster.orderedSet.set.mutableCopy;
+
+                [cluster.orderedSet minusSet:secondSet];
+            }
+        }
+    }
+    //---------------------------------------
     NSMutableSet *newClusters = [NSMutableSet setWithArray:clusters];
     NSMutableSet *oldClusters = [NSMutableSet setWithSet:_clusters];
 
     [oldClusters minusSet:newClusters];
     [newClusters minusSet:_clusters];
 
-    NSComparisonResult zoomOrder = MKMapSizeCompare(_visibleMapRect.size, visibleMapRect.size);
-    _visibleMapRect = visibleMapRect;
-
-    switch (zoomOrder) {
-        case NSOrderedAscending:
-            [self collapse:oldClusters.allObjects to:newClusters.allObjects in:visibleMapRect];
-            break;
-
-        case NSOrderedDescending:
-            [self expand:newClusters.allObjects from:oldClusters.allObjects in:visibleMapRect];
-            break;
-
-        default:
-            [self.map addClusters:newClusters.allObjects];
-            [self.map removeClusters:oldClusters.allObjects];
-            break;
+    if (visibleMapRect.size.width > _visibleMapRect.size.width) {
+        [self collapse:oldClusters.allObjects to:newClusters.allObjects in:visibleMapRect];
+
+    } else if (visibleMapRect.size.width < _visibleMapRect.size.width) {
+        [self expand:newClusters.allObjects from:oldClusters.allObjects in:visibleMapRect];
+
+    } else {
+        [self.map addClusters:newClusters.allObjects];
+        [self.map removeClusters:oldClusters.allObjects];
     }
 
     [_clusters minusSet:oldClusters];
     [_clusters unionSet:newClusters];
+
+    _visibleMapRect = visibleMapRect;
 }
 
 - (void)setSelectedCluster:(CKCluster *)selectedCluster animated:(BOOL)animated {