From 40c3a4cb204eeffb9242676dfd12842308c7e27e Mon Sep 17 00:00:00 2001
From: Sarah Lensing <sarahlensing@gmail.com>
Date: Fri, 16 Jun 2017 14:31:39 -0400
Subject: [PATCH] Update engine's location requests (#215)

* Add equals & hashCode to LocationRequest

* remove location request and update engine when location updates removed

* Add sample for multiple clients w/diff request priorities

* newline

* batch request removal and improve request management
---
 lost-sample/src/main/AndroidManifest.xml      |   1 +
 ...ltiplePriorityMultipleClientsActivity.java | 105 +++++++
 .../java/com/example/lost/SamplesList.java    |   3 +
 .../activity_multiple_clients_requests.xml    |  36 +++
 lost-sample/src/main/res/values/strings.xml   |   2 +
 .../IFusedLocationProviderService.aidl        |   2 +-
 .../android/lost/api/LocationRequest.java     |  39 +++
 .../android/lost/api/LocationServices.java    |   3 +-
 .../lost/internal/ClientCallbackWrapper.java  |  41 +++
 .../FusedLocationProviderApiImpl.java         |  40 ++-
 .../FusedLocationProviderService.java         |   7 +-
 .../FusedLocationProviderServiceDelegate.java |   9 +-
 .../android/lost/internal/LocationEngine.java |  30 +-
 .../internal/LocationRequestUnbundled.java    |  15 +
 .../lost/internal/LostRequestManager.java     |  97 ++++++
 .../android/lost/internal/RequestManager.java |  32 ++
 .../FusedLocationProviderApiImplTest.java     |  85 +++++-
 ...edLocationProviderServiceDelegateTest.java |  17 +-
 .../lost/internal/FusionEngineTest.java       |  49 +--
 .../internal/LostRequestManagerTests.java     | 288 ++++++++++++++++++
 .../android/lost/internal/MockEngineTest.java |   2 +-
 .../lost/internal/TestServiceStub.java        |   5 +-
 22 files changed, 849 insertions(+), 59 deletions(-)
 create mode 100644 lost-sample/src/main/java/com/example/lost/MultiplePriorityMultipleClientsActivity.java
 create mode 100644 lost-sample/src/main/res/layout/activity_multiple_clients_requests.xml
 create mode 100644 lost/src/main/java/com/mapzen/android/lost/internal/ClientCallbackWrapper.java
 create mode 100644 lost/src/main/java/com/mapzen/android/lost/internal/LostRequestManager.java
 create mode 100644 lost/src/main/java/com/mapzen/android/lost/internal/RequestManager.java
 create mode 100644 lost/src/test/java/com/mapzen/android/lost/internal/LostRequestManagerTests.java

diff --git a/lost-sample/src/main/AndroidManifest.xml b/lost-sample/src/main/AndroidManifest.xml
index 457da0c..7a64379 100644
--- a/lost-sample/src/main/AndroidManifest.xml
+++ b/lost-sample/src/main/AndroidManifest.xml
@@ -37,6 +37,7 @@
     <activity android:name=".LocationAvailabilityActivity"/>
     <activity android:name=".MultipleLocationListenerMultipleClientsActivity"/>
     <activity android:name=".MultipleLocationListenerSingleClientActivity"/>
+    <activity android:name=".MultiplePriorityMultipleClientsActivity"/>
 
     <service
         android:name=".GeofenceIntentService"
