tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] Allow removing never-added annotations

Browse Source 
https://github.com/mapbox/mapbox-gl-native/issues/3159#issuecomment-174422048
This commit is contained in:
Minh Nguyễn
2016-01-24 23:19:15 -08:00
committed by Minh Nguyễn
parent 759b207bf1
commit cc47da5a15
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/ios/src/MGLMapView.mm
View File

@@ -2443,7 +2443,10 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
NSAssert([annotation conformsToProtocol:@protocol(MGLAnnotation)], @"annotation should conform to MGLAnnotation");
MGLAnnotationTag annotationTag = [self annotationTagForAnnotation:annotation];
NSAssert(annotationTag != MGLAnnotationTagNotFound, @"No ID for annotation %@", annotation);
if (annotationTag == MGLAnnotationTagNotFound)
{
continue;
}
annotationTagsToRemove.push_back(annotationTag);
if (annotationTag == _selectedAnnotationTag)
@@ -2454,9 +2457,12 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
_annotationContextsByAnnotationTag.erase(annotationTag);
}
[self willChangeValueForKey:@"annotations"];
_mbglMap->removeAnnotations(annotationTagsToRemove);
[self didChangeValueForKey:@"annotations"];
if ( ! annotationTagsToRemove.empty())
{
[self willChangeValueForKey:@"annotations"];
_mbglMap->removeAnnotations(annotationTagsToRemove);
[self didChangeValueForKey:@"annotations"];
}
}
- (void)addOverlay:(id <MGLOverlay>)overlay