From 158734a09885a12dabdb52a08f430376ff004b6d Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Thu, 25 May 2017 16:04:31 -0400 Subject: [PATCH 1/2] fixed index reset bug --- .../navigation/testapp/activity/RerouteActivity.java | 12 +++++++++++- .../android/navigation/v5/NavigationEngine.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java b/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java index 7a3eb3356e8..965e3bd6f51 100644 --- a/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java +++ b/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java @@ -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; @@ -37,7 +39,7 @@ import timber.log.Timber; public class RerouteActivity extends AppCompatActivity implements OnMapReadyCallback, LocationEngineListener, - Callback, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener { + Callback, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener, ProgressChangeListener { @BindView(R.id.mapView) MapView mapView; @@ -63,6 +65,7 @@ protected void onCreate(Bundle savedInstanceState) { // Initialize MapboxNavigation and add listeners navigation = new MapboxNavigation(this, Mapbox.getAccessToken()); navigation.addNavigationEventListener(this); + } @Override @@ -100,6 +103,7 @@ public void onRunning(boolean running) { this.running = running; if (running) { navigation.addOffRouteListener(this); + navigation.addProgressChangeListener(this); } } @@ -111,6 +115,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 call, Response response) { DirectionsRoute route = response.body().getRoutes().get(0); diff --git a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java index 588acc534ee..170b5d9307c 100644 --- a/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java +++ b/navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/NavigationEngine.java @@ -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(); } From 0af9a7172ce93e90da300607a24d12ff837752a6 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Thu, 25 May 2017 16:11:51 -0400 Subject: [PATCH 2/2] fixed checkstyle --- .../android/navigation/testapp/activity/RerouteActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java b/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java index 965e3bd6f51..653b389791b 100644 --- a/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java +++ b/navigation/app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/RerouteActivity.java @@ -39,7 +39,8 @@ import timber.log.Timber; public class RerouteActivity extends AppCompatActivity implements OnMapReadyCallback, LocationEngineListener, - Callback, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener, ProgressChangeListener { + Callback, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener, + ProgressChangeListener { @BindView(R.id.mapView) MapView mapView;