diff options
author | Jason Wray <jason@mapbox.com> | 2017-01-12 21:37:21 -0500 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2017-01-13 15:43:41 -0500 |
commit | 8f6009ea20dd74e39054c005d0e226ee07a3f168 (patch) | |
tree | 1e0118b8d045d72d9f5d0942e65ccee32d8d026a /platform/ios/src/MGLMapView.mm | |
parent | 4d5036616f85ff87ffe9042739872b1a080015b2 (diff) | |
download | qtlocation-mapboxgl-8f6009ea20dd74e39054c005d0e226ee07a3f168.tar.gz |
[ios, macos] Revert deprecation of alphaForShapeAnnotation: delegate method
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index c85746d1b5..ba40997bc3 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -3132,23 +3132,9 @@ public: - (double)alphaForShapeAnnotation:(MGLShape *)annotation { - // The explicit -mapView:alphaForShapeAnnotation: delegate method is deprecated - // but still used, if implemented. When not implemented, call the stroke or - // fill color delegate methods and pull the alpha from the returned color. if (_delegateHasAlphasForShapeAnnotations) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" return [self.delegate mapView:self alphaForShapeAnnotation:annotation]; -#pragma clang diagnostic pop - } - else if ([annotation isKindOfClass:[MGLPolygon class]]) - { - return [self fillColorForPolygonAnnotation:(MGLPolygon *)annotation].a ?: 1.0; - } - else if ([annotation isKindOfClass:[MGLShape class]]) - { - return [self strokeColorForShapeAnnotation:annotation].a ?: 1.0; } return 1.0; } |