Skip to content

Commit

Permalink
Update CurrentLegAnnotation javadoc
Browse files Browse the repository at this point in the history
  • Loading branch information
@danesfeder
danesfeder committed Apr 17, 2018
1 parent 3b978cd commit 5c96cda
Show file tree
Hide file tree
Showing 23 changed files with 651 additions and 473 deletions.
2 changes: 1 addition & 1 deletion ...n-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public DynamicCamera(@NonNull MapboxMap mapboxMap) {
@Override
public Point target(RouteInformation routeInformation) {
if (routeInformation.location() != null) {
Location target = new Location(routeInformation.location());
Location target = routeInformation.location();
return Point.fromLngLat(target.getLongitude(), target.getLatitude());
} else if (routeInformation.route() != null) {
return super.target(routeInformation);
Expand Down
13 changes: 1 addition & 12 deletions ...id-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/BaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.support.v4.util.Pair;

import com.google.gson.JsonParser;
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.api.directions.v5.models.LegStep;
import com.mapbox.api.directions.v5.models.StepIntersection;
Expand All @@ -20,21 +19,11 @@
import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList;
import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findCurrentIntersection;
import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findUpcomingIntersection;
import static junit.framework.Assert.assertEquals;
import static okhttp3.internal.Util.UTF_8;

public class BaseTest {

public static final double DELTA = 1E-10;
public static final double LARGE_DELTA = 0.1;

public static final String ACCESS_TOKEN = "pk.XXX";
private static final int FIRST_POINT = 0;

public void compareJson(String json1, String json2) {
JsonParser parser = new JsonParser();
assertEquals(parser.parse(json1), parser.parse(json2));
}
protected static final double DELTA = 1E-10;

protected String loadJsonFixture(String filename) throws IOException {
ClassLoader classLoader = getClass().getClassLoader();
Expand Down
78 changes: 49 additions & 29 deletions .../src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCameraTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,50 +10,39 @@
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.geojson.Point;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.services.android.navigation.BuildConfig;
import com.mapbox.services.android.navigation.ui.v5.BaseTest;
import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation;
import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.io.IOException;

import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

@RunWith(RobolectricTestRunner.class)
@Config(constants = BuildConfig.class, manifest = Config.DEFAULT_MANIFEST_NAME)
public class DynamicCameraTest extends BaseTest {

private static final String DIRECTIONS_PRECISION_6 = "directions_v5_precision_6.json";

@Mock
private MapboxMap mapboxMap;

private DynamicCamera cameraEngine;

@Before
public void setup() throws Exception {
MockitoAnnotations.initMocks(this);
cameraEngine = new DynamicCamera(mapboxMap);
}

@Test
public void sanity() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);

assertNotNull(cameraEngine);
}

@Test
public void onInformationFromRoute_engineCreatesCorrectTarget() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(buildDirectionsRoute(), null, null);

Point target = cameraEngine.target(routeInformation);

double lng = target.longitude();
assertEquals(-122.416686, lng);
double lat = target.latitude();
Expand All @@ -62,30 +51,46 @@ public void onInformationFromRoute_engineCreatesCorrectTarget() throws Exception

@Test
public void onInformationFromRoute_engineCreatesCorrectZoom() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(buildDirectionsRoute(), null, null);

double zoom = cameraEngine.zoom(routeInformation);

assertEquals(15d, zoom);
}

@Test
public void onInformationFromRoute_engineCreatesCorrectTilt() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(buildDirectionsRoute(), null, null);

double tilt = cameraEngine.tilt(routeInformation);

assertEquals(50d, tilt);
}

@Test
public void onInformationFromRoute_engineCreatesCorrectBearing() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(buildDirectionsRoute(), null, null);

double bearing = cameraEngine.bearing(routeInformation);

assertEquals(-99, Math.round(bearing));
}

@Test
public void onInformationFromLocationAndProgress_engineCreatesCorrectTarget() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(null,
buildDefaultLocationUpdate(-77.0339782574523, 38.89993519985637), buildDefaultRouteProgress(null));

Point target = cameraEngine.target(routeInformation);

double lng = target.longitude();
assertEquals(-77.0339782574523, lng);
double lat = target.latitude();
Expand All @@ -94,33 +99,49 @@ public void onInformationFromLocationAndProgress_engineCreatesCorrectTarget() th

@Test
public void onHighDistanceRemaining_engineCreatesCorrectTilt() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(null,
buildDefaultLocationUpdate(-77.0339782574523, 38.89993519985637), buildDefaultRouteProgress(1000d));

double tilt = cameraEngine.tilt(routeInformation);

assertEquals(50d, tilt);
}

@Test
public void onMediumDistanceRemaining_engineCreatesCorrectTilt() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(null,
buildDefaultLocationUpdate(-77.0339782574523, 38.89993519985637), buildDefaultRouteProgress(200d));

double tilt = cameraEngine.tilt(routeInformation);

assertEquals(40d, tilt);
}

@Test
public void onLowDistanceRemaining_engineCreatesCorrectTilt() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(null,
buildDefaultLocationUpdate(-77.0339782574523, 38.89993519985637), buildDefaultRouteProgress(null));

double tilt = cameraEngine.tilt(routeInformation);

assertEquals(35d, tilt);
}

@Test
public void onInformationFromLocationAndProgress_engineCreatesCorrectBearing() throws Exception {
MapboxMap mapboxMap = mock(MapboxMap.class);
DynamicCamera cameraEngine = new DynamicCamera(mapboxMap);
RouteInformation routeInformation = RouteInformation.create(null,
buildDefaultLocationUpdate(-77.0339782574523, 38.89993519985637), buildDefaultRouteProgress(null));

double bearing = cameraEngine.bearing(routeInformation);

assertEquals(100f, bearing, DELTA);
}

