[ios] Fix location manager null reset.

This commit is contained in:
Fabian Guerra
2018-07-31 15:24:08 -07:00
committed by Fabian Guerra Soto
parent d6c602b48c
commit 62fb7e1987
2 changed files with 15 additions and 15 deletions

View File

@@ -333,9 +333,8 @@ MGL_EXPORT IB_DESIGNABLE
To receive the current user location, implement the `-[MGLMapViewDelegate mapView:didUpdateUserLocation:]`
and `-[MGLMapViewDelegate mapView:didFailToLocateUserWithError:]` methods.
If setting this property to `nil` and setting `showsUserLocation` to `YES`, or
if no custom manager is provided this property is set to the default
location manager.
If setting this property to `nil` or if no custom manager is provided this property
is set to the default location manager.
`MGLMapView` uses a default location manager. If you want to substitute your own
location manager, you should do so by setting this property before setting

View File

@@ -442,6 +442,9 @@ public:
_isWaitingForRedundantReachableNotification = YES;
}
[_reachability startNotifier];
// setup default location manager
self.locationManager = nil;
// Set up annotation management and selection state.
_annotationImagesByIdentifier = [NSMutableDictionary dictionary];
@@ -701,8 +704,10 @@ public:
[self.attributionButtonConstraints removeAllObjects];
self.attributionButtonConstraints = nil;
self.locationManager.delegate = nil;
self.locationManager = nil;
[_locationManager stopUpdatingLocation];
[_locationManager stopUpdatingHeading];
_locationManager.delegate = nil;
}
- (void)setDelegate:(nullable id<MGLMapViewDelegate>)delegate
@@ -4739,13 +4744,15 @@ public:
#pragma mark - User Location -
- (void)setLocationManager:(id<MGLLocationManager>)locationManager
- (void)setLocationManager:(nullable id<MGLLocationManager>)locationManager
{
if (!locationManager) {
[self.locationManager stopUpdatingLocation];
[self.locationManager stopUpdatingHeading];
locationManager = [[MGLCLLocationManager alloc] init];
}
self.locationManager.delegate = nil;
[_locationManager stopUpdatingLocation];
[_locationManager stopUpdatingHeading];
_locationManager.delegate = nil;
_locationManager = locationManager;
_locationManager.delegate = self;
}
@@ -4756,11 +4763,6 @@ public:
if (shouldEnableLocationServices)
{
// If no custom location manager is provided will use the internal implementation.
if (!self.locationManager) {
self.locationManager = [[MGLCLLocationManager alloc] init];
}
if (self.locationManager.authorizationStatus == kCLAuthorizationStatusNotDetermined)
{
BOOL requiresWhenInUseUsageDescription = [NSProcessInfo.processInfo isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){11,0,0}];
@@ -4792,7 +4794,6 @@ public:
}
}
self.locationManager.delegate = self;
[self.locationManager startUpdatingLocation];
[self validateUserHeadingUpdating];