diff --git a/lost-sample/src/main/java/com/example/lost/MultiplePriorityMultipleClientsActivity.java b/lost-sample/src/main/java/com/example/lost/MultiplePriorityMultipleClientsActivity.java
new file mode 100644
index 0000000..2317677
--- /dev/null
+++ b/lost-sample/src/main/java/com/example/lost/MultiplePriorityMultipleClientsActivity.java
@@ -0,0 +1,105 @@
+package com.example.lost;
+
+import com.mapzen.android.lost.api.LocationListener;
+import com.mapzen.android.lost.api.LocationRequest;
+import com.mapzen.android.lost.api.LocationServices;
+import com.mapzen.android.lost.api.LostApiClient;
+
+import android.location.Location;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.View;
+
+/**
+ * Demonstrates two {@link LostApiClient}s receiving location updates with different request
+ * priorities.
+ */
+public class MultiplePriorityMultipleClientsActivity extends LostApiClientActivity {
+
+  private static final String TAG = MultiplePriorityMultipleClientsActivity.class.getSimpleName();
+
+  LostApiClient otherClient;
+
+  LocationListener noPowerListener = new LocationListener() {
+    @Override public void onLocationChanged(Location location) {
+      Log.d(TAG, "No Power Client Location:" + location.getLongitude() + " " +
+          location.getLatitude());
+    }
+  };
+
+  LocationListener highPriorityListener = new LocationListener() {
+    @Override public void onLocationChanged(Location location) {
+      Log.d(TAG, "High Priority Client Location:" + location.getLongitude() + " " +
+          location.getLatitude());
+    }
+  };
+
+  @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_multiple_clients_requests);
+    createOtherClient();
+    setupBtns();
+  }
+
+  @Override public void onConnected() {
+    super.onConnected();
+    requestNoPowerUpdates();
+  }
+
+  private void setupBtns() {
+    findViewById(R.id.connect_no_power_btn).setOnClickListener(new View.OnClickListener() {
+      @Override public void onClick(View v) {
+        client.connect();
+      }
+    });
+    findViewById(R.id.connect_high_priority_btn).setOnClickListener(new View.OnClickListener() {
+      @Override public void onClick(View v) {
+        otherClient.connect();
+      }
+    });
+    findViewById(R.id.rm_no_power_btn).setOnClickListener(new View.OnClickListener() {
+      @Override public void onClick(View v) {
+        LocationServices.FusedLocationApi.removeLocationUpdates(client, noPowerListener);
+      }
+    });
+    findViewById(R.id.rm_high_priority_btn).setOnClickListener(new View.OnClickListener() {
+      @Override public void onClick(View v) {
+        LocationServices.FusedLocationApi.removeLocationUpdates(otherClient, highPriorityListener);
+      }
+    });
+  }
+
+  private void requestNoPowerUpdates() {
+    LocationRequest request = LocationRequest.create()
+        .setPriority(LocationRequest.PRIORITY_NO_POWER)
+        .setFastestInterval(0)
+        .setSmallestDisplacement(0)
+        .setInterval(1000); // 1 sec
+    LocationServices.FusedLocationApi.requestLocationUpdates(client, request, noPowerListener);
+  }
+
+  private void createOtherClient() {
+    otherClient = new LostApiClient.Builder(this)
+        .addConnectionCallbacks(new LostApiClient.ConnectionCallbacks() {
+
+          @Override public void onConnected() {
+            Log.d("Test", "High priority onConnected");
+
+            LocationRequest request = LocationRequest.create()
+                .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+                .setFastestInterval(0)
+                .setSmallestDisplacement(0)
+                .setInterval(1000); // 1 sec
+
+            LocationServices.FusedLocationApi.requestLocationUpdates(otherClient, request,
+                highPriorityListener);
+          }
+
+          @Override public void onConnectionSuspended() {
+
+          }
+        })
+        .build();
+  }
+}
diff --git a/lost-sample/src/main/java/com/example/lost/SamplesList.java b/lost-sample/src/main/java/com/example/lost/SamplesList.java
index 9e0ae13..491c79b 100644
--- a/lost-sample/src/main/java/com/example/lost/SamplesList.java
+++ b/lost-sample/src/main/java/com/example/lost/SamplesList.java
@@ -20,6 +20,9 @@ private SamplesList() {
       new Sample(R.string.sample_multiple_clients_diff_intervals_title,
           R.string.sample_multiple_clients_diff_intervals_description,
           MultipleLocationListenerMultipleClientsActivity.class),
+      new Sample(R.string.sample_multiple_clients_priorities_title,
+          R.string.sample_multiple_clients_priorities_description,
+          MultiplePriorityMultipleClientsActivity.class),
       new Sample(R.string.sample_single_client_diff_intervals_title,
           R.string.sample_single_client_diff_intervals_description,
           MultipleLocationListenerSingleClientActivity.class),
diff --git a/lost-sample/src/main/res/layout/activity_multiple_clients_requests.xml b/lost-sample/src/main/res/layout/activity_multiple_clients_requests.xml
new file mode 100644
index 0000000..d5e038d
--- /dev/null
+++ b/lost-sample/src/main/res/layout/activity_multiple_clients_requests.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <Button
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Connect no power client"
+      android:id="@+id/connect_no_power_btn"
+      />
+
+  <Button
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Connect high priority client"
+      android:id="@+id/connect_high_priority_btn"
+      />
+
+  <Button
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Rm no power requests"
+      android:id="@+id/rm_no_power_btn"
+      />
+
+  <Button
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="Rm high priority requests"
+      android:id="@+id/rm_high_priority_btn"
+      />
+
+
+</LinearLayout>
diff --git a/lost-sample/src/main/res/values/strings.xml b/lost-sample/src/main/res/values/strings.xml
index 26c2ac8..745d9cd 100644
--- a/lost-sample/src/main/res/values/strings.xml
+++ b/lost-sample/src/main/res/values/strings.xml
@@ -80,5 +80,7 @@
   <string name="sample_multiple_clients_diff_intervals_description">Demonstrates how multiple clients can request location updates at different fastest intervals</string>
   <string name="sample_single_client_diff_intervals_title">Single Client w/different Intervals</string>
   <string name="sample_single_client_diff_intervals_description">Demonstrates how a single client can request location updates at different fastest intervals</string>
+  <string name="sample_multiple_clients_priorities_title">Multiple Clients w/different request priorities</string>
+  <string name="sample_multiple_clients_priorities_description">Demonstrates multiple clients receiving location requests for different location priorities</string>
 
 </resources>
diff --git a/lost/src/main/aidl/com/mapzen/android/lost/internal/IFusedLocationProviderService.aidl b/lost/src/main/aidl/com/mapzen/android/lost/internal/IFusedLocationProviderService.aidl
index 54ae9db..fc0292c 100644
--- a/lost/src/main/aidl/com/mapzen/android/lost/internal/IFusedLocationProviderService.aidl
+++ b/lost/src/main/aidl/com/mapzen/android/lost/internal/IFusedLocationProviderService.aidl
@@ -14,7 +14,7 @@ interface IFusedLocationProviderService {
 
   void requestLocationUpdates(in LocationRequest request);
 
-  void removeLocationUpdates();
+  void removeLocationUpdates(in List<LocationRequest> requests);
 
   void setMockMode(boolean isMockMode);
 
diff --git a/lost/src/main/java/com/mapzen/android/lost/api/LocationRequest.java b/lost/src/main/java/com/mapzen/android/lost/api/LocationRequest.java
index a47affd..12bb2fc 100644
--- a/lost/src/main/java/com/mapzen/android/lost/api/LocationRequest.java
+++ b/lost/src/main/java/com/mapzen/android/lost/api/LocationRequest.java
@@ -25,6 +25,13 @@ public static LocationRequest create() {
     return new LocationRequest();
   }
 
+  public LocationRequest(LocationRequest incoming) {
+    this.setInterval(incoming.getInterval());
+    this.setFastestInterval(incoming.getFastestInterval());
+    this.setSmallestDisplacement(incoming.getSmallestDisplacement());
+    this.setPriority(incoming.getPriority());
+  }
+
   public long getInterval() {
     return interval;
   }
@@ -73,6 +80,38 @@ public LocationRequest setPriority(int priority) {
     return this;
   }
 
+  @Override public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    LocationRequest that = (LocationRequest) o;
+
+    if (interval != that.interval) {
+      return false;
+    }
+    if (fastestInterval != that.fastestInterval) {
+      return false;
+    }
+    if (Float.compare(that.smallestDisplacement, smallestDisplacement) != 0) {
+      return false;
+    }
+    return priority == that.priority;
+  }
+
+  @Override public int hashCode() {
+    int result = (int) (interval ^ (interval >>> 32));
+    result = 31 * result + (int) (fastestInterval ^ (fastestInterval >>> 32));
+    result =
+        31 * result + (smallestDisplacement != +0.0f ? Float.floatToIntBits(smallestDisplacement)
+            : 0);
+    result = 31 * result + priority;
+    return result;
+  }
+
   @Override public int describeContents() {
     return 0;
   }
diff --git a/lost/src/main/java/com/mapzen/android/lost/api/LocationServices.java b/lost/src/main/java/com/mapzen/android/lost/api/LocationServices.java
index 19155e0..5dffab3 100644
--- a/lost/src/main/java/com/mapzen/android/lost/api/LocationServices.java
+++ b/lost/src/main/java/com/mapzen/android/lost/api/LocationServices.java
@@ -6,6 +6,7 @@
 import com.mapzen.android.lost.internal.FusedLocationServiceConnectionManager;
 import com.mapzen.android.lost.internal.GeofencingApiImpl;
 import com.mapzen.android.lost.internal.GeofencingServiceIntentFactory;
+import com.mapzen.android.lost.internal.LostRequestManager;
 import com.mapzen.android.lost.internal.PendingIntentIdGenerator;
 import com.mapzen.android.lost.internal.SettingsApiImpl;
 
@@ -19,7 +20,7 @@ public class LocationServices {
    */
   public static final FusedLocationProviderApi FusedLocationApi =
       new FusedLocationProviderApiImpl(new FusedLocationServiceConnectionManager(),
-          new FusedLocationServiceCallbackManager());
+          new FusedLocationServiceCallbackManager(), LostRequestManager.shared());
 
   /**
    * Entry point for APIs concerning geofences.
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/ClientCallbackWrapper.java b/lost/src/main/java/com/mapzen/android/lost/internal/ClientCallbackWrapper.java
new file mode 100644
index 0000000..5b526d7
--- /dev/null
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/ClientCallbackWrapper.java
@@ -0,0 +1,41 @@
+package com.mapzen.android.lost.internal;
+
+import com.mapzen.android.lost.api.LostApiClient;
+
+
+/**
+ * Wraps a {@link LostApiClient} to either a {@link com.mapzen.android.lost.api.LocationListener},
+ * {@link android.app.PendingIntent}, or {@link com.mapzen.android.lost.api.LocationCallback}.
+ */
+class ClientCallbackWrapper {
+
+  private LostApiClient client;
+  private Object callback;
+
+  public <T> ClientCallbackWrapper(LostApiClient client, T callback) {
+    this.client = client;
+    this.callback = callback;
+  }
+
+  @Override public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    ClientCallbackWrapper wrapper = (ClientCallbackWrapper) o;
+
+    if (!client.equals(wrapper.client)) {
+      return false;
+    }
+    return callback.equals(wrapper.callback);
+  }
+
+  @Override public int hashCode() {
+    int result = client.hashCode();
+    result = 31 * result + callback.hashCode();
+    return result;
+  }
+}
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java
index 8ebfe6c..3fda5c9 100644
--- a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImpl.java
@@ -21,6 +21,7 @@
 import android.os.Looper;
 import android.os.RemoteException;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -33,6 +34,7 @@ public class FusedLocationProviderApiImpl extends ApiImpl
   private Context context;
   private FusedLocationServiceConnectionManager serviceConnectionManager;
   private FusedLocationServiceCallbackManager serviceCallbackManager;