Expand All @@ -129,21 +150,20 @@ private Location buildDefaultLocationUpdate(double lng, double lat) {
}

private Location buildLocationUpdate(double lng, double lat, long time) {
Location location = new Location(DynamicCameraTest.class.getSimpleName());
location.setLongitude(lng);
location.setLatitude(lat);
location.setSpeed(30f);
location.setBearing(100f);
location.setAccuracy(10f);
location.setTime(time);
Location location = mock(Location.class);
when(location.getLongitude()).thenReturn(lng);
when(location.getLatitude()).thenReturn(lat);
when(location.getSpeed()).thenReturn(30f);
when(location.getBearing()).thenReturn(100f);
when(location.getAccuracy()).thenReturn(10f);
when(location.getTime()).thenReturn(time);
return location;
}

private RouteProgress buildDefaultRouteProgress(@Nullable Double stepDistanceRemaining) throws Exception {
DirectionsRoute aRoute = buildDirectionsRoute();
double stepDistanceRemainingFinal = stepDistanceRemaining == null ? 100 : stepDistanceRemaining;
return buildRouteProgress(aRoute, stepDistanceRemainingFinal,
0, 0, 0, 0);
return buildRouteProgress(aRoute, stepDistanceRemainingFinal, 0, 0, 0, 0);
}

private DirectionsRoute buildDirectionsRoute() throws IOException {
Expand Down
41 changes: 22 additions & 19 deletions ...n/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ class NavigationRouteProcessor implements OffRouteCallback {
private LegStep upcomingStep;
private CurrentLegAnnotation currentLegAnnotation;
private NavigationIndices indices;
private double routeDistanceRemaining;
private double legDistanceRemaining;
private double stepDistanceRemaining;
private boolean shouldIncreaseIndex;

Expand Down Expand Up @@ -77,22 +75,9 @@ RouteProgress buildNewRouteProgress(MapboxNavigation navigation, Location locati
MapboxNavigationOptions options = navigation.options();
double completionOffset = options.maxTurnCompletionOffset();
double maneuverZoneRadius = options.maneuverZoneRadius();

checkNewRoute(navigation);

stepDistanceRemaining = calculateStepDistanceRemaining(location, directionsRoute);

boolean withinManeuverRadius = stepDistanceRemaining < maneuverZoneRadius;
boolean bearingMatchesManeuver = checkBearingForStepCompletion(
location, routeProgress, stepDistanceRemaining, completionOffset
);
boolean forceIncreaseIndices = stepDistanceRemaining == 0 && !bearingMatchesManeuver;

if ((bearingMatchesManeuver && withinManeuverRadius) || forceIncreaseIndices) {
advanceIndices(navigation);
stepDistanceRemaining = calculateStepDistanceRemaining(location, directionsRoute);
}

checkManeuverCompletion(navigation, location, directionsRoute, completionOffset, maneuverZoneRadius);
return assembleRouteProgress(directionsRoute);
}

Expand Down Expand Up @@ -149,6 +134,20 @@ private double calculateStepDistanceRemaining(Location location, DirectionsRoute
);
}

private void checkManeuverCompletion(MapboxNavigation navigation, Location location, DirectionsRoute directionsRoute,
double completionOffset, double maneuverZoneRadius) {
boolean withinManeuverRadius = stepDistanceRemaining < maneuverZoneRadius;
boolean bearingMatchesManeuver = checkBearingForStepCompletion(
location, routeProgress, stepDistanceRemaining, completionOffset
);
boolean forceIncreaseIndices = stepDistanceRemaining == 0 && !bearingMatchesManeuver;

if ((bearingMatchesManeuver && withinManeuverRadius) || forceIncreaseIndices) {
advanceIndices(navigation);
stepDistanceRemaining = calculateStepDistanceRemaining(location, directionsRoute);
}
}

/**
* Increases the step index in {@link NavigationIndices} by 1.
* <p>
Expand Down Expand Up @@ -190,8 +189,8 @@ private RouteProgress assembleRouteProgress(DirectionsRoute route) {
int legIndex = indices.legIndex();
int stepIndex = indices.stepIndex();

legDistanceRemaining = legDistanceRemaining(stepDistanceRemaining, legIndex, stepIndex, route);
routeDistanceRemaining = routeDistanceRemaining(legDistanceRemaining, legIndex, route);
double legDistanceRemaining = legDistanceRemaining(stepDistanceRemaining, legIndex, stepIndex, route);
double routeDistanceRemaining = routeDistanceRemaining(legDistanceRemaining, legIndex, route);
currentLegAnnotation = createCurrentAnnotation(currentLegAnnotation, currentLeg, legDistanceRemaining);
double stepDistanceTraveled = currentStep.distance() - stepDistanceRemaining;

Expand All @@ -217,10 +216,14 @@ private RouteProgress assembleRouteProgress(DirectionsRoute route) {
.intersectionDistancesAlongStep(currentIntersectionDistances)
.currentLegAnnotation(currentLegAnnotation);

addUpcomingStepPoints(progressBuilder);
return progressBuilder.build();
}

private void addUpcomingStepPoints(RouteProgress.Builder progressBuilder) {
if (upcomingStepPoints != null && !upcomingStepPoints.isEmpty()) {
progressBuilder.upcomingStepPoints(upcomingStepPoints);
}
return progressBuilder.build();
}

private void clearManeuverDistances(OffRoute offRoute) {
Expand Down
Loading

0 comments on commit 5c96cda

Please sign in to comment.