2.4.5 (#107)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## [Version 2.4.5](https://github.com/efremidze/Cluster/releases/tag/2.4.5)
+Released on 2019-03-07
+
+- Fixed distributeAnnotations bug
+
 ## [Version 2.4.4](https://github.com/efremidze/Cluster/releases/tag/2.4.4)
 Released on 2019-02-11
 

Cluster.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Cluster'
-  s.version          = '2.4.4'
+  s.version          = '2.4.5'
   s.summary          = 'Map Clustering Library'
   s.homepage         = 'https://github.com/efremidze/Cluster'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

Example/ViewController.swift

@@ -116,8 +116,8 @@ extension ViewController: MKMapViewDelegate {
 
 extension ViewController: ClusterManagerDelegate {
 
-    func cellSize(for zoomLevel: Double) -> Double {
-        return 0 // default
+    func cellSize(for zoomLevel: Double) -> Double? {
+        return nil // default
     }
 
     func shouldClusterAnnotation(_ annotation: MKAnnotation) -> Bool {

Sources/Cluster.swift

@@ -18,7 +18,7 @@ public protocol ClusterManagerDelegate: class {
 
      - Returns: The cell size at the given zoom level.
      */
-    func cellSize(for zoomLevel: Double) -> Double
+    func cellSize(for zoomLevel: Double) -> Double?
 
     /**
      Whether to cluster the given annotation.
@@ -32,8 +32,8 @@ public protocol ClusterManagerDelegate: class {
 }
 
 public extension ClusterManagerDelegate {
-    func cellSize(for zoomLevel: Double) -> Double {
-        return 0
+    func cellSize(for zoomLevel: Double) -> Double? {
+        return nil
     }
 
     func shouldClusterAnnotation(_ annotation: MKAnnotation) -> Bool {
@@ -304,7 +304,7 @@ open class ClusterManager {
 
             // handle annotations on the same coordinate
             if shouldDistributeAnnotationsOnSameCoordinate {
-                distributeAnnotations(annotations: annotations) // buggy (modifying coordinate)
+                distributeAnnotations(annotations: annotations, tree: tree, mapRect: mapRect)
             }
 
             // handle clustering
@@ -322,14 +322,16 @@ open class ClusterManager {
         return allAnnotations
     }
 
-    func distributeAnnotations(annotations: [MKAnnotation]) {
+    func distributeAnnotations(annotations: [MKAnnotation], tree: QuadTree, mapRect: MKMapRect) {
         let hash = Dictionary(grouping: annotations) { $0.coordinate }
         for value in hash.values where value.count > 1 {
             for (index, annotation) in value.enumerated() {
+                tree.remove(annotation)
                 let distanceFromContestedLocation = 3 * Double(value.count) / 2
                 let radiansBetweenAnnotations = (.pi * 2) / Double(value.count)
                 let bearing = radiansBetweenAnnotations * Double(index)
                 (annotation as? MKPointAnnotation)?.coordinate = annotation.coordinate.coordinate(onBearingInRadians: bearing, atDistanceInMeters: distanceFromContestedLocation)
+                tree.add(annotation)
             }
         }
     }
@@ -382,7 +384,7 @@ open class ClusterManager {
     }
 
     func cellSize(for zoomLevel: Double) -> Double {
-        if let cellSize = delegate?.cellSize(for: zoomLevel), cellSize > 0 {
+        if let cellSize = delegate?.cellSize(for: zoomLevel) {
             return cellSize
         }
         switch zoomLevel {

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.4</string>
+	<string>2.4.5</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>