尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Mikhail Merkulov
Commit 47ec92375c3c5322d24cbefd1ae58e75f26ca354 1 parent 1a46f0f9

Bugfix: Fix for background rendering crash

Inline Side-by-side
Showing 1 changed file with 50 additions and 43 deletions
... ... @@ -360,7 +360,7 @@
- (id)initWithFrame:(CGRect)frame andTilesource:(id <RMTileSource>)newTilesource
{
return [self initWithFrame:frame
return [self initWithFrame:frame
andTilesource:newTilesource
centerCoordinate:CLLocationCoordinate2DMake(kDefaultInitialLatitude, kDefaultInitialLongitude)
zoomLevel:kDefaultInitialZoomLevel
... ... @@ -456,7 +456,7 @@
- (void)handleMemoryWarningNotification:(NSNotification *)notification
{
[self didReceiveMemoryWarning];
[self didReceiveMemoryWarning];
}
- (void)handleWillChangeOrientationNotification:(NSNotification *)notification
... ... @@ -644,9 +644,9 @@
- (NSString *)description
{
CGRect bounds = self.bounds;
CGRect bounds = self.bounds;
return [NSString stringWithFormat:@"MapView at {%.0f,%.0f}-{%.0fx%.0f}", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height];
return [NSString stringWithFormat:@"MapView at {%.0f,%.0f}-{%.0fx%.0f}", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height];
}
#pragma mark -
... ... @@ -654,7 +654,7 @@
- (id <RMMapViewDelegate>)delegate
{
return _delegate;
return _delegate;
}
- (void)setDelegate:(id <RMMapViewDelegate>)aDelegate
... ... @@ -974,9 +974,9 @@
// RMLog(@"Current contentSize: {%.0f,%.0f}, zoom: %f", mapScrollView.contentSize.width, mapScrollView.contentSize.height, self.zoom);
RMProjectedRect planetBounds = _projection.planetBounds;
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = centerProjectedPoint.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = centerProjectedPoint.y + fabs(planetBounds.origin.y);
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = centerProjectedPoint.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = centerProjectedPoint.y + fabs(planetBounds.origin.y);
[_mapScrollView setContentOffset:CGPointMake(normalizedProjectedPoint.x / _metersPerPixel - _mapScrollView.bounds.size.width/2.0,
_mapScrollView.contentSize.height - ((normalizedProjectedPoint.y / _metersPerPixel) + _mapScrollView.bounds.size.height/2.0))
... ... @@ -1032,9 +1032,9 @@
boundsRect = [self fitProjectedRect:boundsRect intoRect:_constrainingProjectedBounds];
RMProjectedRect planetBounds = _projection.planetBounds;
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = boundsRect.origin.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = boundsRect.origin.y + fabs(planetBounds.origin.y);
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = boundsRect.origin.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = boundsRect.origin.y + fabs(planetBounds.origin.y);
float zoomScale = _mapScrollView.zoomScale;
CGRect zoomRect = CGRectMake((normalizedProjectedPoint.x / _metersPerPixel) / zoomScale,
... ... @@ -1067,17 +1067,24 @@
- (void)setZoom:(float)newZoom atCoordinate:(CLLocationCoordinate2D)newCenter animated:(BOOL)animated
{
[UIView animateWithDuration:(animated ? 0.3 : 0.0)
delay:0.0
options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationCurveEaseInOut
animations:^(void)
{
[self setZoom:newZoom];
[self setCenterCoordinate:newCenter animated:NO];
if (animated) {
[UIView animateWithDuration:(0.3)
delay:0.0
options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationCurveEaseInOut
animations:^(void)
{
[self setZoom:newZoom];
[self setCenterCoordinate:newCenter animated:NO];
self.userTrackingMode = RMUserTrackingModeNone;
}
completion:nil];
self.userTrackingMode = RMUserTrackingModeNone;
}
completion:nil];
} else {
[self setZoom:newZoom];
[self setCenterCoordinate:newCenter animated:NO];
self.userTrackingMode = RMUserTrackingModeNone;
}
}
- (void)zoomByFactor:(float)zoomFactor near:(CGPoint)pivot animated:(BOOL)animated
... ... @@ -1225,7 +1232,7 @@
.y = northEastPoint.y - southWestPoint.y
};
// Create the new zoom layout
// Create the new zoom layout
RMProjectedRect zoomRect;
// Default is with scale = 2.0 * mercators/pixel
... ... @@ -1500,8 +1507,8 @@
RMProjectedRect fittedProjectedRect = [self fitProjectedRect:normalizedProjectedRect intoRect:_constrainingProjectedBounds];
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = fittedProjectedRect.origin.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = fittedProjectedRect.origin.y + fabs(planetBounds.origin.y);
normalizedProjectedPoint.x = fittedProjectedRect.origin.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = fittedProjectedRect.origin.y + fabs(planetBounds.origin.y);
CGPoint correctedContentOffset = CGPointMake(normalizedProjectedPoint.x / currentMetersPerPixel,
aScrollView.contentSize.height - ((normalizedProjectedPoint.y / currentMetersPerPixel) + aScrollView.bounds.size.height));
... ... @@ -2700,8 +2707,8 @@
{
RMProjectedRect planetBounds = _projection.planetBounds;
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = projectedPoint.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = projectedPoint.y + fabs(planetBounds.origin.y);
normalizedProjectedPoint.x = projectedPoint.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = projectedPoint.y + fabs(planetBounds.origin.y);
// \bug: There is a rounding error here for high zoom levels
CGPoint projectedPixel = CGPointMake((normalizedProjectedPoint.x / _metersPerPixel) - _mapScrollView.contentOffset.x, (_mapScrollView.contentSize.height - (normalizedProjectedPoint.y / _metersPerPixel)) - _mapScrollView.contentOffset.y);
... ... @@ -2774,27 +2781,27 @@
- (CLLocationCoordinate2D)normalizeCoordinate:(CLLocationCoordinate2D)coordinate
{
if (coordinate.longitude > 180.0)
if (coordinate.longitude > 180.0)
coordinate.longitude -= 360.0;
coordinate.longitude /= 360.0;
coordinate.longitude += 0.5;
coordinate.latitude = 0.5 - ((log(tan((M_PI_4) + ((0.5 * M_PI * coordinate.latitude) / 180.0))) / M_PI) / 2.0);
coordinate.longitude /= 360.0;
coordinate.longitude += 0.5;
coordinate.latitude = 0.5 - ((log(tan((M_PI_4) + ((0.5 * M_PI * coordinate.latitude) / 180.0))) / M_PI) / 2.0);
return coordinate;
return coordinate;
}
- (RMTile)tileWithCoordinate:(CLLocationCoordinate2D)coordinate andZoom:(int)tileZoom
{
int scale = (1<<tileZoom);
CLLocationCoordinate2D normalizedCoordinate = [self normalizeCoordinate:coordinate];
int scale = (1<<tileZoom);
CLLocationCoordinate2D normalizedCoordinate = [self normalizeCoordinate:coordinate];
RMTile returnTile;
returnTile.x = (int)(normalizedCoordinate.longitude * scale);
returnTile.y = (int)(normalizedCoordinate.latitude * scale);
returnTile.zoom = tileZoom;
RMTile returnTile;
returnTile.x = (int)(normalizedCoordinate.longitude * scale);
returnTile.y = (int)(normalizedCoordinate.latitude * scale);
returnTile.zoom = tileZoom;
return returnTile;
return returnTile;
}
- (RMSphericalTrapezium)latitudeLongitudeBoundingBoxForTile:(RMTile)aTile
... ... @@ -2880,9 +2887,9 @@
- (void)correctScreenPosition:(RMAnnotation *)annotation animated:(BOOL)animated
{
RMProjectedRect planetBounds = _projection.planetBounds;
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = annotation.projectedLocation.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = annotation.projectedLocation.y + fabs(planetBounds.origin.y);
RMProjectedPoint normalizedProjectedPoint;
normalizedProjectedPoint.x = annotation.projectedLocation.x + fabs(planetBounds.origin.x);
normalizedProjectedPoint.y = annotation.projectedLocation.y + fabs(planetBounds.origin.y);
CGPoint newPosition = CGPointMake((normalizedProjectedPoint.x / _metersPerPixel) - _mapScrollView.contentOffset.x,
_mapScrollView.contentSize.height - (normalizedProjectedPoint.y / _metersPerPixel) - _mapScrollView.contentOffset.y);
... ... @@ -3295,7 +3302,7 @@
default:
{
[_locationManager stopUpdatingHeading];
[CATransaction setAnimationDuration:0.5];
[CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
... ... @@ -3940,4 +3947,4 @@
}];
}
@end
@end
\ No newline at end of file
... ...