Remove LocationValidator and force last Location if found (#1498)

Author: danesfeder

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/LocationValidator.java

@@ -32,8 +32,6 @@ public abstract class MapboxNavigationOptions {
   @NavigationTimeFormat.Type
   public abstract int timeFormatType();
 
-  public abstract int locationAcceptableAccuracyInMetersThreshold();
-
   public abstract int navigationLocationEngineIntervalLagInMilliseconds();
 
   public abstract Builder toBuilder();
@@ -55,8 +53,6 @@ public abstract static class Builder {
 
     public abstract Builder timeFormatType(@NavigationTimeFormat.Type int type);
 
-    public abstract Builder locationAcceptableAccuracyInMetersThreshold(int accuracyInMetersThreshold);
-
     public abstract Builder navigationLocationEngineIntervalLagInMilliseconds(int lagInMilliseconds);
 
     public abstract MapboxNavigationOptions build();
@@ -70,7 +66,6 @@ public static Builder builder() {
       .isDebugLoggingEnabled(false)
       .roundingIncrement(ROUNDING_INCREMENT_FIFTY)
       .timeFormatType(NavigationTimeFormat.NONE_SPECIFIED)
-      .locationAcceptableAccuracyInMetersThreshold(NavigationConstants.ONE_HUNDRED_METER_ACCEPTABLE_ACCURACY_THRESHOLD)
       .navigationLocationEngineIntervalLagInMilliseconds(NAVIGATION_LOCATION_ENGINE_INTERVAL_LAG);
   }
 }

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java

@@ -112,18 +112,6 @@ private NavigationConstants() {
    */
   public static final int NAVIGATION_HIGH_ALERT_DURATION = 15;
 
-  /**
-   * Default location acceptable accuracy threshold
-   * used in {@link com.mapbox.services.android.navigation.v5.location.LocationValidator}.
-   * <p>
-   * If a new {@link android.location.Location} update is received from the LocationEngine that has
-   * an accuracy less than this threshold, the update will be considered valid and all other validation
-   * is not considered.
-   *
-   * @since 0.17.0
-   */
-  static final int ONE_HUNDRED_METER_ACCEPTABLE_ACCURACY_THRESHOLD = 100;
-
   /**
    * Default approximate location engine interval lag in milliseconds
    * <p>

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java

@@ -1,28 +1,26 @@
 package com.mapbox.services.android.navigation.v5.navigation;
 
+import android.annotation.SuppressLint;
 import android.location.Location;
 
 import com.mapbox.android.core.location.LocationEngine;
 import com.mapbox.android.core.location.LocationEngineListener;
-import com.mapbox.services.android.navigation.v5.location.LocationValidator;
 
 class NavigationLocationEngineListener implements LocationEngineListener {
 
   private final RouteProcessorBackgroundThread thread;
   private final LocationEngine locationEngine;
-  private final LocationValidator validator;
 
-  NavigationLocationEngineListener(RouteProcessorBackgroundThread thread, LocationEngine locationEngine,
-                                   LocationValidator validator) {
+  NavigationLocationEngineListener(RouteProcessorBackgroundThread thread, LocationEngine locationEngine) {
     this.thread = thread;
     this.locationEngine = locationEngine;
-    this.validator = validator;
   }
 
   @Override
   @SuppressWarnings("MissingPermission")
   public void onConnected() {
     locationEngine.requestLocationUpdates();
+    sendLastKnownLocation();
   }
 
   @Override
@@ -32,7 +30,11 @@ public void onLocationChanged(Location location) {
     }
   }
 
-  boolean isValidLocationUpdate(Location location) {
-    return location != null && validator.isValidUpdate(location);
+  @SuppressLint("MissingPermission")
+  private void sendLastKnownLocation() {
+    Location lastLocation = locationEngine.getLastLocation();
+    if (lastLocation != null) {
+      onLocationChanged(lastLocation);
+    }
   }
 }

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineListener.java

@@ -10,7 +10,6 @@
 
 import com.mapbox.android.core.location.LocationEngine;
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
-import com.mapbox.services.android.navigation.v5.location.LocationValidator;
 import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification;
 import com.mapbox.services.android.navigation.v5.route.FasterRoute;
 import com.mapbox.services.android.navigation.v5.route.RouteFetcher;
@@ -120,11 +119,7 @@ private void initializeRouteProcessorThread(MapboxNavigation mapboxNavigation,
 
   private void initializeLocationProvider(MapboxNavigation mapboxNavigation) {
     LocationEngine locationEngine = mapboxNavigation.getLocationEngine();
-    int accuracyThreshold = mapboxNavigation.options().locationAcceptableAccuracyInMetersThreshold();
-    LocationValidator validator = new LocationValidator(accuracyThreshold);
-    NavigationLocationEngineListener listener = new NavigationLocationEngineListener(
-      thread, locationEngine, validator
-    );
+    NavigationLocationEngineListener listener = new NavigationLocationEngineListener(thread, locationEngine);
     locationUpdater = new NavigationLocationEngineUpdater(locationEngine, listener);
   }
 

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java

@@ -3,12 +3,13 @@
 import android.location.Location;
 
 import com.mapbox.android.core.location.LocationEngine;
-import com.mapbox.services.android.navigation.v5.location.LocationValidator;
 
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class NavigationLocationEngineListenerTest {
 
@@ -22,6 +23,35 @@ public void onConnected_engineRequestsUpdates() {
     verify(locationEngine).requestLocationUpdates();
   }
 
+  @Test
+  public void onConnected_nonNullLastLocationIsSent() {
+    LocationEngine locationEngine = mock(LocationEngine.class);
+    Location location = mock(Location.class);
+    when(locationEngine.getLastLocation()).thenReturn(location);
+    RouteProcessorBackgroundThread thread = mock(RouteProcessorBackgroundThread.class);
+    NavigationLocationEngineListener listener = new NavigationLocationEngineListener(
+      thread, locationEngine
+    );
+
+    listener.onConnected();
+
+    verify(thread).updateRawLocation(location);
+  }
+
+  @Test
+  public void onConnected_nullLastLocationIsIgnored() {
+    LocationEngine locationEngine = mock(LocationEngine.class);
+    when(locationEngine.getLastLocation()).thenReturn(null);
+    RouteProcessorBackgroundThread thread = mock(RouteProcessorBackgroundThread.class);
+    NavigationLocationEngineListener listener = new NavigationLocationEngineListener(
+      thread, locationEngine
+    );
+
+    listener.onConnected();
+
+    verifyZeroInteractions(thread);
+  }
+
   @Test
   public void queueValidLocationUpdate_threadReceivesUpdate() {
     RouteProcessorBackgroundThread thread = mock(RouteProcessorBackgroundThread.class);
@@ -34,12 +64,10 @@ public void queueValidLocationUpdate_threadReceivesUpdate() {
   }
 
   private NavigationLocationEngineListener buildListener(RouteProcessorBackgroundThread thread) {
-    return new NavigationLocationEngineListener(thread, mock(LocationEngine.class),
-      mock(LocationValidator.class));
+    return new NavigationLocationEngineListener(thread, mock(LocationEngine.class));
   }
 
   private NavigationLocationEngineListener buildListener(LocationEngine locationEngine) {
-    return new NavigationLocationEngineListener(mock(RouteProcessorBackgroundThread.class),
-      locationEngine, mock(LocationValidator.class));
+    return new NavigationLocationEngineListener(mock(RouteProcessorBackgroundThread.class), locationEngine);
   }
 }