Skip to content

Commit c64cb94

Browse files
remove unnecessary force first location update from route (origin) (#1488)
1 parent af61c39 commit c64cb94

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package com.mapbox.services.android.navigation.v5.navigation;
22

3-
import android.location.Location;
4-
53
import com.mapbox.android.core.location.LocationEngine;
6-
import com.mapbox.api.directions.v5.models.DirectionsRoute;
7-
import com.mapbox.services.android.navigation.v5.utils.RouteUtils;
84

95
class NavigationLocationEngineUpdater {
106

117
private final NavigationLocationEngineListener listener;
12-
private RouteUtils routeUtils;
138
private LocationEngine locationEngine;
149

1510
NavigationLocationEngineUpdater(LocationEngine locationEngine, NavigationLocationEngineListener listener) {
@@ -24,24 +19,7 @@ void updateLocationEngine(LocationEngine locationEngine) {
2419
locationEngine.addLocationEngineListener(listener);
2520
}
2621

27-
@SuppressWarnings("MissingPermission")
28-
void forceLocationUpdate(DirectionsRoute route) {
29-
Location location = locationEngine.getLastLocation();
30-
if (!listener.isValidLocationUpdate(location)) {
31-
routeUtils = obtainRouteUtils();
32-
location = routeUtils.createFirstLocationFromRoute(route);
33-
}
34-
listener.onLocationChanged(location);
35-
}
36-
3722
void removeLocationEngineListener() {
3823
locationEngine.removeLocationEngineListener(listener);
3924
}
40-
41-
private RouteUtils obtainRouteUtils() {
42-
if (routeUtils == null) {
43-
return new RouteUtils();
44-
}
45-
return routeUtils;
46-
}
4725
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void onDestroy() {
6565
void startNavigation(MapboxNavigation mapboxNavigation) {
6666
initialize(mapboxNavigation);
6767
startForegroundNotification(notificationProvider.retrieveNotification());
68-
locationUpdater.forceLocationUpdate(mapboxNavigation.getRoute());
6968
}
7069

7170
/**

libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdaterTest.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package com.mapbox.services.android.navigation.v5.navigation;
22

3-
import android.location.Location;
4-
53
import com.mapbox.android.core.location.LocationEngine;
6-
import com.mapbox.api.directions.v5.models.DirectionsRoute;
74

85
import org.junit.Test;
96

10-
import static org.mockito.ArgumentMatchers.any;
117
import static org.mockito.ArgumentMatchers.eq;
128
import static org.mockito.Mockito.mock;
139
import static org.mockito.Mockito.verify;
14-
import static org.mockito.Mockito.when;
1510

1611
public class NavigationLocationEngineUpdaterTest {
1712

@@ -49,19 +44,6 @@ public void updateLocationEngine_oldEngineListenerIsRemoved() {
4944
verify(locationEngine).removeLocationEngineListener(eq(listener));
5045
}
5146

52-
@Test
53-
public void forceLocationUpdate_nonNullLastLocationIsSent() {
54-
LocationEngine locationEngine = mock(LocationEngine.class);
55-
when(locationEngine.getLastLocation()).thenReturn(mock(Location.class));
56-
NavigationLocationEngineListener listener = mock(NavigationLocationEngineListener.class);
57-
when(listener.isValidLocationUpdate(any(Location.class))).thenReturn(true);
58-
NavigationLocationEngineUpdater provider = new NavigationLocationEngineUpdater(locationEngine, listener);
59-
60-
provider.forceLocationUpdate(mock(DirectionsRoute.class));
61-
62-
verify(listener).onLocationChanged(any(Location.class));
63-
}
64-
6547
@Test
6648
public void removeLocationEngineListener() {
6749
LocationEngine locationEngine = mock(LocationEngine.class);

0 commit comments

Comments
 (0)