Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25677] iOS: Fix cluster-annotations-crash and static analyser warnings #220

Merged
merged 2 commits into from
Jan 18, 2018
Merged

[TIMOB-25677] iOS: Fix cluster-annotations-crash and static analyser warnings #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52898b0
[TIMOB-25677] Fix cluster-annotations-crash and static analyser warnings
hansemannn Jan 16, 2018
f3749ad
Update project.pbxproj
hansemannn Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ios/LICENSE → LICENSE
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion android/CHANGELOG.txt
View file
Open in desktop

This file was deleted.

246 changes: 0 additions & 246 deletions android/LICENSE
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ios/Classes/TiMapView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap

if (!TiPreviewingDelegate) {
NSLog(@"[ERROR] Unable to receive TiPreviewingDelegate class!");
return;
return nil;
}

#ifndef __clang_analyzer__
Expand Down
6 changes: 4 additions & 2 deletions ios/Classes/TiMapViewProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,10 @@ - (void)setAnnotations:(id)arg
// descriptors for them, we have to check and make sure there is
// no overlap and remember/forget appropriately.

for (TiMapAnnotationProxy *annProxy in currentAnnotations) {
if (![newAnnotations containsObject:annProxy]) {
for (id annProxy in currentAnnotations) {
// Remove old proxy references that should not rendered anymore
// Also only forget proxies, not native annotations like cluster annotations
if ([annProxy isKindOfClass:[TiMapAnnotationProxy class]] && ![newAnnotations containsObject:annProxy]) {
[self forgetProxy:annProxy];
}
}
Expand Down