Report zoom factor, not target zoom, when finishing zoom-in animation
Showing
1 changed file
with
2 additions
and
1 deletions
@@ -496,6 +496,7 @@ | @@ -496,6 +496,7 @@ | ||
496 | [NSNumber numberWithDouble:zoomIncr], @"zoomIncr", | 496 | [NSNumber numberWithDouble:zoomIncr], @"zoomIncr", |
497 | [NSNumber numberWithDouble:targetZoom], @"targetZoom", | 497 | [NSNumber numberWithDouble:targetZoom], @"targetZoom", |
498 | [NSValue valueWithCGPoint:pivot], @"pivot", | 498 | [NSValue valueWithCGPoint:pivot], @"pivot", |
499 | + [NSNumber numberWithFloat:zoomFactor], @"factor", | ||
499 | callback, @"callback", nil]; | 500 | callback, @"callback", nil]; |
500 | [NSTimer scheduledTimerWithTimeInterval:kZoomAnimationStepTime | 501 | [NSTimer scheduledTimerWithTimeInterval:kZoomAnimationStepTime |
501 | target:self | 502 | target:self |
@@ -534,7 +535,7 @@ | @@ -534,7 +535,7 @@ | ||
534 | [timer invalidate]; // ASAP | 535 | [timer invalidate]; // ASAP |
535 | id<RMMapContentsAnimationCallback> callback = [userInfo objectForKey:@"callback"]; | 536 | id<RMMapContentsAnimationCallback> callback = [userInfo objectForKey:@"callback"]; |
536 | if (callback && [callback respondsToSelector:@selector(animationFinishedWithZoomFactor:near:)]) { | 537 | if (callback && [callback respondsToSelector:@selector(animationFinishedWithZoomFactor:near:)]) { |
537 | - [callback animationFinishedWithZoomFactor:targetZoom near:[[userInfo objectForKey:@"pivot"] CGPointValue]]; | 538 | + [callback animationFinishedWithZoomFactor:[[userInfo objectForKey:@"factor"] floatValue] near:[[userInfo objectForKey:@"pivot"] CGPointValue]]; |
538 | } | 539 | } |
539 | [userInfo release]; | 540 | [userInfo release]; |
540 | } | 541 | } |
-
Please register or login to post a comment