Skip to content

Use zoom level to determine if the new region has zoomed or not #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kusamakura wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use zoom level to determine if the new region has zoomed or not #120

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3a8e9
Clean up newlines
kusamakura Jan 13, 2016
8930d3f
Change hasZoomed criteria to use zoomLevel
kusamakura Jan 13, 2016
ddf3336
Increase zoom change threshold
kusamakura Jan 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 52 additions & 47 deletions CCHMapClusterController/CCHMapClusterController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#define WORLD_MAX_LAT 85
#define WORLD_MIN_LON -180
#define WORLD_MAX_LON 180
#define ZOOM_EPSILON 0.002

#define fequal(a, b) (fabs((a) - (b)) < __FLT_EPSILON__)

Expand All @@ -62,7 +63,9 @@ @interface CCHMapClusterController()<MKMapViewDelegate>

@end

@implementation CCHMapClusterController
@implementation CCHMapClusterController {
double _zoomLevelBeforeChange;
}

- (instancetype)initWithMapView:(MKMapView *)mapView
{
Expand All @@ -77,26 +80,26 @@ - (instancetype)initWithMapView:(MKMapView *)mapView
_visibleAnnotationsMapTree = [[CCHMapTree alloc] initWithNodeCapacity:NODE_CAPACITY minLatitude:WORLD_MIN_LAT maxLatitude:WORLD_MAX_LAT minLongitude:WORLD_MIN_LON maxLongitude:WORLD_MAX_LON];
_backgroundQueue = [[NSOperationQueue alloc] init];
_backgroundQueue.maxConcurrentOperationCount = 1; // sync access to allAnnotationsMapTree & visibleAnnotationsMapTree

if ([mapView.delegate isKindOfClass:CCHMapViewDelegateProxy.class]) {
CCHMapViewDelegateProxy *delegateProxy = (CCHMapViewDelegateProxy *)mapView.delegate;
[delegateProxy addDelegate:self];
_mapViewDelegateProxy = delegateProxy;
} else {
_mapViewDelegateProxy = [[CCHMapViewDelegateProxy alloc] initWithMapView:mapView delegate:self];
}

// Keep strong reference to default instance because public property is weak
id<CCHMapClusterer> clusterer = [[CCHCenterOfMassMapClusterer alloc] init];
_clusterer = clusterer;
_strongClusterer = clusterer;
id<CCHMapAnimator> animator = [[CCHFadeInOutMapAnimator alloc] init];
_animator = animator;
_strongAnimator = animator;

[self setReuseExistingClusterAnnotations:YES];
}

return self;
}

