Added nav-native ETAs

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryModel.java

@@ -22,10 +22,11 @@ public class SummaryModel {
   public SummaryModel(Context context, DistanceFormatter distanceFormatter, RouteProgress progress,
                       @NavigationTimeFormat.Type int timeFormatType) {
     distanceRemaining = distanceFormatter.formatDistance(progress.distanceRemaining()).toString();
-    timeRemaining = formatTimeRemaining(context, progress.durationRemaining());
+    double legDurationRemaining = progress.currentLegProgress().durationRemaining();
+    timeRemaining = formatTimeRemaining(context, legDurationRemaining);
     Calendar time = Calendar.getInstance();
     boolean isTwentyFourHourFormat = DateFormat.is24HourFormat(context);
-    arrivalTime = formatTime(time, progress.durationRemaining(), timeFormatType, isTwentyFourHourFormat);
+    arrivalTime = formatTime(time, legDurationRemaining, timeFormatType, isTwentyFourHourFormat);
   }
 
   String getDistanceRemaining() {

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

@@ -25,6 +25,7 @@ RouteProgress buildTestRouteProgress(DirectionsRoute route,
                                        double distanceRemaining,
                                        int stepIndex,
                                        int legIndex) throws Exception {
+    double legDurationRemaining = route.legs().get(0).duration();
     List<LegStep> steps = route.legs().get(legIndex).steps();
     LegStep currentStep = steps.get(stepIndex);
     String currentStepGeometry = currentStep.geometry();
@@ -53,6 +54,7 @@ RouteProgress buildTestRouteProgress(DirectionsRoute route,
     return RouteProgress.builder()
       .stepDistanceRemaining(stepDistanceRemaining)
       .legDistanceRemaining(legDistanceRemaining)
+      .legDurationRemaining(legDurationRemaining)
       .distanceRemaining(distanceRemaining)
       .directionsRoute(route)
       .currentStepPoints(currentStepPoints)

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

@@ -25,7 +25,9 @@ void updateNavigationNotification(RouteProgress routeProgress) {
   }
 
   void shutdown(Context context) {
-    navigationNotification.onNavigationStopped(context);
+    if (navigationNotification != null) {
+      navigationNotification.onNavigationStopped(context);
+    }
     navigationNotification = null;
     shouldUpdate = false;
   }

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

@@ -9,6 +9,7 @@
 import com.mapbox.api.directions.v5.models.StepIntersection;
 import com.mapbox.geojson.Point;
 import com.mapbox.navigator.NavigationStatus;
+import com.mapbox.navigator.RouteState;
 import com.mapbox.navigator.VoiceInstruction;
 import com.mapbox.services.android.navigation.v5.routeprogress.CurrentLegAnnotation;
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;
@@ -26,6 +27,7 @@
 class NavigationRouteProcessor {
 
   private static final int ONE_INDEX = 1;
+  public static final int ONE_SECOND = 1000;
   private RouteProgress previousRouteProgress;
   private DirectionsRoute route;
   private RouteLeg currentLeg;
@@ -69,6 +71,9 @@ private RouteProgress buildRouteProgressFrom(NavigationStatus status) {
     double routeDistanceRemaining = routeDistanceRemaining(legDistanceRemaining, legIndex, route);
     double stepDistanceRemaining = status.getRemainingStepDistance();
     double stepDistanceTraveled = currentStep.distance() - stepDistanceRemaining;
+    double legDurationRemaining = status.getRouteState() == RouteState.TRACKING
+      ? status.getRemainingLegDuration() / ONE_SECOND : route.duration();
+
     currentLegAnnotation = createCurrentAnnotation(currentLegAnnotation, currentLeg, legDistanceRemaining);
     StepIntersection currentIntersection = findCurrentIntersection(
       currentIntersections, currentIntersectionDistances, stepDistanceTraveled
@@ -78,9 +83,10 @@ private RouteProgress buildRouteProgressFrom(NavigationStatus status) {
     );
 
     RouteProgress.Builder progressBuilder = RouteProgress.builder()
-      .stepDistanceRemaining(stepDistanceRemaining)
-      .legDistanceRemaining(legDistanceRemaining)
       .distanceRemaining(routeDistanceRemaining)
+      .legDistanceRemaining(legDistanceRemaining)
+      .legDurationRemaining(legDurationRemaining)
+      .stepDistanceRemaining(stepDistanceRemaining)
       .directionsRoute(route)
       .currentStepPoints(currentStepPoints)
       .upcomingStepPoints(upcomingStepPoints)

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

@@ -66,9 +66,7 @@ public double distanceTraveled() {
    * @return long value representing the duration remaining till end of step, in unit seconds.
    * @since 0.1.0
    */
-  public double durationRemaining() {
-    return (1 - fractionTraveled()) * routeLeg().duration();
-  }
+  public abstract double durationRemaining();
 
   /**
    * Get the fraction traveled along the current leg, this is a float value between 0 and 1 and
@@ -217,6 +215,8 @@ public abstract static class Builder {
 
     abstract int stepIndex();
 
+    abstract Builder durationRemaining(double durationRemaining);
+
     abstract Builder stepDistanceRemaining(double stepDistanceRemaining);
 
     abstract double stepDistanceRemaining();

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

@@ -188,6 +188,8 @@ public int remainingWaypoints() {
 
   abstract List<Pair<StepIntersection, Double>> intersectionDistancesAlongStep();
 
+  abstract double legDurationRemaining();
+
   @AutoValue.Builder
   public abstract static class Builder {
 
@@ -207,6 +209,10 @@ public abstract static class Builder {
 
     abstract double legDistanceRemaining();
 
+    public abstract Builder legDurationRemaining(double durationRemaining);
+
+    abstract double legDurationRemaining();
+
     public abstract Builder stepDistanceRemaining(double stepDistanceRemaining);
 
     abstract double stepDistanceRemaining();
@@ -257,6 +263,7 @@ public RouteProgress build() {
         .routeLeg(currentLeg)
         .stepIndex(stepIndex())
         .distanceRemaining(legDistanceRemaining())
+        .durationRemaining(legDurationRemaining())
         .stepDistanceRemaining(stepDistanceRemaining())
         .currentStepPoints(currentStepPoints())
         .upcomingStepPoints(upcomingStepPoints())

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

@@ -31,6 +31,7 @@ RouteProgress buildTestRouteProgress(DirectionsRoute route,
                                        double distanceRemaining,
                                        int stepIndex,
                                        int legIndex) throws Exception {
+    double legDurationRemaining = route.legs().get(0).duration();
     List<LegStep> steps = route.legs().get(legIndex).steps();
     LegStep currentStep = steps.get(stepIndex);
     List<Point> currentStepPoints = buildCurrentStepPoints(currentStep);
@@ -55,6 +56,7 @@ RouteProgress buildTestRouteProgress(DirectionsRoute route,
     return RouteProgress.builder()
       .stepDistanceRemaining(stepDistanceRemaining)
       .legDistanceRemaining(legDistanceRemaining)
+      .legDurationRemaining(legDurationRemaining)
       .distanceRemaining(distanceRemaining)
       .directionsRoute(route)
       .currentStepPoints(currentStepPoints)

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

@@ -158,25 +158,6 @@ public void getDistanceTraveled_equalsLegDistanceAtEndOfLeg() throws Exception {
     assertEquals(firstLegDistance, distanceTraveled, BaseTest.DELTA);
   }
 
-  @Test
-  public void getDurationRemaining_equalsLegDurationAtBeginning() throws Exception {
-    RouteProgress routeProgress = buildBeginningOfLegRouteProgress();
-    DirectionsRoute route = routeProgress.directionsRoute();
-    RouteLeg firstLeg = route.legs().get(0);
-
-    Double firstLegDuration = firstLeg.duration();
-    double currentLegDurationRemaining = routeProgress.currentLegProgress().durationRemaining();
-
-    assertEquals(firstLegDuration, currentLegDurationRemaining, BaseTest.DELTA);
-  }
-
-  @Test
-  public void getDurationRemaining_equalsZeroAtEndOfLeg() throws Exception {
-    RouteProgress routeProgress = buildEndOfLegRouteProgress();
-
-    assertEquals(0, routeProgress.currentLegProgress().durationRemaining(), BaseTest.DELTA);
-  }
-
   @Test
   public void followOnStep_doesReturnTwoStepsAheadOfCurrent() throws Exception {
     int stepIndex = 5;