+  private RequestManager requestManager;
   private boolean isBound;
 
   IFusedLocationProviderService service;
@@ -88,9 +90,10 @@ public void onLocationChanged(final Location location) throws RemoteException {
   }
 
   public FusedLocationProviderApiImpl(FusedLocationServiceConnectionManager connectionManager,
-      FusedLocationServiceCallbackManager callbackManager) {
+      FusedLocationServiceCallbackManager callbackManager, RequestManager requestManager) {
     serviceConnectionManager = connectionManager;
     serviceCallbackManager = callbackManager;
+    this.requestManager = requestManager;
     serviceConnectionManager.setEventCallbacks(this);
   }
 
@@ -135,6 +138,7 @@ public boolean isConnected() {
   @Override public PendingResult<Status> requestLocationUpdates(LostApiClient client,
       LocationRequest request, LocationListener listener) {
     throwIfNotConnected(client);
+    requestManager.requestLocationUpdates(client, request, listener);
     LostClientManager.shared().addListener(client, request, listener);
     requestLocationUpdatesInternal(request);
     return new SimplePendingResult(true);
@@ -148,6 +152,7 @@ public boolean isConnected() {
   @Override public PendingResult<Status> requestLocationUpdates(LostApiClient client,
       LocationRequest request, LocationCallback callback, Looper looper) {
     throwIfNotConnected(client);
+    requestManager.requestLocationUpdates(client, request, callback);
     LostClientManager.shared().addLocationCallback(client, request, callback, looper);
     requestLocationUpdatesInternal(request);
     return new SimplePendingResult(true);
@@ -156,6 +161,7 @@ public boolean isConnected() {
   @Override public PendingResult<Status> requestLocationUpdates(LostApiClient client,
       LocationRequest request, PendingIntent callbackIntent) {
     throwIfNotConnected(client);
+    requestManager.requestLocationUpdates(client, request, callbackIntent);
     LostClientManager.shared().addPendingIntent(client, request, callbackIntent);
     requestLocationUpdatesInternal(request);
     return new SimplePendingResult(true);
@@ -173,9 +179,22 @@ private void requestLocationUpdatesInternal(LocationRequest request) {
     }
   }
 
+  private void removeLocationUpdatesInternal(List<LocationRequest> requests) {
+    if (requests == null) {
+      return;
+    }
+    try {
+      service.removeLocationUpdates(requests);
+    } catch (RemoteException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   @Override public PendingResult<Status> removeLocationUpdates(LostApiClient client,
       LocationListener listener) {
     throwIfNotConnected(client);
+    List<LocationRequest> requests = requestManager.removeLocationUpdates(client, listener);
+    removeLocationUpdatesInternal(requests);
     boolean hasResult = LostClientManager.shared().removeListener(client, listener);
     checkAllListenersPendingIntentsAndCallbacks();
     return new SimplePendingResult(hasResult);
@@ -184,6 +203,8 @@ private void requestLocationUpdatesInternal(LocationRequest request) {
   @Override public PendingResult<Status> removeLocationUpdates(LostApiClient client,
       PendingIntent callbackIntent) {
     throwIfNotConnected(client);
+    List<LocationRequest> requests = requestManager.removeLocationUpdates(client, callbackIntent);
+    removeLocationUpdatesInternal(requests);
     boolean hasResult = LostClientManager.shared().removePendingIntent(client, callbackIntent);
     checkAllListenersPendingIntentsAndCallbacks();
     return new SimplePendingResult(hasResult);
@@ -192,6 +213,8 @@ private void requestLocationUpdatesInternal(LocationRequest request) {
   @Override public PendingResult<Status> removeLocationUpdates(LostApiClient client,
       LocationCallback callback) {
     throwIfNotConnected(client);
+    List<LocationRequest> requests = requestManager.removeLocationUpdates(client, callback);
+    removeLocationUpdatesInternal(requests);
     boolean hasResult = LostClientManager.shared().removeLocationCallback(client, callback);
     checkAllListenersPendingIntentsAndCallbacks();
     return new SimplePendingResult(hasResult);
@@ -202,13 +225,14 @@ private void requestLocationUpdatesInternal(LocationRequest request) {
    * then shutdown the location engines.
    */
   private void checkAllListenersPendingIntentsAndCallbacks() {
-    if (LostClientManager.shared().hasNoListeners()) {
-      try {
-        service.removeLocationUpdates();
-      } catch (RemoteException e) {
-        throw new RuntimeException(e);
-      }
-    }
+    //TODO: potentially remove hasNoListeners method, not needed anymore
+    //if (LostClientManager.shared().hasNoListeners()) {
+    //  try {
+    //    service.removeAllLocationUpdates();
+    //  } catch (RemoteException e) {
+    //    throw new RuntimeException(e);
+    //  }
+    //}
   }
 
   @Override public PendingResult<Status> setMockMode(LostApiClient client, boolean isMockMode) {
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderService.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderService.java
index cbb972a..518e850 100644
--- a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderService.java
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderService.java
@@ -10,6 +10,8 @@
 import android.os.RemoteException;
 import android.support.annotation.Nullable;
 
+import java.util.List;
+
 /**
  * Service which runs the fused location provider in the background.
  */
@@ -36,8 +38,9 @@ public class FusedLocationProviderService extends Service {
           delegate.requestLocationUpdates(request);
         }
 
-        @Override public void removeLocationUpdates() throws RemoteException {
-          delegate.removeLocationUpdates();
+        @Override public void removeLocationUpdates(List<LocationRequest> requests)
+            throws RemoteException {
+          delegate.removeLocationUpdates(requests);
         }
 
         @Override public void setMockMode(boolean isMockMode) throws RemoteException {
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegate.java b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegate.java
index 087d121..5a2b0c6 100644
--- a/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegate.java
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegate.java
@@ -12,6 +12,7 @@
 import android.support.annotation.RequiresPermission;
 
 import java.io.File;
+import java.util.List;
 
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
@@ -43,11 +44,11 @@ public LocationAvailability getLocationAvailability() {
   }
 
   public void requestLocationUpdates(LocationRequest request) {
-    locationEngine.setRequest(request);
+    locationEngine.addRequest(request);
   }
 
-  public void removeLocationUpdates() {
-    locationEngine.setRequest(null);
+  public void removeLocationUpdates(List<LocationRequest> requests) {
+    locationEngine.removeRequests(requests);
   }
 
   public void setMockMode(boolean isMockMode) {
@@ -114,7 +115,7 @@ public void onProviderDisabled(String s) {
 
   private void toggleMockMode() {
     mockMode = !mockMode;
-    locationEngine.setRequest(null);
+    locationEngine.removeAllRequests();
     if (mockMode) {
       locationEngine = new MockEngine(context, this, new GpxTraceThreadFactory());
     } else {
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/LocationEngine.java b/lost/src/main/java/com/mapzen/android/lost/internal/LocationEngine.java
index 2724d5f..e4641b8 100644
--- a/lost/src/main/java/com/mapzen/android/lost/internal/LocationEngine.java
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/LocationEngine.java
@@ -9,6 +9,8 @@
 import android.os.Looper;
 import android.support.annotation.RequiresPermission;
 
+import java.util.List;
+
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
 
@@ -35,21 +37,37 @@ public LocationEngine(Context context, Callback callback) {
   public abstract boolean isProviderEnabled(String provider);
 
   /**
-   * Enables the engine on receiving a valid location request. Disables the engine on receiving a
-   * {@code null} request.
+   * Enables the engine on receiving a valid location request.
    *
-   * @param request Valid location request to enable or {@code null} to disable.
+   * @param request Valid location request to enable.
    */
-  public void setRequest(LocationRequest request) {
+  public void addRequest(LocationRequest request) {
     if (request != null) {
       this.request.addRequest(request);
       enable();
-    } else {
-      this.request.removeAllRequests();
+    }
+  }
+
+  /**
+   * Disables the engine when no requests remain, otherwise updates the engine's configuration.
+   *
+   * @param request Valid location request to enable.
+   */
+  public void removeRequests(List<LocationRequest> requests) {
+    if (request != null) {
+      this.request.removeRequests(requests);
       disable();
+      if (!this.request.getRequests().isEmpty()) {
+        enable();
+      }
     }
   }
 
+  public void removeAllRequests() {
+    this.request.removeAllRequests();
+    disable();
+  }
+
   /**
    * Subclass should perform all operations required to enable the engine. (ex. Register for
    * location updates.)
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/LocationRequestUnbundled.java b/lost/src/main/java/com/mapzen/android/lost/internal/LocationRequestUnbundled.java
index 57fa8af..5751d33 100644
--- a/lost/src/main/java/com/mapzen/android/lost/internal/LocationRequestUnbundled.java
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/LocationRequestUnbundled.java
@@ -20,6 +20,11 @@ public void addRequest(LocationRequest request) {
     requests.add(request);
   }
 
+  public void removeRequests(List<LocationRequest> requests) {
+    this.requests.removeAll(requests);
+    fastestInterval = calculateFastestInterval();
+  }
+
   public void removeAllRequests() {
     fastestInterval = Long.MAX_VALUE;
     requests.clear();
@@ -32,4 +37,14 @@ public List<LocationRequest> getRequests() {
   public long getFastestInterval() {
     return fastestInterval;
   }
+
+  public long calculateFastestInterval() {
+    long interval = Long.MAX_VALUE;
+    for (LocationRequest request : requests) {
+      if (request.getFastestInterval() < interval) {
+        interval = request.getFastestInterval();
+      }
+    }
+    return interval;
+  }
 }
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/LostRequestManager.java b/lost/src/main/java/com/mapzen/android/lost/internal/LostRequestManager.java
new file mode 100644
index 0000000..7e2c9fa
--- /dev/null
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/LostRequestManager.java
@@ -0,0 +1,97 @@
+package com.mapzen.android.lost.internal;
+
+import com.mapzen.android.lost.api.LocationCallback;
+import com.mapzen.android.lost.api.LocationListener;
+import com.mapzen.android.lost.api.LocationRequest;
+import com.mapzen.android.lost.api.LostApiClient;
+
+import android.app.PendingIntent;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Manages requests for {@link ClientCallbackWrapper}s so that the system can properly remove
+ * unused requests from the {@link LocationEngine}.
+ */
+public class LostRequestManager implements RequestManager {
+
+  private static LostRequestManager instance;
+  private Map<ClientCallbackWrapper, List<LocationRequest>> clientCallbackToLocationRequests;
+
+  LostRequestManager() {
+    clientCallbackToLocationRequests = new HashMap<>();
+  }
+
+  public static LostRequestManager shared() {
+    if (instance == null) {
+      instance = new LostRequestManager();
+    }
+    return instance;
+  }
+
+  @Override public void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      LocationListener listener) {
+    ClientCallbackWrapper wrapper = getWrapper(client, listener);
+    registerRequest(wrapper, request);
+  }
+
+  @Override public void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      LocationCallback callback) {
+    ClientCallbackWrapper wrapper = getWrapper(client, callback);
+    registerRequest(wrapper, request);
+  }
+
+  @Override public void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      PendingIntent callbackIntent) {
+    ClientCallbackWrapper wrapper = getWrapper(client, callbackIntent);
+    registerRequest(wrapper, request);
+  }
+
+  @Override public List<LocationRequest> removeLocationUpdates(LostApiClient client,
+      LocationListener listener) {
+    ClientCallbackWrapper wrapper = getWrapper(client, listener);
+    return getRequestOnlyUsedBy(wrapper);
+  }
+
+  @Override public List<LocationRequest> removeLocationUpdates(LostApiClient client,
+      PendingIntent callbackIntent) {
+    ClientCallbackWrapper wrapper = getWrapper(client, callbackIntent);
+    return getRequestOnlyUsedBy(wrapper);
+  }
+
+  @Override public List<LocationRequest> removeLocationUpdates(LostApiClient client,
+      LocationCallback callback) {
+    ClientCallbackWrapper wrapper = getWrapper(client, callback);
+    return getRequestOnlyUsedBy(wrapper);
+  }
+
+  private <T> ClientCallbackWrapper getWrapper(LostApiClient client, T callback) {
+    return new ClientCallbackWrapper(client, callback);
+  }
+
+  private void registerRequest(ClientCallbackWrapper wrapper, LocationRequest request) {
+    List<LocationRequest> requests = clientCallbackToLocationRequests.get(wrapper);
+    if (requests == null) {
+      requests = new ArrayList();
+      clientCallbackToLocationRequests.put(wrapper, requests);
+    }
+    LocationRequest r = new LocationRequest(request);
+    requests.add(r);
+  }
+
+  private List<LocationRequest> getRequestOnlyUsedBy(ClientCallbackWrapper wrapper) {
+    List<LocationRequest> requestsToRemove = clientCallbackToLocationRequests.get(wrapper);
+    if (requestsToRemove == null) {
+      return null;
+    }
+    clientCallbackToLocationRequests.remove(wrapper);
+    return requestsToRemove;
+  }
+
+  Map<ClientCallbackWrapper, List<LocationRequest>> getClientCallbackMap() {
+    return clientCallbackToLocationRequests;
+  }
+}
diff --git a/lost/src/main/java/com/mapzen/android/lost/internal/RequestManager.java b/lost/src/main/java/com/mapzen/android/lost/internal/RequestManager.java
new file mode 100644
index 0000000..43ade0d
--- /dev/null
+++ b/lost/src/main/java/com/mapzen/android/lost/internal/RequestManager.java
@@ -0,0 +1,32 @@
+package com.mapzen.android.lost.internal;
+
+import com.mapzen.android.lost.api.LocationCallback;
+import com.mapzen.android.lost.api.LocationListener;
+import com.mapzen.android.lost.api.LocationRequest;
+import com.mapzen.android.lost.api.LostApiClient;
+
+import android.app.PendingIntent;
+
+import java.util.List;
+
+/**
+ * Keeps track of which {@link LocationListener}s, {@link PendingIntent}s, and
+ * {@link LocationCallback}s have made which {@link LocationRequest}s so that requests can be
+ * properly removed from the underlying {@link LocationEngine}.
+ */
+interface RequestManager {
+  void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      LocationListener listener);
+
+  void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      LocationCallback callback);
+
+  void requestLocationUpdates(LostApiClient client, LocationRequest request,
+      PendingIntent callbackIntent);
+
+  List<LocationRequest> removeLocationUpdates(LostApiClient client, LocationListener listener);
+
+  List<LocationRequest> removeLocationUpdates(LostApiClient client, PendingIntent callbackIntent);
+
+  List<LocationRequest> removeLocationUpdates(LostApiClient client, LocationCallback callback);
+}
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java
index 580b332..8e594fd 100644
--- a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderApiImplTest.java
@@ -26,6 +26,8 @@
 import android.os.Looper;
 import android.support.annotation.NonNull;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static org.fest.assertions.api.Assertions.assertThat;
@@ -35,6 +37,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.robolectric.RuntimeEnvironment.application;
 
 @RunWith(RobolectricTestRunner.class)
@@ -44,6 +47,7 @@ public class FusedLocationProviderApiImplTest extends BaseRobolectricTest {
 
   private LostApiClient connectedClient;
   private LostApiClient disconnectedClient;
+  private RequestManager requestManager;
   private FusedLocationProviderApiImpl api;
   private IFusedLocationProviderService service = mock(IFusedLocationProviderService.class);
   private FusedLocationServiceConnectionManager connectionManager;
@@ -57,12 +61,13 @@ public class FusedLocationProviderApiImplTest extends BaseRobolectricTest {
     disconnectedClient = new LostApiClient.Builder(RuntimeEnvironment.application).build();
 
     connectionManager = spy(new FusedLocationServiceConnectionManager());
+    requestManager = mock(RequestManager.class);
     Mockito.doCallRealMethod().when(connectionManager).setEventCallbacks(any(
         FusedLocationServiceConnectionManager.EventCallbacks.class));
     Mockito.doCallRealMethod().when(connectionManager).connect(any(Context.class), any(
         LostApiClient.ConnectionCallbacks.class));
     api = new FusedLocationProviderApiImpl(connectionManager,
-        new FusedLocationServiceCallbackManager());
+        new FusedLocationServiceCallbackManager(), requestManager);
     api.connect(application, null);
     api.service = service;
   }
@@ -198,20 +203,35 @@ public void removeLocationUpdates_callback_shouldThrowIfNotConnected() throws Ex
 
   @Test public void removeLocationUpdates_listener_shouldCallService() throws Exception {
     LocationListener listener = new TestLocationListener();
+    LocationRequest request = LocationRequest.create();
+    List<LocationRequest> requests = new ArrayList<>();
+    requests.add(request);
+    when(requestManager.removeLocationUpdates(connectedClient, listener)).
+        thenReturn(requests);
     api.removeLocationUpdates(connectedClient, listener);
-    verify(service).removeLocationUpdates();
+    verify(service).removeLocationUpdates(any(List.class));
   }
 
   @Test public void removeLocationUpdates_pendingIntent_shouldCallService() throws Exception {
     PendingIntent callbackIntent = mock(PendingIntent.class);
+    LocationRequest request = LocationRequest.create();
+    List<LocationRequest> requests = new ArrayList<>();
+    requests.add(request);
+    when(requestManager.removeLocationUpdates(connectedClient, callbackIntent)).
+        thenReturn(requests);
     api.removeLocationUpdates(connectedClient, callbackIntent);
-    verify(service).removeLocationUpdates();
+    verify(service).removeLocationUpdates(requests);
   }
 
   @Test public void removeLocationUpdates_callback_shouldCallService() throws Exception {
     TestLocationCallback callback = new TestLocationCallback();
+    LocationRequest request = LocationRequest.create();
+    List<LocationRequest> requests = new ArrayList<>();
+    requests.add(request);
+    when(requestManager.removeLocationUpdates(connectedClient, callback)).
+        thenReturn(requests);
     api.removeLocationUpdates(connectedClient, callback);
-    verify(service).removeLocationUpdates();
+    verify(service).removeLocationUpdates(requests);
   }
 
   @Test(expected = IllegalStateException.class)
@@ -366,19 +386,68 @@ public void setMockTrace_shouldThrowIfNotConnected() throws Exception {
   @Test public void removeLocationUpdates_shouldKillEngineIfNoListenersStillActive()
       throws Exception {
     TestLocationListener listener = new TestLocationListener();
-    api.requestLocationUpdates(connectedClient, LocationRequest.create(), listener);
+    LocationRequest request = LocationRequest.create();
+    List<LocationRequest> requests = new ArrayList<>();
+    requests.add(request);
+    when(requestManager.removeLocationUpdates(connectedClient, listener)).
+        thenReturn(requests);
+    api.requestLocationUpdates(connectedClient, request, listener);
     api.removeLocationUpdates(connectedClient, listener);
-    verify(service).removeLocationUpdates();
+    verify(service).removeLocationUpdates(requests);
   }
 
   @Test public void removeLocationUpdates_shouldNotKillEngineIfListenerStillActive()
       throws Exception {
     TestLocationListener listener1 = new TestLocationListener();
     TestLocationListener listener2 = new TestLocationListener();
-    api.requestLocationUpdates(connectedClient, LocationRequest.create(), listener1);
+    LocationRequest request = LocationRequest.create();
+    List<LocationRequest> requests = new ArrayList<>();
+    requests.add(request);
+    when(requestManager.removeLocationUpdates(connectedClient, listener1)).
+        thenReturn(requests);
+    api.requestLocationUpdates(connectedClient, request, listener1);
     api.requestLocationUpdates(connectedClient, LocationRequest.create(), listener2);
     api.removeLocationUpdates(connectedClient, listener1);
-    verify(service, never()).removeLocationUpdates();
+    verify(service).removeLocationUpdates(requests);
+  }
+
+  @Test public void removeLocationUpdates_listener_shouldCallRequestManager() {
+    LocationListener listener = mock(LocationListener.class);
+    api.removeLocationUpdates(connectedClient, listener);
+    verify(requestManager).removeLocationUpdates(connectedClient, listener);
+  }
+
+  @Test public void removeLocationUpdates_pendingIntent_shouldCallRequestManager() {
+    PendingIntent intent = mock(PendingIntent.class);
+    api.removeLocationUpdates(connectedClient, intent);
+    verify(requestManager).removeLocationUpdates(connectedClient, intent);
+  }
+
+  @Test public void removeLocationUpdates_callback_shouldCallRequestManager() {
+    LocationCallback callback = mock(LocationCallback.class);
+    api.removeLocationUpdates(connectedClient, callback);
+    verify(requestManager).removeLocationUpdates(connectedClient, callback);
+  }
+
+  @Test public void requestLocationUpdates_listener_shouldCallRequestManager() {
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    api.requestLocationUpdates(connectedClient, request, listener);
+    verify(requestManager).requestLocationUpdates(connectedClient, request, listener);
+  }
+
+  @Test public void requestLocationUpdates_pendingIntent_shouldCallRequestManager() {
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    api.requestLocationUpdates(connectedClient, request, intent);
+    verify(requestManager).requestLocationUpdates(connectedClient, request, intent);
+  }
+
+  @Test public void requestLocationUpdates_callback_shouldCallRequestManager() {
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    api.requestLocationUpdates(connectedClient, request, callback, mock(Looper.class));
+    verify(requestManager).requestLocationUpdates(connectedClient, request, callback);
   }
 
   @Test public void requestLocationUpdates_listener_shouldReturnFusedLocationPendingResult() {
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegateTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegateTest.java
index d9174c6..8b21b44 100644
--- a/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegateTest.java
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/FusedLocationProviderServiceDelegateTest.java
@@ -31,6 +31,8 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static android.content.Context.LOCATION_SERVICE;
 import static android.location.LocationManager.GPS_PROVIDER;
@@ -134,8 +136,11 @@ public class FusedLocationProviderServiceDelegateTest extends BaseRobolectricTes
   }
 
   @Test public void removeLocationUpdates_shouldUnregisterAllListeners() throws Exception {
-    delegate.requestLocationUpdates(LocationRequest.create());
-    delegate.removeLocationUpdates();
+    LocationRequest request = LocationRequest.create();
+    List requests = new ArrayList();
+    requests.add(request);
+    delegate.requestLocationUpdates(request);
+    delegate.removeLocationUpdates(requests);
     assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).isEmpty();
   }
 
@@ -264,8 +269,10 @@ private void initTestGpxTrace() throws IOException {
       throws Exception {
     LocationRequest locationRequest =
         LocationRequest.create().setPriority(PRIORITY_BALANCED_POWER_ACCURACY);
+    List requests = new ArrayList();
+    requests.add(locationRequest);
     delegate.requestLocationUpdates(locationRequest);
-    delegate.removeLocationUpdates();
+    delegate.removeLocationUpdates(requests);
     assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).isEmpty();
   }
 
@@ -337,8 +344,10 @@ private void initTestGpxTrace() throws IOException {
 
   @Test public void removeLocationUpdates_locationCallback_shouldUnregisterAllListeners() {
     LocationRequest request = LocationRequest.create();
+    List requests = new ArrayList();
+    requests.add(request);
     delegate.requestLocationUpdates(request);
-    delegate.removeLocationUpdates();
+    delegate.removeLocationUpdates(requests);
     assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).isEmpty();
   }
 
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
index 4ee229c..e25d213 100644
--- a/lost/src/test/java/com/mapzen/android/lost/internal/FusionEngineTest.java
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/FusionEngineTest.java
@@ -149,51 +149,54 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     assertThat(fusionEngine.getLastLocation()).isNull();
   }
 
-  @Test public void setRequest_shouldRegisterGpsAndNetworkIfPriorityHighAccuracy()
+  @Test public void addRequest_shouldRegisterGpsAndNetworkIfPriorityHighAccuracy()
       throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
     Collection<String> providers = shadowLocationManager.getProvidersForListener(fusionEngine);
     assertThat(providers).hasSize(2);
     assertThat(providers).contains(GPS_PROVIDER);
     assertThat(providers).contains(NETWORK_PROVIDER);
   }
 
-  @Test public void setRequest_shouldRegisterNetworkOnlyIfPriorityBalanced() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_BALANCED_POWER_ACCURACY));
+  @Test public void addRequest_shouldRegisterNetworkOnlyIfPriorityBalanced() throws Exception {
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_BALANCED_POWER_ACCURACY));
     Collection<String> providers = shadowLocationManager.getProvidersForListener(fusionEngine);
     assertThat(providers).hasSize(1);
     assertThat(providers).contains(NETWORK_PROVIDER);
   }
 
-  @Test public void setRequest_shouldRegisterNetworkOnlyIfPriorityLowPower() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_LOW_POWER));
+  @Test public void addRequest_shouldRegisterNetworkOnlyIfPriorityLowPower() throws Exception {
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_LOW_POWER));
     Collection<String> providers = shadowLocationManager.getProvidersForListener(fusionEngine);
     assertThat(providers).hasSize(1);
     assertThat(providers).contains(NETWORK_PROVIDER);
   }
 
-  @Test public void setRequest_shouldRegisterPassiveProviderOnlyNoPower() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_NO_POWER));
+  @Test public void addRequest_shouldRegisterPassiveProviderOnlyNoPower() throws Exception {
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_NO_POWER));
     Collection<String> providers = shadowLocationManager.getProvidersForListener(fusionEngine);
     assertThat(providers).hasSize(1);
     assertThat(providers).contains(PASSIVE_PROVIDER);
   }
 
-  @Test public void setRequest_shouldDisableLocationUpdatesForNullRequest() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create());
-    fusionEngine.setRequest(null);
+  @Test public void addRequest_shouldDisableLocationUpdatesForNullRequest() throws Exception {
+    LocationRequest request = LocationRequest.create();
+    List requests = new ArrayList();
+    requests.add(request);
+    fusionEngine.addRequest(request);
+    fusionEngine.removeRequests(requests);
     assertThat(shadowLocationManager.getRequestLocationUpdateListeners()).isEmpty();
   }
 
   @Test public void onLocationChanged_shouldReportGps() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
     Location location = new Location(GPS_PROVIDER);
     shadowLocationManager.simulateLocation(location);
     assertThat(callback.location).isEqualTo(location);
   }
 
   @Test public void onLocationChanged_shouldReportNetwork() throws Exception {
-    fusionEngine.setRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
+    fusionEngine.addRequest(LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY));
     Location location = new Location(NETWORK_PROVIDER);
     shadowLocationManager.simulateLocation(location);
     assertThat(callback.location).isEqualTo(location);
@@ -202,7 +205,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
   @Test public void onLocationChanged_shouldNotReportLessThanFastestIntervalGps() throws Exception {
     LocationRequest request =
         LocationRequest.create().setFastestInterval(5000).setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location location1 = getTestLocation(GPS_PROVIDER, 0, 0, time);
@@ -217,7 +220,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
       throws Exception {
     LocationRequest request =
         LocationRequest.create().setFastestInterval(5000).setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location location1 = getTestLocation(NETWORK_PROVIDER, 0, 0, time);
@@ -232,7 +235,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     LocationRequest request = LocationRequest.create()
         .setSmallestDisplacement(200000)
         .setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location location1 = getTestLocation(GPS_PROVIDER, 0, 0, time);
@@ -246,7 +249,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
   @Test public void onLocationChanged_shouldNotReportLessThanMinDisplacementNetwork()
       throws Exception {
     LocationRequest request = LocationRequest.create().setSmallestDisplacement(200000);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location location1 = getTestLocation(NETWORK_PROVIDER, 0, 0, time);
@@ -260,7 +263,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
   @Test public void onLocationChanged_shouldIgnoreNetworkWhenGpsIsMoreAccurate() throws Exception {
     LocationRequest request =
         LocationRequest.create().setFastestInterval(0).setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location gpsLocation = getTestLocation(GPS_PROVIDER, 0, 0, time);
@@ -275,7 +278,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
 
   @Test public void onLocationChanged_shouldIgnoreGpsWhenNetworkIsMoreAccurate() throws Exception {
     LocationRequest request = LocationRequest.create().setFastestInterval(0);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     final long time = System.currentTimeMillis();
     Location networkLocation = getTestLocation(NETWORK_PROVIDER, 0, 0, time + 1);
@@ -293,7 +296,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     shadowLocationManager.setLastKnownLocation(GPS_PROVIDER, gpsLocation);
 
     LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     assertThat(callback.location).isEqualTo(gpsLocation);
   }
@@ -304,7 +307,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
 
     LocationRequest request = LocationRequest.create().setPriority(
         PRIORITY_BALANCED_POWER_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     assertThat(callback.location).isEqualTo(networkLocation);
   }
@@ -316,7 +319,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     shadowLocationManager.setLastKnownLocation(NETWORK_PROVIDER, networkLocation);
 
     LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     assertThat(callback.location).isEqualTo(networkLocation);
   }
@@ -329,7 +332,7 @@ public void getLastLocation_shouldReturnNullIfNoLocationPermissionsGranted() thr
     shadowLocationManager.setLastKnownLocation(NETWORK_PROVIDER, networkLocation);
 
     LocationRequest request = LocationRequest.create().setPriority(PRIORITY_HIGH_ACCURACY);
-    fusionEngine.setRequest(request);
+    fusionEngine.addRequest(request);
 
     assertThat(callback.numLocationReports).isEqualTo(1);
   }
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/LostRequestManagerTests.java b/lost/src/test/java/com/mapzen/android/lost/internal/LostRequestManagerTests.java
new file mode 100644
index 0000000..a507408
--- /dev/null
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/LostRequestManagerTests.java
@@ -0,0 +1,288 @@
+package com.mapzen.android.lost.internal;
+
+import com.mapzen.android.lost.api.LocationCallback;
+import com.mapzen.android.lost.api.LocationListener;
+import com.mapzen.android.lost.api.LocationRequest;
+import com.mapzen.android.lost.api.LostApiClient;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import android.app.PendingIntent;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class LostRequestManagerTests {
+
+  LostRequestManager requestManager;
+
+  @Before
+  public void setup() {
+    requestManager = new LostRequestManager();
+  }
+
+  @Test
+  public void requestLocationUpdates_clientListener_oneRequest_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void requestLocationUpdates_clientListener_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, listener);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, listener);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void requestLocationUpdates_twoClientListeners_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, listener);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(2);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, listener);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, listener);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void requestLocationUpdates_clientPendingIntent_oneRequest_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void requestLocationUpdates_clientPendingIntent_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, intent);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, intent);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void requestLocationUpdates_twoClientPendingIntents_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, intent);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(2);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, intent);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, intent);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void requestLocationUpdates_clientCallback_oneRequest_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void requestLocationUpdates_clientCallback_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, callback);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, callback);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void requestLocationUpdates_twoClientCallbacks_twoRequests_shouldUpdateMap() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, callback);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(2);
+
+    ClientCallbackWrapper wrapper = new ClientCallbackWrapper(client, callback);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(wrapper)).contains(request);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, callback);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper).size()).isEqualTo(1);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void removeLocationUpdates_clientListener_oneRequest_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+    requestManager.removeLocationUpdates(client, listener);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_clientListener_twoRequests_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, listener);
+    requestManager.removeLocationUpdates(client, listener);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_twoClientListeners_twoRequests_shouldRemoveOne() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationListener listener = mock(LocationListener.class);
+    requestManager.requestLocationUpdates(client, request, listener);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, listener);
+    requestManager.removeLocationUpdates(client, listener);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, listener);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void removeLocationUpdates_clientPendingIntent_oneRequest_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+    requestManager.removeLocationUpdates(client, intent);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_clientPendingIntent_twoRequests_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, intent);
+    requestManager.removeLocationUpdates(client, intent);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_twoClientPendingIntents_twoRequests_shouldRemoveOne() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    PendingIntent intent = mock(PendingIntent.class);
+    requestManager.requestLocationUpdates(client, request, intent);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, intent);
+    requestManager.removeLocationUpdates(client, intent);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, intent);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+
+  @Test
+  public void removeLocationUpdates_clientCallback_oneRequest_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+    requestManager.removeLocationUpdates(client, callback);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_clientCallback_twoRequests_shouldRemoveAll() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(client, anotherRequest, callback);
+    requestManager.removeLocationUpdates(client, callback);
+
+    assertThat(requestManager.getClientCallbackMap()).isEmpty();
+  }
+
+  @Test
+  public void removeLocationUpdates_twoClientCallbacks_twoRequests_shouldRemoveOne() {
+    LostApiClient client = mock(LostApiClient.class);
+    LocationRequest request = LocationRequest.create();
+    LocationCallback callback = mock(LocationCallback.class);
+    requestManager.requestLocationUpdates(client, request, callback);
+    LostApiClient anotherClient = mock(LostApiClient.class);
+    LocationRequest anotherRequest = LocationRequest.create();
+    requestManager.requestLocationUpdates(anotherClient, anotherRequest, callback);
+    requestManager.removeLocationUpdates(client, callback);
+
+    assertThat(requestManager.getClientCallbackMap().size()).isEqualTo(1);
+
+    ClientCallbackWrapper anotherWrapper = new ClientCallbackWrapper(anotherClient, callback);
+    assertThat(requestManager.getClientCallbackMap().get(anotherWrapper)).contains(anotherRequest);
+  }
+}
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/MockEngineTest.java b/lost/src/test/java/com/mapzen/android/lost/internal/MockEngineTest.java
index 0bddcf3..a83f318 100644
--- a/lost/src/test/java/com/mapzen/android/lost/internal/MockEngineTest.java
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/MockEngineTest.java
@@ -50,7 +50,7 @@ public class MockEngineTest extends BaseRobolectricTest {
 
   @Test public void disable_shouldCancelTraceReplay() throws Exception {
     mockEngine.setTrace(getTestGpxTrace());
-    mockEngine.setRequest(LocationRequest.create().setFastestInterval(100));
+    mockEngine.addRequest(LocationRequest.create().setFastestInterval(100));
     mockEngine.disable();
     assertThat(traceThreadFactory.traceThread.isCanceled()).isTrue();
   }
diff --git a/lost/src/test/java/com/mapzen/android/lost/internal/TestServiceStub.java b/lost/src/test/java/com/mapzen/android/lost/internal/TestServiceStub.java
index 956127d..6a3914a 100644
--- a/lost/src/test/java/com/mapzen/android/lost/internal/TestServiceStub.java
+++ b/lost/src/test/java/com/mapzen/android/lost/internal/TestServiceStub.java
@@ -6,6 +6,8 @@
 import android.location.Location;
 import android.os.RemoteException;
 
+import java.util.List;
+
 public class TestServiceStub extends IFusedLocationProviderService.Stub {
 
   IFusedLocationProviderCallback callback;
@@ -26,7 +28,8 @@ public class TestServiceStub extends IFusedLocationProviderService.Stub {
 
   }
 
-  @Override public void removeLocationUpdates() throws RemoteException {
+  @Override public void removeLocationUpdates(List<LocationRequest> request) throws
+      RemoteException {
 
   }