diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2017-04-05 14:16:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 14:16:58 -0400 |
| commit | ec34813c905566bfb7a388a9d905d1e20711dc17 (patch) | |
| tree | dc8c8b0d9e4bf0731025aa877aaafb315ab53a43 | |
| parent | 8539d7092ee0dc584f6dd7f664d49ee96d4ddf0e (diff) | |
| download | qtlocation-mapboxgl-ec34813c905566bfb7a388a9d905d1e20711dc17.tar.gz | |
[ios] assertion to check if an annotationTag > 0 (#8588)
* [ios] assertion to check if an annotationTag > 0
* [ios,macos] assertion and guard added to check annotations in visibleAnnotationsInRect
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 2 | ||||
| -rw-r--r-- | platform/macos/src/MGLMapView.mm | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 6f51d4b523..ef4326556b 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -3060,10 +3060,12 @@ public: continue; } MGLAnnotationContext annotationContext = _annotationContextsByAnnotationTag.at(annotationTag); + NSAssert(annotationContext.annotation, @"Missing annotation for tag %u.", annotationTag); if (annotationContext.annotation) { [annotations addObject:annotationContext.annotation]; } + } return [annotations copy]; diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 8711950554..fc9834e016 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -1801,7 +1801,11 @@ public: continue; } MGLAnnotationContext annotationContext = _annotationContextsByAnnotationTag.at(annotationTag); - [annotations addObject:annotationContext.annotation]; + NSAssert(annotationContext.annotation, @"Missing annotation for tag %u.", annotationTag); + if (annotationContext.annotation) + { + [annotations addObject:annotationContext.annotation]; + } } return [annotations copy]; |