Fixed a bug where the opposite condition was used on gatherDataInRange, also fixed a couple of other minor bugs with color and details (waste two hours on that stupid opposite condition bug)

eyaldar · eyaldar · commit be4bdcd3d80e · 2016-01-02T03:07:08.000+02:00
diff --git a/TBAnnotationClustering-Swift.xcodeproj/project.xcworkspace/xcuserdata/Ran.xcuserdatad/UserInterfaceState.xcuserstate b/TBAnnotationClustering-Swift.xcodeproj/project.xcworkspace/xcuserdata/Ran.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TBAnnotationClustering-Swift.xcodeproj/xcuserdata/Ran.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/TBAnnotationClustering-Swift.xcodeproj/xcuserdata/Ran.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,22 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "TBAnnotationClustering-Swift/TBCoordinateQuadTree.swift"
-            timestampString = "473381029.416535"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "50"
-            endingLineNumber = "50"
-            landmarkName = "clusteredAnnotationWithinMapRect(_:zoomScale:)"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/TBAnnotationClustering-Swift/Base.lproj/LaunchScreen.storyboard b/TBAnnotationClustering-Swift/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,7 +16,6 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
diff --git a/TBAnnotationClustering-Swift/TBClusterAnnotationView.swift b/TBAnnotationClustering-Swift/TBClusterAnnotationView.swift
@@ -20,6 +20,10 @@ class TBClusterAnnotationView: MKAnnotationView {
         super.init(coder: aDecoder)
     }
     
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    
     override init(annotation: MKAnnotation?, reuseIdentifier: String?) {
         super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)
         
@@ -90,6 +94,6 @@ class TBClusterAnnotationView: MKAnnotationView {
         CGContextStrokeEllipseInRect(context, circleFrame)
         
         innerCircleFillColor.setFill()
-        CGContextStrokeEllipseInRect(context, circleFrame)
+        CGContextFillEllipseInRect(context, circleFrame)
     }
 }
diff --git a/TBAnnotationClustering-Swift/TBCoordinateQuadTree.swift b/TBAnnotationClustering-Swift/TBCoordinateQuadTree.swift
@@ -50,11 +50,9 @@ class TBCoordinateQuadTree : NSObject {
                     totalX += data.x
                     totalY += data.y
                     
-                    let hotelInfo = data.data
-                    names.append(hotelInfo.name)
-                    
-                    if let phoneNum = hotelInfo.phoneNumber! {
-                        phoneNumbers.append(phoneNum)
+                    if let hotelInfo = data.data as? TBHotelInfo {
+                        names.append(hotelInfo.hotelName)
+                        phoneNumbers.append(hotelInfo.hotelPhoneNumber)
                     }
                 })
                 
@@ -66,7 +64,7 @@ class TBCoordinateQuadTree : NSObject {
                     clusteredAnnotations.append(annotation)
                 }
                 
