Merge pull request #153 from mapbox/cam-mas-2.2

bumped mas version to 2.2.0

Author: Cameron Mace

navigation/dependencies.gradle

@@ -17,7 +17,7 @@ ext {
   dep = [
     // mapbox
     mapboxMapSdk           : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0',
-    mapboxServices         : 'com.mapbox.mapboxsdk:mapbox-android-services:2.1.3',
+    mapboxServices         : 'com.mapbox.mapboxsdk:mapbox-android-services:2.2.0',
     locationLayerPlugin    : 'com.mapbox.mapboxsdk:mapbox-android-plugin-locationlayer:0.1.0',
 
     // unit test

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

@@ -92,7 +92,7 @@ public double getDistanceRemaining() {
     double distanceRemaining = 0;
 
     List<Position> coords = PolylineUtils.decode(getCurrentStep().getGeometry(), Constants.PRECISION_6);
-    if (coords.size() > 1) {
+    if (coords.size() > 1 && !userSnappedPosition().equals(coords.get(coords.size() - 1))) {
       LineString slicedLine = TurfMisc.lineSlice(
         Point.fromCoordinates(userSnappedPosition()),
         Point.fromCoordinates(coords.get(coords.size() - 1)),

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

@@ -141,10 +141,11 @@ public double getDistanceRemaining() {
     double distanceRemaining = 0;
     List<Position> coords = PolylineUtils.decode(getCurrentLegProgress().getCurrentStep().getGeometry(),
       Constants.PRECISION_6);
-    if (coords.size() > 1) {
+    Position userSnappedPosition = userSnappedToRoutePosition(location(), legIndex(), currentLegProgress().stepIndex(),
+      route());
+    if (coords.size() > 1 && !userSnappedPosition.equals(coords.get(coords.size() - 1))) {
       LineString slicedLine = TurfMisc.lineSlice(
-        Point.fromCoordinates(userSnappedToRoutePosition(location(), legIndex(), currentLegProgress().stepIndex(),
-          route())),
+        Point.fromCoordinates(userSnappedPosition),
         Point.fromCoordinates(coords.get(coords.size() - 1)),
         LineString.fromCoordinates(coords)
       );

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

@@ -67,7 +67,7 @@ public double getDistanceRemaining() {
     // Decode the geometry
     List<Position> coords = PolylineUtils.decode(step().getGeometry(), Constants.PRECISION_6);
 
-    if (coords.size() > 1) {
+    if (coords.size() > 1 && !userSnappedPosition().equals(coords.get(coords.size() - 1))) {
       LineString slicedLine = TurfMisc.lineSlice(
         Point.fromCoordinates(userSnappedPosition()),
         Point.fromCoordinates(coords.get(coords.size() - 1)),