Skip to content

C
cordova-plugin-background-geolocation
Commit 27b8132e authored by Chris Scott's avatar Chris Scott
Browse files
Options

Implement distance-filter scaling

parent 0658b684
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 28 deletions
src/android/LocationUpdateService.java
View file @ 27b8132e
......@@ -18,10 +18,6 @@ import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.telephony.CellLocation;
import android.app.Application;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Context;
......@@ -31,7 +27,6 @@ import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.location.Location;
import android.location.Criteria;
//import com.google.android.gms.location.Geofence.Builder;
import android.location.LocationListener;
import android.location.LocationManager;
......@@ -48,14 +43,14 @@ import android.widget.Toast;
import static android.app.PendingIntent.*;
import static android.telephony.PhoneStateListener.*;
import static java.lang.Math.*;
public class LocationUpdateService extends Service implements LocationListener {
private static final String TAG = "LocationUpdateService";
private static final String STATIONARY_REGION_ACTION = "com.tenforwardconsulting.cordova.bgloc.STATIONARY_REGION_ACTION";
private static final String SINGLE_LOCATION_UPDATE_ACTION = "com.tenforwardconsulting.cordova.bgloc.SINGLE_LOCATION_UPDATE_ACTION";
private static long STATIONARY_TIMEOUT = 1000 * 60; //60 * 1000 * 15;
private static long STATIONARY_TIMEOUT = 60 * 1000 * 10;
public static final int NOTIFICATION_ID = 555;
private PowerManager.WakeLock wakeLock;
private Location lastLocation;
private long lastUpdateTime = 0l;
......@@ -67,6 +62,7 @@ public class LocationUpdateService extends Service implements LocationListener {
private Location stationaryLocation;
private Integer desiredAccuracy;
private Integer distanceFilter;
private Integer scaledDistanceFilter;
private Integer locationTimeout;
private Boolean isDebugging;
......@@ -74,8 +70,6 @@ public class LocationUpdateService extends Service implements LocationListener {
private PendingIntent proximityPI;
private Notification notification;
private NotificationManager notificationManager;
private LocationManager locationManager;
private ConnectivityManager connectivityManager;
......@@ -96,7 +90,7 @@ public class LocationUpdateService extends Service implements LocationListener {
public void onCreate() {
super.onCreate();
Log.i(TAG, "OnCreate");
notificationManager = (NotificationManager)this.getSystemService(NOTIFICATION_SERVICE);
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
locationManager = (LocationManager)this.getSystemService(Context.LOCATION_SERVICE);
......@@ -120,6 +114,7 @@ public class LocationUpdateService extends Service implements LocationListener {
url = intent.getStringExtra("url");
stationaryRadius = Float.parseFloat(intent.getStringExtra("stationaryRadius"));
distanceFilter = Integer.parseInt(intent.getStringExtra("distanceFilter"));
scaledDistanceFilter = distanceFilter;
desiredAccuracy = Integer.parseInt(intent.getStringExtra("desiredAccuracy"));
locationTimeout = Integer.parseInt(intent.getStringExtra("locationTimeout"));
isDebugging = Boolean.parseBoolean(intent.getStringExtra("isDebugging"));
......@@ -194,23 +189,17 @@ public class LocationUpdateService extends Service implements LocationListener {
locationManager.removeUpdates(this);
Criteria crta = new Criteria();
crta.setAltitudeRequired(false);
crta.setBearingRequired(false);
crta.setSpeedRequired(true);
crta.setCostAllowed(true);
if (isMoving) {
stationaryLocation = null;
crta.setAccuracy(Criteria.ACCURACY_FINE);
crta.setHorizontalAccuracy(translateDesiredAccuracy(desiredAccuracy));
crta.setPowerRequirement(Criteria.POWER_HIGH);
locationManager.requestLocationUpdates(locationManager.getBestProvider(crta, true), locationTimeout*1000, distanceFilter, this);
criteria.setAccuracy(Criteria.ACCURACY_FINE);
criteria.setHorizontalAccuracy(translateDesiredAccuracy(desiredAccuracy));
criteria.setPowerRequirement(Criteria.POWER_HIGH);
locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria, true), locationTimeout*1000, scaledDistanceFilter, this);
} else {
stationaryLocation = null;
crta.setAccuracy(Criteria.ACCURACY_COARSE);
crta.setHorizontalAccuracy(Criteria.ACCURACY_LOW);
crta.setPowerRequirement(Criteria.POWER_LOW);
criteria.setAccuracy(Criteria.ACCURACY_COARSE);
criteria.setHorizontalAccuracy(Criteria.ACCURACY_LOW);
criteria.setPowerRequirement(Criteria.POWER_LOW);
Location location = this.getLastBestLocation((int) stationaryRadius, locationTimeout * 1000);
if (location != null) {
......@@ -259,7 +248,8 @@ public class LocationUpdateService extends Service implements LocationListener {
}
public void onLocationChanged(Location location) {
Log.d(TAG, "- onLocationChanged: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy() + ", isMoving: " + isMoving);
Log.d(TAG, "- onLocationChanged: " + location.getLatitude() + "," + location.getLongitude() + ", accuracy: " + location.getAccuracy() + ", isMoving: " + isMoving + ", speed: " + location.getSpeed());
if (isDebugging) {
toneGenerator.startTone(ToneGenerator.TONE_PROP_BEEP);
}
......@@ -267,8 +257,9 @@ public class LocationUpdateService extends Service implements LocationListener {
// If user hasn't moved beyond the stationaryRadius within time of STATIONARY_TIMEOUT
// assume they've stopped.
if (lastLocation != null) {
Log.i(TAG, "- has lastLocation " + lastLocation.distanceTo(location) + "<" + stationaryRadius);
if (lastLocation.distanceTo(location) < stationaryRadius) {
Float stationaryDistance = (location.getAccuracy() < stationaryRadius) ? stationaryRadius : location.getAccuracy();
Log.i(TAG, "- has lastLocation " + lastLocation.distanceTo(location) + "<" + stationaryDistance);
if (lastLocation.distanceTo(location) < stationaryDistance) {
Log.i(TAG, "- lastLocation is within stationaryRadius");
if (stationaryLocation == null) {
stationaryLocation = lastLocation;
......@@ -280,6 +271,12 @@ public class LocationUpdateService extends Service implements LocationListener {
}
} else {
stationaryLocation = null;
Integer newDistanceFilter = calculateDistanceFilter(location.getSpeed());
if (newDistanceFilter != scaledDistanceFilter) {
Log.i(TAG, "- updated distanceFilter, new: " + newDistanceFilter + ", old: " + scaledDistanceFilter);
scaledDistanceFilter = newDistanceFilter;
setPace(true);
}
}
}
} else if (stationaryLocation == null) {
......@@ -301,6 +298,16 @@ public class LocationUpdateService extends Service implements LocationListener {
}
}
private Integer calculateDistanceFilter(Float speed) {
Double newDistanceFilter = (double) distanceFilter;
if (speed > 3 && speed < 100) {
float roundedDistanceFilter = (round(speed / 5) * 5);
newDistanceFilter = pow(roundedDistanceFilter, 2) + (double) distanceFilter;
}
return (newDistanceFilter.intValue() < 1000) ? newDistanceFilter.intValue() : 1000;
}
private void startMonitoringStationaryRegion(Location location) {
Log.i(TAG, "- startMonitoringStationaryRegion (" + location.getLatitude() + "," + location.getLongitude() + ")");
stationaryLocation = location;
......@@ -311,6 +318,7 @@ public class LocationUpdateService extends Service implements LocationListener {
if (proximityPI != null) {
locationManager.removeProximityAlert(proximityPI);
proximityPI = null;
}
Intent intent = new Intent(STATIONARY_REGION_ACTION);
proximityPI = PendingIntent.getBroadcast(this, 0, intent, 0);
......@@ -336,6 +344,9 @@ public class LocationUpdateService extends Service implements LocationListener {
Boolean entering = intent.getBooleanExtra(key, false);
if (entering) {
Log.d(TAG, "- ENTER");
if (isMoving) {
setPace(false);
}
}
else {
Log.d(TAG, "- EXIT");
......@@ -458,9 +469,8 @@ public class LocationUpdateService extends Service implements LocationListener {
// Stationary-region proximity-detector.
if (proximityPI != null) {
locationManager.removeProximityAlert(proximityPI);
proximityPI = null;
}
notificationManager.cancel(NOTIFICATION_ID);
wakeLock.release();
}
......
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