1.0.3

efremidze · Apr 30, 2017 · e283440 · e283440
1 parent 32422f7
commit e283440
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log
 
+## [Version 1.0.3](https://github.com/efremidze/Cluster/releases/tag/1.0.3)
+Released on 2017-04-29
+
+- Added image support
+
 ## [Version 1.0.2](https://github.com/efremidze/Cluster/releases/tag/1.0.2)
 Released on 2017-04-19
 

diff --git a/Cluster.podspec b/Cluster.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Cluster'
-  s.version          = '1.0.2'
+  s.version          = '1.0.3'
   s.summary          = 'Map Clustering Library'
   s.homepage         = 'https://github.com/efremidze/Cluster'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -59,6 +79,11 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/Example/Assets.xcassets/Contents.json b/Example/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Assets.xcassets/pin.imageset/Contents.json b/Example/Assets.xcassets/pin.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "pin.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Example/Assets.xcassets/pin.imageset/pin.pdf b/Example/Assets.xcassets/pin.imageset/pin.pdf
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -19,9 +19,15 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let annotations: [Annotation] = (0..<1000).map { _ in
+        let annotations: [Annotation] = (0..<1000).map { i in
             let annotation = Annotation()
             annotation.coordinate = CLLocationCoordinate2D(latitude: drand48() * 80 - 40, longitude: drand48() * 80 - 40)
+            let color = UIColor(red: 255/255, green: 149/255, blue: 0/255, alpha: 1)
+            if i % 2 == 0 {
+                annotation.type = .color(color, radius: 25)
+            } else {
+                annotation.type = .image(UIImage(named: "pin")?.filled(with: color))
+            }
             return annotation
         }
         manager.add(annotations)
@@ -35,11 +41,15 @@ extension ViewController: MKMapViewDelegate {
 
     func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
         let color = UIColor(red: 255/255, green: 149/255, blue: 0/255, alpha: 1)
-        if annotation is ClusterAnnotation {
+        if let annotation = annotation as? ClusterAnnotation {
             let identifier = "Cluster"
             var view = mapView.dequeueReusableAnnotationView(withIdentifier: identifier)
             if view == nil {
-                view = ClusterAnnotationView(annotation: annotation, reuseIdentifier: identifier, type: .color(color: color, radius: 25))
+                if let annotation = annotation.annotations.first as? Annotation, let type = annotation.type {
+                    view = ClusterAnnotationView(annotation: annotation, reuseIdentifier: identifier, type: type)
+                } else {
+                    view = ClusterAnnotationView(annotation: annotation, reuseIdentifier: identifier, type: .color(color, radius: 25))
+                }
             } else {
                 view?.annotation = annotation
             }
@@ -83,3 +93,23 @@ extension ViewController: MKMapViewDelegate {
     }
 
 }
+
+extension UIImage {
+
+    func filled(with color: UIColor) -> UIImage {
+        UIGraphicsBeginImageContextWithOptions(size, false, scale)
+        color.setFill()
+        guard let context = UIGraphicsGetCurrentContext() else { return self }
+        context.translateBy(x: 0, y: size.height)
+        context.scaleBy(x: 1.0, y: -1.0);
+        context.setBlendMode(CGBlendMode.normal)
+        let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height)
+        guard let mask = self.cgImage else { return self }
+        context.clip(to: rect, mask: mask)
+        context.fill(rect)
+        let newImage = UIGraphicsGetImageFromCurrentImageContext()!
+        UIGraphicsEndImageContext()
+        return newImage
+    }
+
+}
diff --git a/Example/ViewController2.swift b/Example/ViewController2.swift
diff --git a/Images/demo.jpg b/Images/demo.jpg
diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ let clusterManager = ClusterManager()
 ```swift
 let annotation = Annotation()
 annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+annotation.type = .color(color, radius: 25) // .image(UIImage(named: "pin"))
 clusterManager.add(annotation)
 ```
 
@@ -60,7 +61,7 @@ clusterManager.add(annotation)
 func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
     var view = mapView.dequeueReusableAnnotationView(withIdentifier: identifier)
     if view == nil {
-        view = ClusterAnnotationView(annotation: annotation, reuseIdentifier: identifier, type: .color(color: color, radius: radius))
+        view = ClusterAnnotationView(annotation: annotation, reuseIdentifier: identifier, type: type)
     } else {
         view?.annotation = annotation
     }
@@ -72,14 +73,10 @@ func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnota
 
 ```swift
 func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
-    clusterManager.reload(mapView)
+    clusterManager.reload(mapView, visibleMapRect: mapView.visibleMapRect)
 }
 ```
 
-### Customization
-
-To use images for your annotation cluster view take a look at [Example2](Example/ViewController2.swift).
-
 ## Installation
 
 ### CocoaPods

diff --git a/Sources/Annotation.swift b/Sources/Annotation.swift
@@ -12,15 +12,16 @@ open class Annotation: NSObject, MKAnnotation {
     open var coordinate = CLLocationCoordinate2D()
     open var title: String?
     open var subtitle: String?
+    open var type: ClusterAnnotationType?
 }
 
 open class ClusterAnnotation: Annotation {
     open var annotations = [MKAnnotation]()
 }
 
 public enum ClusterAnnotationType {
-    case color(color: UIColor, radius: CGFloat)
-    case image(named: String)
+    case color(UIColor, radius: CGFloat)
+    case image(UIImage?)
 }
 
 open class ClusterAnnotationView: MKAnnotationView {
@@ -44,7 +45,7 @@ open class ClusterAnnotationView: MKAnnotationView {
         }
     }
 
-    public var type: ClusterAnnotationType = .color(color: .red, radius: 25) {
+    public var type: ClusterAnnotationType? {
         didSet {
             configure()
         }
@@ -72,10 +73,10 @@ open class ClusterAnnotationView: MKAnnotationView {
         let count = annotation.annotations.count
 
         switch type {
-        case let .image(named):
+        case let .image(image)?:
             backgroundColor = .clear
-            image = UIImage(named: named)
-        case let .color(color, radius):
+            self.image = image
+        case let .color(color, radius)?:
             backgroundColor	= color
             var diameter = radius * 2
             switch count {
@@ -86,20 +87,22 @@ open class ClusterAnnotationView: MKAnnotationView {
             default: break
             }
             frame = CGRect(origin: frame.origin, size: CGSize(width: diameter, height: diameter))
+            layer.borderColor = UIColor.white.cgColor
+            layer.borderWidth = 2
+            countLabel.font = .boldSystemFont(ofSize: 13)
+            countLabel.text = "\(count)"
+        default: break
         }
-
-        layer.borderColor = UIColor.white.cgColor
-        layer.borderWidth = 2
-        countLabel.font = .boldSystemFont(ofSize: 13)
-        countLabel.text = "\(count)"
     }
 
     override open func layoutSubviews() {
         super.layoutSubviews()
 
-        layer.masksToBounds = true
-        layer.cornerRadius = image == nil ? bounds.width / 2 : 0
-        countLabel.frame = bounds
+        if case .color? = type {
+            layer.masksToBounds = true
+            layer.cornerRadius = image == nil ? bounds.width / 2 : 0
+            countLabel.frame = bounds
+        }
     }
 
 }
diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>