Ignore invalid location updates

Avoid passing invalid locations along to the map view delegate or user location annotation. Also, If the user wants to visit the Prime Meridian or Equator, that’s their prerogative. Mapbox GL should show them where they’re at. Null Island is a different story. Fixes #1912.
mapbox · Jul 24, 2015 · 32c7805 · 32c7805
1 parent c16b0bf
commit 32c7805
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -2309,7 +2309,7 @@ - (void)locationManager:(__unused CLLocationManager *)manager didUpdateToLocatio
 {
     if ( ! _showsUserLocation || ! newLocation || ! CLLocationCoordinate2DIsValid(newLocation.coordinate)) return;
 
-    if ([newLocation distanceFromLocation:oldLocation] || ! oldLocation)
+    if (! oldLocation || ! CLLocationCoordinate2DIsValid(oldLocation.coordinate) || [newLocation distanceFromLocation:oldLocation])
     {
         self.userLocation.location = newLocation;
 

diff --git a/platform/ios/MGLUserLocation.m b/platform/ios/MGLUserLocation.m
@@ -37,13 +37,13 @@ + (BOOL)automaticallyNotifiesObserversForKey:(NSString *)key
 
 - (void)setLocation:(CLLocation *)newLocation
 {
-    if ([newLocation distanceFromLocation:_location] && newLocation.coordinate.latitude != 0 &&
-            newLocation.coordinate.longitude != 0)
-    {
-        [self willChangeValueForKey:@"location"];
-        _location = newLocation;
-        [self didChangeValueForKey:@"location"];
-    }
+    if ( ! newLocation || ! CLLocationCoordinate2DIsValid(newLocation.coordinate)) return;
+    if ( _location && CLLocationCoordinate2DIsValid(_location.coordinate) && [newLocation distanceFromLocation:_location] == 0) return;
+    if (newLocation.coordinate.latitude == 0 && newLocation.coordinate.longitude == 0) return;
+
+    [self willChangeValueForKey:@"location"];
+    _location = newLocation;
+    [self didChangeValueForKey:@"location"];
 }
 
 - (BOOL)isUpdating