fix watchPosition keep updating location

zjj010104 · facebook-github-bot-7 · commit aacd2d90a4a5 · 2015-10-12T11:56:45.000-07:00
Reviewed By: @nicklockwood Differential Revision: D2519624 fb-gh-sync-id: 7366c5ac9e06082448b9fbba3c616aaf8e4183f9
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
@@ -284,8 +284,11 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray
     [_locationManager stopUpdatingLocation];
   }
 
-  // Reset location accuracy
-  _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;
+  // Reset location accuracy if desiredAccuracy is changed.
+  // Otherwise update accuracy will force triggering didUpdateLocations, watchPosition would keeping receiving location updates, even there's no location changes.
+  if (ABS(_locationManager.desiredAccuracy - RCT_DEFAULT_LOCATION_ACCURACY) > 0.000001) {
+    _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;
+  }
 }
 
 - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
@@ -318,8 +321,11 @@ - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *
   }
   [_pendingRequests removeAllObjects];
 
-  // Reset location accuracy
-  _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;
+  // Reset location accuracy if desiredAccuracy is changed.
+  // Otherwise update accuracy will force triggering didUpdateLocations, watchPosition would keeping receiving location updates, even there's no location changes.
+  if (ABS(_locationManager.desiredAccuracy - RCT_DEFAULT_LOCATION_ACCURACY) > 0.000001) {
+    _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;
+  }
 }
 
 - (void)checkLocationConfig

Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,11 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray`
`284`	`284`	`[_locationManager stopUpdatingLocation];`
`285`	`285`	`}`
`286`	`286`
`287`		`- // Reset location accuracy`
`288`		`- _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;`
	`287`	`+ // Reset location accuracy if desiredAccuracy is changed.`
	`288`	`+ // Otherwise update accuracy will force triggering didUpdateLocations, watchPosition would keeping receiving location updates, even there's no location changes.`
	`289`	`+ if (ABS(_locationManager.desiredAccuracy - RCT_DEFAULT_LOCATION_ACCURACY) > 0.000001) {`
	`290`	`+ _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;`
	`291`	`+ }`
`289`	`292`	`}`
`290`	`293`
`291`	`294`	`- (void)locationManager:(CLLocationManager )manager didFailWithError:(NSError )error`
`@@ -318,8 +321,11 @@ - (void)locationManager:(CLLocationManager )manager didFailWithError:(NSError `
`318`	`321`	`}`
`319`	`322`	`[_pendingRequests removeAllObjects];`
`320`	`323`
`321`		`- // Reset location accuracy`
`322`		`- _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;`
	`324`	`+ // Reset location accuracy if desiredAccuracy is changed.`
	`325`	`+ // Otherwise update accuracy will force triggering didUpdateLocations, watchPosition would keeping receiving location updates, even there's no location changes.`
	`326`	`+ if (ABS(_locationManager.desiredAccuracy - RCT_DEFAULT_LOCATION_ACCURACY) > 0.000001) {`
	`327`	`+ _locationManager.desiredAccuracy = RCT_DEFAULT_LOCATION_ACCURACY;`
	`328`	`+ }`
`323`	`329`	`}`
`324`	`330`
`325`	`331`	`- (void)checkLocationConfig`