Merge pull request #1241 from commons-app/realTimeLocation

Real time location track

Author: neslihanturan

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -86,6 +86,7 @@ public void startGalleryPick() {
             return;
         }
         Timber.d("startGalleryPick() called with pickImageIntent");
+
         fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
     }
 
@@ -115,6 +116,7 @@ public void handleImagePicked(int requestCode, Intent data, boolean isDirectUplo
                 if (isDirectUpload) {
                     shareIntent.putExtra("isDirectUpload", true);
                 }
+
                 break;
             default:
                 break;

app/src/main/java/fr/free/nrw/commons/location/LatLng.java

@@ -159,3 +159,4 @@ public Uri getGmmIntentUri() {
         return Uri.parse("geo:0,0?q=" + latitude + "," + longitude);
     }
 }
+

app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java

@@ -10,6 +10,7 @@
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
+import android.util.Log;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -19,7 +20,8 @@
 public class LocationServiceManager implements LocationListener {
     public static final int LOCATION_REQUEST = 1;
 
-    private static final long MIN_LOCATION_UPDATE_REQUEST_TIME_IN_MILLIS = 2 * 60 * 1000;
+    // Maybe these values can be improved for efficiency
+    private static final long MIN_LOCATION_UPDATE_REQUEST_TIME_IN_MILLIS = 2 * 60 * 100;
     private static final long MIN_LOCATION_UPDATE_REQUEST_DISTANCE_IN_METERS = 10;
 
     private Context context;
@@ -120,12 +122,14 @@ private boolean requestLocationUpdatesFromProvider(String locationProvider) {
      *
      * @param location            the location to be tested
      * @param currentBestLocation the current best location
-     * @return true if the given location is better
+     * @return LOCATION_SIGNIFICANTLY_CHANGED if location changed significantly
+     * LOCATION_SLIGHTLY_CHANGED if location changed slightly
      */
-    protected boolean isBetterLocation(Location location, Location currentBestLocation) {
+    protected LocationChangeType isBetterLocation(Location location, Location currentBestLocation) {
+
         if (currentBestLocation == null) {
             // A new location is always better than no location
-            return true;
+            return LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
         }
 
         // Check whether the new location fix is newer or older
@@ -134,15 +138,6 @@ protected boolean isBetterLocation(Location location, Location currentBestLocati
         boolean isSignificantlyOlder = timeDelta < -MIN_LOCATION_UPDATE_REQUEST_TIME_IN_MILLIS;
         boolean isNewer = timeDelta > 0;
 
-        // If it's been more than two minutes since the current location, use the new location
-        // because the user has likely moved
-        if (isSignificantlyNewer) {
-            return true;
-            // If the new location is more than two minutes older, it must be worse
-        } else if (isSignificantlyOlder) {
-            return false;
-        }
-
         // Check whether the new location fix is more or less accurate
         int accuracyDelta = (int) (location.getAccuracy() - currentBestLocation.getAccuracy());
         boolean isLessAccurate = accuracyDelta > 0;
@@ -153,15 +148,28 @@ protected boolean isBetterLocation(Location location, Location currentBestLocati
         boolean isFromSameProvider = isSameProvider(location.getProvider(),
                 currentBestLocation.getProvider());
 
-        // Determine location quality using a combination of timeliness and accuracy
-        if (isMoreAccurate) {
-            return true;
-        } else if (isNewer && !isLessAccurate) {
-            return true;
-        } else if (isNewer && !isSignificantlyLessAccurate && isFromSameProvider) {
-            return true;
+        float[] results = new float[5];
+        Location.distanceBetween(
+                        currentBestLocation.getLatitude(),
+                        currentBestLocation.getLongitude(),
+                        location.getLatitude(),
+                        location.getLongitude(),
+                        results);
+
+        // If it's been more than two minutes since the current location, use the new location
+        // because the user has likely moved
+        if (isSignificantlyNewer
+                || isMoreAccurate
+                || (isNewer && !isLessAccurate)
+                || (isNewer && !isSignificantlyLessAccurate && isFromSameProvider)) {
+            if (results[0] < 1000) { // Means change is smaller than 1000 meter
+                return LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
+            } else {
+                return LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
+            }
+        } else{
+            return LocationChangeType.LOCATION_NOT_CHANGED;
         }
-        return false;
     }
 
     /**
@@ -208,12 +216,19 @@ public void removeLocationListener(LocationUpdateListener listener) {
 
     @Override
     public void onLocationChanged(Location location) {
-        if (isBetterLocation(location, lastLocation)) {
-            lastLocation = location;
-            for (LocationUpdateListener listener : locationListeners) {
-                listener.onLocationChanged(LatLng.from(lastLocation));
+            if (isBetterLocation(location, lastLocation)
+                    .equals(LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED)) {
+                lastLocation = location;
+                for (LocationUpdateListener listener : locationListeners) {
+                    listener.onLocationChangedSignificantly(LatLng.from(lastLocation));
+                }
+            } else if (isBetterLocation(location, lastLocation)
+                    .equals(LocationChangeType.LOCATION_SLIGHTLY_CHANGED)) {
+                lastLocation = location;
+                for (LocationUpdateListener listener : locationListeners) {
+                    listener.onLocationChangedSlightly(LatLng.from(lastLocation));
+                }
             }
-        }
     }
 
     @Override
@@ -230,4 +245,10 @@ public void onProviderEnabled(String provider) {
     public void onProviderDisabled(String provider) {
         Timber.d("Provider %s disabled", provider);
     }
+
+    public enum LocationChangeType{
+        LOCATION_SIGNIFICANTLY_CHANGED, //Went out of borders of nearby markers
+        LOCATION_SLIGHTLY_CHANGED,      //User might be walking or driving
+        LOCATION_NOT_CHANGED
+    }
 }

app/src/main/java/fr/free/nrw/commons/location/LocationUpdateListener.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.location;
 
 public interface LocationUpdateListener {
-    void onLocationChanged(LatLng latLng);
+    void onLocationChangedSignificantly(LatLng latLng);
+    void onLocationChangedSlightly(LatLng latLng);
 }