Report last known location when engine enabled (#148)

* Report last known location when engine enabled * Ensure only one initial last known location sent
lostzen · Dec 8, 2016 · de945b3 · de945b3
1 parent 9a23222
commit de945b3
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 3 deletions.
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusionEngine.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusionEngine.java
@@ -103,14 +103,35 @@ public FusionEngine(Context context, Callback callback) {
       }
     }
 
-    if (networkInterval < Long.MAX_VALUE) {
-      enableNetwork(networkInterval);
-    }
+    boolean checkGps = false;
     if (gpsInterval < Long.MAX_VALUE) {
       enableGps(gpsInterval);
+      checkGps = true;
+    }
+    if (networkInterval < Long.MAX_VALUE) {
+      enableNetwork(networkInterval);
+      if (checkGps) {
+        Location lastGps = locationManager.getLastKnownLocation(GPS_PROVIDER);
+        Location lastNetwork = locationManager.getLastKnownLocation(NETWORK_PROVIDER);
+        if (lastGps != null && lastNetwork != null) {
+          boolean useGps = isBetterThan(lastGps, lastNetwork);
+          if (useGps) {
+            checkLastKnownGps();
+          } else {
+            checkLastKnownNetwork();
+          }
+        } else if (lastGps != null) {
+          checkLastKnownGps();
+        } else {
+          checkLastKnownNetwork();
+        }
+      } else {
+        checkLastKnownNetwork();
+      }
     }
     if (passiveInterval < Long.MAX_VALUE) {
       enablePassive(passiveInterval);
+      checkLastKnownPassive();
     }
   }
 
@@ -144,6 +165,25 @@ private void enablePassive(long interval) throws SecurityException {
     }
   }
 
+  private void checkLastKnownGps() {
+    checkLastKnownAndNotify(GPS_PROVIDER);
+  }
+
+  private void checkLastKnownNetwork() {
+    checkLastKnownAndNotify(NETWORK_PROVIDER);
+  }
+
+  private void checkLastKnownPassive() {
+    checkLastKnownAndNotify(PASSIVE_PROVIDER);
+  }
+
+  private void checkLastKnownAndNotify(String provider) {
+    Location location = locationManager.getLastKnownLocation(provider);
+    if (location != null) {
+      onLocationChanged(location);
+    }
+  }
+
   @Override public void onLocationChanged(Location location) {
     if (GPS_PROVIDER.equals(location.getProvider())) {
       gpsLocation = location;

diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/FusionEngineTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/FusionEngineTest.java
@@ -287,6 +287,53 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     assertThat(callback.location).isEqualTo(networkLocation);
   }
 
+  @Test public void onLocationChanged_gps_shouldReportLastKnownLocation() throws Exception {
+    Location gpsLocation = new Location(GPS_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(GPS_PROVIDER, gpsLocation);
+
+    LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
+    fusionEngine.setRequest(request);
+
+    assertThat(callback.location).isEqualTo(gpsLocation);
+  }
+
+  @Test public void onLocationChanged_network_shouldReportLastKnownLocation() throws Exception {
+    Location networkLocation = new Location(NETWORK_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(NETWORK_PROVIDER, networkLocation);
+
+    LocationRequest request = LocationRequest.create().setPriority(
+        PRIORITY_BALANCED_POWER_ACCURACY);
+    fusionEngine.setRequest(request);
+
+    assertThat(callback.location).isEqualTo(networkLocation);
+  }
+
+  @Test public void onLocationChanged_gpsNetwork_shouldReportLastKnownLocation() throws Exception {
+    Location gpsLocation = new Location(GPS_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(GPS_PROVIDER, gpsLocation);
+    Location networkLocation = new Location(NETWORK_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(NETWORK_PROVIDER, networkLocation);
+
+    LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
+    fusionEngine.setRequest(request);
+
+    assertThat(callback.location).isEqualTo(networkLocation);
+  }
+
+  @Test public void onLocationChanged_gpsNetwork_shouldReportOneLastKnownLocation() throws
+      Exception {
+    Location gpsLocation = new Location(GPS_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(GPS_PROVIDER, gpsLocation);
+    Location networkLocation = new Location(NETWORK_PROVIDER);
+    shadowLocationManager.setLastKnownLocation(NETWORK_PROVIDER, networkLocation);
+
+    LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
+    fusionEngine.setRequest(request);
+
+    assertThat(callback.numLocationReports).isEqualTo(1);
+  }
+
+
   @Test public void isBetterThan_shouldReturnFalseIfLocationAIsNull() throws Exception {
     Location locationA = null;
     Location locationB = new Location("test");
@@ -369,9 +416,11 @@ private static Location getTestLocation(String provider, float lat, float lng, l
 
   class TestCallback implements LocationEngine.Callback {
     private Location location;
+    private int numLocationReports = 0;
 
     @Override public void reportLocation(Location location) {
       this.location = location;
+      numLocationReports++;
     }
 
     @Override public void reportProviderDisabled(String provider) {