Skip to content

fixed index reset bug #56

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
cammace merged 2 commits into from
May 25, 2017
Merged

fixed index reset bug #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
158734a
fixed index reset bug
May 25, 2017
0af9a71
fixed checkstyle
May 25, 2017
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
13 changes: 12 additions & 1 deletion ...rc/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
import com.mapbox.services.Constants;
import com.mapbox.services.android.navigation.testapp.R;
import com.mapbox.services.android.navigation.v5.MapboxNavigation;
import com.mapbox.services.android.navigation.v5.RouteProgress;
import com.mapbox.services.android.navigation.v5.listeners.NavigationEventListener;
import com.mapbox.services.android.navigation.v5.listeners.OffRouteListener;
import com.mapbox.services.android.navigation.v5.listeners.ProgressChangeListener;
import com.mapbox.services.android.telemetry.location.LocationEngine;
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
import com.mapbox.services.api.directions.v5.models.DirectionsResponse;
Expand All @@ -37,7 +39,8 @@
import timber.log.Timber;

public class RerouteActivity extends AppCompatActivity implements OnMapReadyCallback, LocationEngineListener,
Callback<DirectionsResponse>, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener {
Callback<DirectionsResponse>, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener,
ProgressChangeListener {

@BindView(R.id.mapView)
MapView mapView;
Expand All @@ -63,6 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
// Initialize MapboxNavigation and add listeners
navigation = new MapboxNavigation(this, Mapbox.getAccessToken());
navigation.addNavigationEventListener(this);

}

@Override
Expand Down Expand Up @@ -100,6 +104,7 @@ public void onRunning(boolean running) {
this.running = running;
if (running) {
navigation.addOffRouteListener(this);
navigation.addProgressChangeListener(this);
}
}

Expand All @@ -111,6 +116,12 @@ public void userOffRoute(Location location) {
mapboxMap.addMarker(new MarkerOptions().position(new LatLng(location.getLatitude(), location.getLongitude())));
}


@Override
public void onProgressChange(Location location, RouteProgress routeProgress) {
System.out.println(routeProgress.getCurrentLegProgress().getStepIndex());
}

@Override
public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
DirectionsRoute route = response.body().getRoutes().get(0);
Expand Down
2 changes: 1 addition & 1 deletion ...-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void onLocationChanged(DirectionsRoute directionsRoute, Location location) {
previousRouteProgress = new RouteProgress(directionsRoute, location, 0, 0, NavigationConstants.NONE_ALERT_LEVEL);
}

if (TextUtils.equals(directionsRoute.getGeometry(), previousRouteProgress.getRoute().getGeometry())) {
if (!TextUtils.equals(directionsRoute.getGeometry(), previousRouteProgress.getRoute().getGeometry())) {
resetRouteProgress();
}

Expand Down