ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASMapNode] Protected showAnnotationsOptions with a lock.

Browse Source
This commit is contained in:
George A
2016-07-12 08:01:17 +02:00
parent 41e26374e3
commit 396583dbaa
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
AsyncDisplayKit/ASMapNode.mm
View File

@@ -33,6 +33,7 @@
@synthesize mapDelegate = _mapDelegate;
@synthesize options = _options;
@synthesize liveMap = _liveMap;
@synthesize showAnnotationsOptions = _showAnnotationsOptions;
#pragma mark - Lifecycle
- (instancetype)init
@@ -267,8 +268,9 @@
[weakSelf setNeedsLayout];
[weakSelf.view addSubview:_mapView];
if (self.showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
BOOL const animated = self.showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
[_mapView showAnnotations:_mapView.annotations animated:animated];
}
}
@@ -292,16 +294,17 @@
ASDN::MutexLocker l(_propertyLock);
_annotations = annotations;
ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
if (self.isLiveMap) {
[_mapView removeAnnotations:_mapView.annotations];
[_mapView addAnnotations:annotations];
if (self.showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
BOOL const animated = self.showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
[_mapView showAnnotations:_mapView.annotations animated:animated];
}
} else {
if (self.showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
self.region = [self regionToFitAnnotations:annotations];
}
else {
@@ -333,6 +336,16 @@
return region;
}
-(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
ASDN::MutexLocker l(_propertyLock);
return _showAnnotationsOptions;
}
-(void)setShowAnnotationsOptions:(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
ASDN::MutexLocker l(_propertyLock);
_showAnnotationsOptions = showAnnotationsOptions;
}
#pragma mark - Layout
- (void)setSnapshotSizeWithReloadIfNeeded:(CGSize)snapshotSize
{