Expand Down Expand Up @@ -136,9 +139,9 @@ - (void)cancelAllClusterOperations
- (void)addAnnotations:(NSArray *)annotations withCompletionHandler:(void (^)())completionHandler
{
[self cancelAllClusterOperations];

[self.allAnnotations addObjectsFromArray:annotations];

[self.backgroundQueue addOperationWithBlock:^{
BOOL updated = [self.allAnnotationsMapTree addAnnotations:annotations];
dispatch_async(dispatch_get_main_queue(), ^{
Expand All @@ -154,9 +157,9 @@ - (void)addAnnotations:(NSArray *)annotations withCompletionHandler:(void (^)())
- (void)removeAnnotations:(NSArray *)annotations withCompletionHandler:(void (^)())completionHandler
{
[self cancelAllClusterOperations];

[self.allAnnotations minusSet:[NSSet setWithArray:annotations]];

[self.backgroundQueue addOperationWithBlock:^{
BOOL updated = [self.allAnnotationsMapTree removeAnnotations:annotations];
dispatch_async(dispatch_get_main_queue(), ^{
Expand All @@ -172,7 +175,7 @@ - (void)removeAnnotations:(NSArray *)annotations withCompletionHandler:(void (^)
- (void)updateAnnotationsWithCompletionHandler:(void (^)())completionHandler
{
[self cancelAllClusterOperations];

CCHMapClusterOperation *operation = [[CCHMapClusterOperation alloc] initWithMapView:self.mapView
cellSize:self.cellSize
marginFactor:self.marginFactor
Expand All @@ -185,17 +188,17 @@ - (void)updateAnnotationsWithCompletionHandler:(void (^)())completionHandler
operation.animator = self.animator;
operation.clusterControllerDelegate = self.delegate;
operation.clusterController = self;

if (completionHandler) {
operation.completionBlock = ^{
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler();
});
};
};

[self.backgroundQueue addOperation:operation];

// Debugging
if (self.isDebuggingEnabled) {
double cellMapSize = [CCHMapClusterOperation cellMapSizeForCellSize:self.cellSize withMapView:self.mapView];
Expand All @@ -207,7 +210,7 @@ - (void)updateAnnotationsWithCompletionHandler:(void (^)())completionHandler
- (void)updateDebugPolygonsInGridMapRect:(MKMapRect)gridMapRect withCellMapSize:(double)cellMapSize
{
MKMapView *mapView = self.mapView;

// Remove old polygons
for (id<MKOverlay> overlay in mapView.overlays) {
if ([overlay isKindOfClass:CCHMapClusterControllerDebugPolygon.class]) {
Expand All @@ -217,11 +220,11 @@ - (void)updateDebugPolygonsInGridMapRect:(MKMapRect)gridMapRect withCellMapSize:
}
}
}

// Add polygons outlining each cell
CCHMapClusterControllerEnumerateCells(gridMapRect, cellMapSize, ^(MKMapRect cellMapRect) {
// cellMapRect.origin.x -= MKMapSizeWorld.width; // fixes issue when view port spans 180th meridian

MKMapPoint points[4];
points[0] = MKMapPointMake(MKMapRectGetMinX(cellMapRect), MKMapRectGetMinY(cellMapRect));
points[1] = MKMapPointMake(MKMapRectGetMaxX(cellMapRect), MKMapRectGetMinY(cellMapRect));
Expand Down Expand Up @@ -249,10 +252,10 @@ - (void)selectAnnotation:(id<MKAnnotation>)annotation andZoomToRegionWithLatitud
if (!existingAnnotation) {
return;
}

// Deselect annotations
[self deselectAllAnnotations];

// Zoom to annotation
self.annotationToSelect = annotation;
MKCoordinateRegion region = MKCoordinateRegionMakeWithDistance(annotation.coordinate, latitudinalMeters, longitudinalMeters);
Expand All @@ -274,47 +277,49 @@ - (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)annotation

- (void)mapView:(MKMapView *)mapView regionWillChangeAnimated:(BOOL)animated
{
_zoomLevelBeforeChange = self.zoomLevel;
self.regionSpanBeforeChange = mapView.region.span;
self.regionChanging = YES;
}

- (void)mapView:(MKMapView *)mapView regionDidChangeAnimated:(BOOL)animated
{
self.regionChanging = NO;

// Deselect all annotations when zooming in/out. Longitude delta will not change
// unless zoom changes (in contrast to latitude delta).
BOOL hasZoomed = !fequal(mapView.region.span.longitudeDelta, self.regionSpanBeforeChange.longitudeDelta);
BOOL hasZoomed = fabs(self.zoomLevel - _zoomLevelBeforeChange) > ZOOM_EPSILON;
if (hasZoomed) {
NSLog(@"Zoom 𝛥: %f", fabs(self.zoomLevel - _zoomLevelBeforeChange));
[self deselectAllAnnotations];
}

// Update annotations
[self updateAnnotationsWithCompletionHandler:^{
if (self.annotationToSelect) {
// Map has zoomed to selected annotation; search for cluster annotation that contains this annotation
CCHMapClusterAnnotation *mapClusterAnnotation = CCHMapClusterControllerClusterAnnotationForAnnotation(self.mapView, self.annotationToSelect, mapView.visibleMapRect);
self.annotationToSelect = nil;

if (CCHMapClusterControllerCoordinateEqualToCoordinate(self.mapView.centerCoordinate, mapClusterAnnotation.coordinate)) {
// Select immediately since region won't change
[self.mapView selectAnnotation:mapClusterAnnotation animated:YES];
} else {
// Actual selection happens in next call to mapView:regionDidChangeAnimated:
self.mapClusterAnnotationToSelect = mapClusterAnnotation;

// Dispatch async to avoid calling regionDidChangeAnimated immediately
dispatch_async(dispatch_get_main_queue(), ^{
// No zooming, only panning. Otherwise, annotation might change to a different cluster annotation
[self.mapView setCenterCoordinate:mapClusterAnnotation.coordinate animated:NO];
});

// Update annotations
[self updateAnnotationsWithCompletionHandler:^{
if (self.annotationToSelect) {
// Map has zoomed to selected annotation; search for cluster annotation that contains this annotation
CCHMapClusterAnnotation *mapClusterAnnotation = CCHMapClusterControllerClusterAnnotationForAnnotation(self.mapView, self.annotationToSelect, mapView.visibleMapRect);
self.annotationToSelect = nil;

if (CCHMapClusterControllerCoordinateEqualToCoordinate(self.mapView.centerCoordinate, mapClusterAnnotation.coordinate)) {
// Select immediately since region won't change
[self.mapView selectAnnotation:mapClusterAnnotation animated:YES];
} else {
// Actual selection happens in next call to mapView:regionDidChangeAnimated:
self.mapClusterAnnotationToSelect = mapClusterAnnotation;

// Dispatch async to avoid calling regionDidChangeAnimated immediately
dispatch_async(dispatch_get_main_queue(), ^{
// No zooming, only panning. Otherwise, annotation might change to a different cluster annotation
[self.mapView setCenterCoordinate:mapClusterAnnotation.coordinate animated:NO];
});
}
} else if (self.mapClusterAnnotationToSelect) {
// Map has zoomed to annotation
[self.mapView selectAnnotation:self.mapClusterAnnotationToSelect animated:YES];
self.mapClusterAnnotationToSelect = nil;
}
} else if (self.mapClusterAnnotationToSelect) {
// Map has zoomed to annotation
[self.mapView selectAnnotation:self.mapClusterAnnotationToSelect animated:YES];
self.mapClusterAnnotationToSelect = nil;
}
}];
}];
}
}

@end