Xcode 10.2

Swift 5
CocoaPods 1.7.3

Author: maxep

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 env:
   global:
   - FRAMEWORK_NAME=ClusterKit
@@ -10,7 +10,7 @@ before_install:
 
 install:
 - gem install cocoapods
-- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+- gem install xcpretty --no-document --quiet
 
 script:
 - set -o pipefail && xcodebuild -project ClusterKit.xcodeproj -scheme $FRAMEWORK_NAME -sdk iphonesimulator12.1 -configuration Release -destination "platform=iOS Simulator,name=iPhone 8" clean build test | xcpretty -c

ClusterKit.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		9C2C4A0E1F94BACE00B22745 /* MGLMapView+ClusterKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C2C4A0C1F94BACE00B22745 /* MGLMapView+ClusterKit.h */; };
 		9C53CD191E03F51C000AD9B8 /* CKClusterAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C53CD041E03F51C000AD9B8 /* CKClusterAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C53CD1A1E03F51C000AD9B8 /* CKClusterAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C53CD051E03F51C000AD9B8 /* CKClusterAlgorithm.m */; };
 		9C53CD1B1E03F51C000AD9B8 /* CKNonHierarchicalDistanceBasedAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C53CD061E03F51C000AD9B8 /* CKNonHierarchicalDistanceBasedAlgorithm.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -266,7 +265,6 @@
 				9CE1F2691E069F30007E2678 /* CKGridBasedAlgorithm.h in Headers */,
 				9C53CD1D1E03F51C000AD9B8 /* CKCluster.h in Headers */,
 				9C53CD211E03F51C000AD9B8 /* CKMap.h in Headers */,
-				9C2C4A0E1F94BACE00B22745 /* MGLMapView+ClusterKit.h in Headers */,
 				9C53CD191E03F51C000AD9B8 /* CKClusterAlgorithm.h in Headers */,
 				9CC875F31E02AE2D0019AA18 /* ClusterKit.h in Headers */,
 				9C53CD231E03F51C000AD9B8 /* CKQuadTree.h in Headers */,
@@ -319,7 +317,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = CK;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Hulab;
 				TargetAttributes = {
 					9CC8756E1E0295A30019AA18 = {
@@ -334,7 +332,7 @@
 			};
 			buildConfigurationList = 9CC875691E0295A20019AA18 /* Build configuration list for PBXProject "ClusterKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -409,6 +407,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -469,6 +468,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ClusterKit.xcodeproj/xcshareddata/xcschemes/ClusterKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ClusterKit/Core/Algorithm/CKGridBasedAlgorithm.h

@@ -25,12 +25,16 @@
 /**
  A simple grid-based clustering algorithm with O(n) performance.
  
- The great advantage of grid-based clustering is its significant reduction of the computational complexity, especially for clustering very large data sets. The grid-based clustering approach differs from the conventional clustering algorithms in that it is concerned not with the data points but with the value space that surrounds the data points.
+ The great advantage of grid-based clustering is its significant reduction of the computational complexity,
+ especially for clustering very large data sets. The grid-based clustering approach differs from the conventional
+ clustering algorithms in that it is concerned not with the data points but with the value space that surrounds
+ the data points.
  
  This grid-based implementation consists of the following the steps:
  
  1. Iterate througth the annotations found in the given rect.
- 2. Associate each annotation to a grid cell. The rect is partitioned in a finite number of cells using the cell size property at the given zoom level.
+ 2. Associate each annotation to a grid cell. The rect is partitioned in a finite number of cells using the cell
+    size property at the given zoom level.
  3. Annotation are added to a centroid cluster {@see CKCentroidCluster} by default.
  */
 @interface CKGridBasedAlgorithm : CKClusterAlgorithm

ClusterKit/Core/Algorithm/CKGridBasedAlgorithm.m

@@ -50,7 +50,7 @@ - (instancetype)init {
 
             NSNumber *key = @(numCells * row + col);
             CKCluster *cluster = clusters[key];
-            if (cluster == nil) {
+            if (!cluster) {
                 cluster = [self clusterWithCoordinate:annotation.coordinate];
                 clusters[key] = cluster;
             }

ClusterKit/Core/Algorithm/CKNonHierarchicalDistanceBasedAlgorithm.h

@@ -25,14 +25,17 @@
 /**
  A simple clustering algorithm with O(nlog n) performance.
  
- Non-hierarchical distance analysis aims to find a grouping of annotations which minimises the distance between an annotation and its cluster. These algorithm will iteratively assign annotations to different groups while searching for the optimal distance.
+ Non-hierarchical distance analysis aims to find a grouping of annotations which minimises the distance
+ between an annotation and its cluster. These algorithm will iteratively assign annotations to different
+ groups while searching for the optimal distance.
  
  1. Iterate througth the annotations that are not yet clusterized found in the given rect.
  2. Create a cluster with the center of the annotation.
  3. Add all items that are within a certain distance to the cluster.
  4. Move any items out of an existing cluster if they are closer to another cluster.
  
- CKNonHierarchicalDistanceBasedAlgorithm is an objective-c implementation of the non-hierarchical distance based clustering algorithm used by Google maps.
+ CKNonHierarchicalDistanceBasedAlgorithm is an objective-c implementation of the non-hierarchical distance
+ based clustering algorithm used by Google maps.
  @see https://github.com/googlemaps/android-maps-utils/blob/master/library/src/com/google/maps/android/clustering/algo/NonHierarchicalDistanceBasedAlgorithm.java
  */
 @interface CKNonHierarchicalDistanceBasedAlgorithm : CKClusterAlgorithm

ClusterKit/Core/Algorithm/CKNonHierarchicalDistanceBasedAlgorithm.m

@@ -54,9 +54,7 @@ - (instancetype)init {
 
         for (id<MKAnnotation> annotation in annotations) {
 
-            if ([visited objectForKey:annotation]) {
-                continue;
-            }
+            if ([visited objectForKey:annotation]) continue;
 
             CKCluster *cluster = [self clusterWithCoordinate:annotation.coordinate];
             [clusters addObject:cluster];
@@ -71,9 +69,7 @@ - (instancetype)init {
                 CGFloat distance = CKDistance(neighbor.coordinate, cluster.coordinate);
 
                 if (candidate) {
-                    if (candidate.distance < distance) {
-                        continue;
-                    }
+                    if (candidate.distance < distance) continue;
                     [candidate.cluster removeAnnotation:neighbor];
                 } else {
                     candidate = [[CKCandidate alloc] init];

ClusterKit/Core/CKCluster.h

@@ -65,7 +65,7 @@ MK_EXTERN NSComparisonResult MKMapSizeCompare(MKMapSize size1, MKMapSize size2);
 /**
  Cluster coordinate.
  */
-@property (nonatomic) CLLocationCoordinate2D coordinate;
+@property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
 
 /**
  Cluster annotation array.
@@ -165,20 +165,26 @@ MK_EXTERN NSComparisonResult MKMapSizeCompare(MKMapSize size1, MKMapSize size2);
 
 @end
 
+#pragma mark - Centroid Cluster
+
 /**
  Cluster with centroid coordinate.
  */
 @interface CKCentroidCluster : CKCluster
 
 @end
 
+#pragma mark - Nearest Centroid Cluster
+
 /**
  Cluster with coordinate at the nearest annotation from centroid.
  */
 @interface CKNearestCentroidCluster : CKCentroidCluster
 
 @end
 
+#pragma mark - Bottom Cluster
+
 /**
  Cluster with coordinate at the bottom annotion.
  */

ClusterKit/Core/CKCluster.m

@@ -74,6 +74,10 @@ - (instancetype)init{
     return _annotations.array;
 }
 
+- (void)setCoordinate:(CLLocationCoordinate2D)newCoordinate {
+    _coordinate = newCoordinate;
+}
+
 - (MKMapRect)bounds {
     if (_invalidate_bounds) {
         _bounds = MKMapRectNull;
@@ -180,6 +184,8 @@ - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state object
 
 @end
 
+#pragma mark - Centroid Cluster
+
 @implementation CKCentroidCluster
 
 - (void)addAnnotation:(id<MKAnnotation>)annotation {
@@ -224,6 +230,8 @@ - (CLLocationCoordinate2D)coordinateByRemovingAnnotation:(id<MKAnnotation>)annot
 
 @end
 
+#pragma mark - Nearest Centroid Cluster
+
 @implementation CKNearestCentroidCluster {
     CLLocationCoordinate2D _center;
 }
@@ -264,6 +272,8 @@ - (CLLocationCoordinate2D)coordinateByDistanceSort {
 
 @end
 
+#pragma mark - Bottom Cluster
+
 @implementation CKBottomCluster
 
 - (void)addAnnotation:(id<MKAnnotation>)annotation {

ClusterKit/Core/CKClusterManager.h

@@ -33,7 +33,8 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
 @class CKClusterManager;
 
 /**
- The delegate of a CKClusterManager object may adopt the CKClusterManagerDelegate protocol. Optional methods of the protocol allow the delegate to manage clustering and animations.
+ The delegate of a CKClusterManager object may adopt the CKClusterManagerDelegate protocol.
+ Optional methods of the protocol allow the delegate to manage clustering and animations.
  */
 @protocol CKClusterManagerDelegate <NSObject>
 
@@ -43,7 +44,7 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
  Asks the delegate if the cluster manager should clusterized the given annotation.
  
  @param clusterManager The cluster manager object requesting this information.
- @param annotation         The annotation to clusterized.
+ @param annotation     The annotation to clusterized.
  
  @return Yes to permit clusterization of the given annotation.
  */
@@ -54,7 +55,9 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
  
  @param clusterManager The cluster manager object requesting the animation.
  @param animations     A block object containing the animation. This block takes no parameters and has no return value. This parameter must not be NULL.
- @param completion     A block object to be executed when the animation sequence ends. This block has no return value and takes a single Boolean argument that indicates whether or not the animations actually finished before the completion handler was called. If the duration of the animation is 0, this block is performed at the beginning of the next run loop cycle. This parameter may be NULL.
+ @param completion     A block object to be executed when the animation sequence ends. This block has no return value and takes a single Boolean argument
+                       that indicates whether or not the animations actually finished before the completion handler was called. If the duration of the
+                       animation is 0, this block is performed at the beginning of the next run loop cycle. This parameter may be NULL.
  */
 - (void)clusterManager:(CKClusterManager *)clusterManager performAnimations:(void (^)(void))animations completion:(void (^ __nullable)(BOOL finished))completion;
 
@@ -65,22 +68,22 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
 /**
  The total duration of the clusters animations, measured in seconds. If you specify a negative value or 0, the changes are made without animating them.
  */
-@property (assign, nonatomic) CGFloat animationDuration;
+@property (nonatomic, assign) CGFloat animationDuration;
 
 /**
  A mask of options indicating how you want to perform the animations. For a list of valid constants, @see UIViewAnimationOptions.
  */
-@property (assign, nonatomic) UIViewAnimationOptions animationOptions;
+@property (nonatomic, assign) UIViewAnimationOptions animationOptions;
 
 /**
  The cluster algorithm to use. @see CKClusterAlgorithm.
  */
-@property (nonatomic,strong) __kindof CKClusterAlgorithm *algorithm;
+@property (nonatomic, strong) __kindof CKClusterAlgorithm *algorithm;
 
 /**
  A map object adopting the CKMap protocol.
  */
-@property (nonatomic,weak) id<CKMap> map;
+@property (nonatomic, weak) id<CKMap> map;
 
 /**
  Delegate instance that adopt the CKClusterManagerDelegate protocol.
@@ -90,7 +93,7 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
 /**
  The currently selected annotation.
  */
-@property (nonatomic,readonly) id<MKAnnotation> selectedAnnotation;
+@property (nonatomic, readonly) id<MKAnnotation> selectedAnnotation;
 
 /**
  The current cluster array.
@@ -110,7 +113,7 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
 /**
  The annotations to clusterize.
  */
-@property (nonatomic,copy) NSArray<id<MKAnnotation>> *annotations;
+@property (nonatomic, copy) NSArray<id<MKAnnotation>> *annotations;
 
 /**
  Adds an annotation.
@@ -190,9 +193,21 @@ FOUNDATION_EXTERN const double kCKMarginFactorWorld;
  Initializes an animation for the given cluster.
 
  @param cluster The cluster to animate.
+ @param from The cluster starting point.
+ @param to The cluster ending point.
  @return The initialized CKClusterAnimation object.
  */
-- (instancetype)initWithCluster:(CKCluster *)cluster NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithCluster:(CKCluster *)cluster from:(CLLocationCoordinate2D)from to:(CLLocationCoordinate2D)to NS_DESIGNATED_INITIALIZER;
+
+/**
+ Creates an animation for the given cluster.
+
+ @param cluster The cluster to animate.
+ @param from The cluster starting point.
+ @param to The cluster ending point.
+ @return The initialized CKClusterAnimation object.
+ */
++ (instancetype)animateCluster:(CKCluster *)cluster from:(CLLocationCoordinate2D)from to:(CLLocationCoordinate2D)to;
 
 /// :nodoc:
 - (instancetype)init NS_UNAVAILABLE;