Commit cff6468f authored by Chris Scott's avatar Chris Scott

clean up distance-filter calculator

parent d2cfb3b4
...@@ -290,14 +290,7 @@ ...@@ -290,14 +290,7 @@
// Adjust distanceFilter incrementally based upon current velocity // Adjust distanceFilter incrementally based upon current velocity
if (isMoving) if (isMoving)
{ {
float newDistanceFilter = distanceFilter; float newDistanceFilter = [self calculateDistanceFilter:newLocation.speed];
// sanity-check obvious high speed error.
if (newLocation.speed > 100) {
return;
}
if (newLocation.speed > 5.0) {
newDistanceFilter = [self calculateDistanceFilter:newLocation.speed];
}
if (newDistanceFilter != locationManager.distanceFilter) { if (newDistanceFilter != locationManager.distanceFilter) {
NSLog(@"- CDVBackgroundGeoLocation updated distanceFilter, new: %f, old: %f", newDistanceFilter, locationManager.distanceFilter); NSLog(@"- CDVBackgroundGeoLocation updated distanceFilter, new: %f, old: %f", newDistanceFilter, locationManager.distanceFilter);
[locationManager stopUpdatingLocation]; [locationManager stopUpdatingLocation];
...@@ -367,7 +360,12 @@ ...@@ -367,7 +360,12 @@
*/ */
-(float) calculateDistanceFilter:(float)velocity -(float) calculateDistanceFilter:(float)velocity
{ {
return (5.0 * floorf(velocity / 5.0 + 0.5f)) * 10; float newDistanceFilter = distanceFilter;
if (velocity > 5.0 && velocity < 100) {
newDistanceFilter = (5.0 * floorf(velocity / 5.0 + 0.5f)) * 10;
}
return newDistanceFilter;
} }
- (void) stopBackgroundTask - (void) stopBackgroundTask
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment