RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-09-09 13:48:24 +03:00
parent e2c39daa01
commit 3d60441c0e
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
View file

@ -5,10 +5,13 @@
#include "std/map.hpp"
static CGFloat const kLineWidth = 2.0;
static NSString * const kAnimationKey = @"CircleAnimation";
namespace
{
CGFloat const kLineWidth = 2.0;
NSString * const kAnimationKey = @"CircleAnimation";
static inline CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_PI_2; }
CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_PI_2; }
} // namespace
@interface MWMCircularProgressView ()
@property(nonatomic) CAShapeLayer * backgroundLayer;

13
iphone/Maps/Classes/Routing/MWMRouter.mm
View file

@ -129,7 +129,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
- (void)rebuildWithBestRouter:(BOOL)bestRouter
{
[self.altitudeImagesData removeAllObjects];
[self clearAltitudeImagesData];
if (self.startPoint.IsMyPosition())
{
@ -249,7 +249,7 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
- (void)doStop
{
[self.altitudeImagesData removeAllObjects];
[self clearAltitudeImagesData];
GetFramework().CloseRouting();
MapsAppDelegate * app = [MapsAppDelegate theApp];
app.routingPlaneMode = MWMRoutingPlaneModeNone;
@ -298,9 +298,18 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
UIImage * altitudeImage = [UIImage imageWithRGBAData:imageData width:width height:height];
if (altitudeImage)
{
dispatch_async(dispatch_get_main_queue(), ^{
block(altitudeImage);
});
}
});
}
- (void)clearAltitudeImagesData
{
dispatch_async(self.renderAltitudeImagesQueue, ^{
[self.altitudeImagesData removeAllObjects];
});
}