diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-08-17 15:50:12 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-08-18 09:30:30 -0700 |
| commit | bfd17e2d27498f48a6e981f5b596c82d04cbc6bb (patch) | |
| tree | 55b6112c4fa34c61f36db318ae45560a04399157 | |
| parent | 39c545c7e78e9190cc10aefa3f91cd53e56778f3 (diff) | |
| download | qtlocation-mapboxgl-bfd17e2d27498f48a6e981f5b596c82d04cbc6bb.tar.gz | |
Avoid deprecated CLLocationManagerDelegate method
Fixes #2097.
| -rw-r--r-- | platform/ios/MGLMapView.mm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 53f60a9518..6b826ab0db 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -2308,10 +2308,7 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) if (self.userLocationAnnotationView) { - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [self locationManager:self.locationManager didUpdateToLocation:self.userLocation.location fromLocation:self.userLocation.location]; - #pragma clang diagnostic pop + [self locationManager:self.locationManager didUpdateLocations:@[self.userLocation.location]]; } break; @@ -2325,10 +2322,7 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) if (self.userLocationAnnotationView) { - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [self locationManager:self.locationManager didUpdateToLocation:self.userLocation.location fromLocation:self.userLocation.location]; - #pragma clang diagnostic pop + [self locationManager:self.locationManager didUpdateLocations:@[self.userLocation.location]]; } [self updateHeadingForDeviceOrientation]; @@ -2345,8 +2339,11 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) } } -- (void)locationManager:(__unused CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation +- (void)locationManager:(__unused CLLocationManager *)manager didUpdateLocations:(NSArray *)locations { + CLLocation *oldLocation = self.userLocation.location; + CLLocation *newLocation = locations.lastObject; + if ( ! _showsUserLocation || ! newLocation || ! CLLocationCoordinate2DIsValid(newLocation.coordinate)) return; if (! oldLocation || ! CLLocationCoordinate2DIsValid(oldLocation.coordinate) || [newLocation distanceFromLocation:oldLocation]) |