-                if count > 1 {
+                if count == 1 {
                     let coordinate = CLLocationCoordinate2D(latitude: totalX, longitude: totalY)
                     let annotation = TBClusterAnnotation(coordinate: coordinate, count: count)
                     annotation.title = names.last!
@@ -92,10 +90,10 @@ class TBCoordinateQuadTree : NSObject {
         return TBBoundingBox(x: minLat, y: minLong, xf: maxLat, yf: maxLong)
     }
     
-    func TBZoomScaleToZoomLevel(scale:MKZoomScale) -> Double {
-        let totalTilesAtMaxZoom = MKMapSizeWorld.width / 256.0;
-        let zoomLevelAtMaxZoom = log2(totalTilesAtMaxZoom);
-        let zoomLevel = max(0, zoomLevelAtMaxZoom + floor(log2(Double(scale)) + 0.5));
+    func TBZoomScaleToZoomLevel(scale:MKZoomScale) -> Int {
+        let totalTilesAtMaxZoom = MKMapSizeWorld.width / 256.0
+        let zoomLevelAtMaxZoom = Int(log2(totalTilesAtMaxZoom))
+        let zoomLevel = Int(max(0, Double(zoomLevelAtMaxZoom) + floor(log2(Double(scale)) + 0.5)));
     
         return zoomLevel;
     }
diff --git a/TBAnnotationClustering-Swift/ViewController.swift b/TBAnnotationClustering-Swift/ViewController.swift
@@ -43,7 +43,7 @@ class ViewController: UIViewController, MKMapViewDelegate {
         let toRemove = NSMutableSet(set: before)
         toRemove.minusSet(after as Set<NSObject>)
         
-        NSOperationQueue().addOperationWithBlock() {
+        NSOperationQueue.mainQueue().addOperationWithBlock() {
             self.mapView.addAnnotations(toAdd.allObjects as! [MKAnnotation])
             self.mapView.removeAnnotations(toRemove.allObjects as! [MKAnnotation])
         }
diff --git a/TBAnnotationClustering.xcodeproj/project.xcworkspace/xcuserdata/Ran.xcuserdatad/UserInterfaceState.xcuserstate b/TBAnnotationClustering.xcodeproj/project.xcworkspace/xcuserdata/Ran.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/TBBoundingBox.swift b/TBBoundingBox.swift
@@ -27,7 +27,6 @@ struct TBBoundingBox {
     }
     
     func intersectWith(other:TBBoundingBox) -> Bool {
-        return (x0 <= other.xf && xf >= other.x0) &&
-                (y0 <= other.yf && yf >= other.y0)
+        return x0 <= other.xf && xf >= other.x0 && y0 <= other.yf && yf >= other.y0
     }
 }
diff --git a/TBQuadTreeNode.swift b/TBQuadTreeNode.swift
@@ -77,7 +77,7 @@ class TBQuadTreeNode {
     
     func gatherDataInRange(range: TBBoundingBox, action: (TBQuadTreeNodeData) -> Void) {
         // If range is not contained in the node's boundingBox then bail
-        if boundingBox.intersectWith(range) {
+        if !boundingBox.intersectWith(range) {
             return
         }
         

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ class TBClusterAnnotationView: MKAnnotationView {`
`20`	`20`	`super.init(coder: aDecoder)`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ override init(frame: CGRect) {`
	`24`	`+ super.init(frame: frame)`
	`25`	`+ }`
	`26`	`+`
`23`	`27`	`override init(annotation: MKAnnotation?, reuseIdentifier: String?) {`
`24`	`28`	`super.init(annotation: annotation, reuseIdentifier: reuseIdentifier)`
`25`	`29`
`@@ -90,6 +94,6 @@ class TBClusterAnnotationView: MKAnnotationView {`
`90`	`94`	`CGContextStrokeEllipseInRect(context, circleFrame)`
`91`	`95`
`92`	`96`	`innerCircleFillColor.setFill()`
`93`		`- CGContextStrokeEllipseInRect(context, circleFrame)`
	`97`	`+ CGContextFillEllipseInRect(context, circleFrame)`
`94`	`98`	`}`
`95`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class ViewController: UIViewController, MKMapViewDelegate {`
`43`	`43`	`let toRemove = NSMutableSet(set: before)`
`44`	`44`	`toRemove.minusSet(after as Set<NSObject>)`
`45`	`45`
`46`		`- NSOperationQueue().addOperationWithBlock() {`
	`46`	`+ NSOperationQueue.mainQueue().addOperationWithBlock() {`
`47`	`47`	`self.mapView.addAnnotations(toAdd.allObjects as! [MKAnnotation])`
`48`	`48`	`self.mapView.removeAnnotations(toRemove.allObjects as! [MKAnnotation])`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ struct TBBoundingBox {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func intersectWith(other:TBBoundingBox) -> Bool {`
`30`		`- return (x0 <= other.xf && xf >= other.x0) &&`
`31`		`- (y0 <= other.yf && yf >= other.y0)`
	`30`	`+ return x0 <= other.xf && xf >= other.x0 && y0 <= other.yf && yf >= other.y0`
`32`	`31`	`}`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class TBQuadTreeNode {`
`77`	`77`
`78`	`78`	`func gatherDataInRange(range: TBBoundingBox, action: (TBQuadTreeNodeData) -> Void) {`
`79`	`79`	`// If range is not contained in the node's boundingBox then bail`
`80`		`- if boundingBox.intersectWith(range) {`
	`80`	`+ if !boundingBox.intersectWith(range) {`
`81`	`81`	`return`
`82`	`82`	`}`
`83`	`83`