Skip to content

Allow multiple route simulations with NavigationView #1724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2019
Merged

Allow multiple route simulations with NavigationView #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .../v5/location/LocationEngineConductor.java → ...gation/ui/v5/LocationEngineConductor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.services.android.navigation.ui.v5.location;
package com.mapbox.services.android.navigation.ui.v5;

import android.content.Context;

Expand All @@ -7,21 +7,23 @@
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine;

public class LocationEngineConductor {
class LocationEngineConductor {

private LocationEngine locationEngine;

public void initializeLocationEngine(Context context, LocationEngine locationEngine, boolean shouldReplayRoute) {
void initializeLocationEngine(Context context, LocationEngine locationEngine, boolean shouldReplayRoute) {
initialize(context, locationEngine, shouldReplayRoute);
}

public void updateSimulatedRoute(DirectionsRoute route) {
boolean updateSimulatedRoute(DirectionsRoute route) {
if (locationEngine instanceof ReplayRouteLocationEngine) {
((ReplayRouteLocationEngine) locationEngine).assign(route);
return true;
}
return false;
}

public LocationEngine obtainLocationEngine() {
LocationEngine obtainLocationEngine() {
return locationEngine;
}

Expand Down
10 changes: 8 additions & 2 deletions ...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.mapbox.services.android.navigation.ui.v5.feedback.FeedbackItem;
import com.mapbox.services.android.navigation.ui.v5.instruction.BannerInstructionModel;
import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionModel;
import com.mapbox.services.android.navigation.ui.v5.location.LocationEngineConductor;
import com.mapbox.services.android.navigation.ui.v5.route.OffRouteEvent;
import com.mapbox.services.android.navigation.ui.v5.route.ViewRouteFetcher;
import com.mapbox.services.android.navigation.ui.v5.route.ViewRouteListener;
Expand Down Expand Up @@ -241,7 +240,7 @@ void updateRoute(DirectionsRoute route) {
this.route.setValue(route);
if (!isChangingConfigurations) {
startNavigation(route);
locationEngineConductor.updateSimulatedRoute(route);
updateReplayEngine(route);
sendEventOnRerouteAlong(route);
isOffRoute.setValue(false);
}
Expand Down Expand Up @@ -412,6 +411,13 @@ private void startNavigation(DirectionsRoute route) {
}
}

private void updateReplayEngine(DirectionsRoute route) {
if (locationEngineConductor.updateSimulatedRoute(route)) {
LocationEngine replayEngine = locationEngineConductor.obtainLocationEngine();
navigation.setLocationEngine(replayEngine);
}
}

private void endNavigation() {
if (navigation != null) {
navigation.onDestroy();
Expand Down
13 changes: 12 additions & 1 deletion ...c/test/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.support.annotation.NonNull;

import com.mapbox.android.core.location.LocationEngine;
import com.mapbox.services.android.navigation.ui.v5.location.LocationEngineConductor;
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine;

import org.junit.Test;
Expand Down Expand Up @@ -37,6 +37,17 @@ public void onInitWithSimulation_replayEngineIsProvided() {
assertTrue(locationEngine instanceof ReplayRouteLocationEngine);
}

@Test
public void onInitWithSimulation_replayEngineIsUpdated() {
LocationEngineConductor locationEngineConductor = new LocationEngineConductor();
boolean simulateRouteEnabled = true;
locationEngineConductor.initializeLocationEngine(createMockContext(), null, simulateRouteEnabled);

boolean didUpdate = locationEngineConductor.updateSimulatedRoute(mock(DirectionsRoute.class));

assertTrue(didUpdate);
}

@Test
public void onInitWithSimulationAndCustomEngine_customEngineIsProvided() {
LocationEngineConductor locationEngineConductor = new LocationEngineConductor();
Expand Down
1 change: 0 additions & 1 deletion ...i/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.app.Application;

import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.services.android.navigation.ui.v5.location.LocationEngineConductor;
import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation;

import org.junit.Test;
Expand Down