Remove MapboxNavigationOptions ignored by Navigator (#1500)

Author: danesfeder

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

@@ -92,12 +92,11 @@ protected void onDestroy() {
 
   @Override
   public void onNavigationReady(boolean isRunning) {
-    MapboxNavigationOptions.Builder navigationOptions = MapboxNavigationOptions.builder();
     NavigationViewOptions.Builder options = NavigationViewOptions.builder();
     options.navigationListener(this);
     extractRoute(options);
-    extractConfiguration(options, navigationOptions);
-    options.navigationOptions(navigationOptions.build());
+    extractConfiguration(options);
+    options.navigationOptions(MapboxNavigationOptions.builder().build());
     navigationView.startNavigation(options.build());
   }
 
@@ -132,16 +131,11 @@ private void extractRoute(NavigationViewOptions.Builder options) {
     options.directionsRoute(route);
   }
 
-  private void extractConfiguration(NavigationViewOptions.Builder options,
-                                    MapboxNavigationOptions.Builder navigationOptions) {
+  private void extractConfiguration(NavigationViewOptions.Builder options) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
     options.shouldSimulateRoute(preferences
       .getBoolean(NavigationConstants.NAVIGATION_VIEW_SIMULATE_ROUTE, false));
     options.directionsProfile(preferences
       .getString(NavigationConstants.NAVIGATION_VIEW_ROUTE_PROFILE_KEY, DirectionsCriteria.PROFILE_DRIVING_TRAFFIC));
-    navigationOptions.enableOffRouteDetection(preferences
-      .getBoolean(NavigationConstants.NAVIGATION_VIEW_OFF_ROUTE_ENABLED_KEY, true));
-    navigationOptions.snapToRoute(preferences
-      .getBoolean(NavigationConstants.NAVIGATION_VIEW_SNAP_ENABLED_KEY, true));
   }
 }

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

@@ -71,8 +71,6 @@ private static void storeDirectionsRouteValue(NavigationLauncherOptions options,
   private static void storeConfiguration(NavigationLauncherOptions options, SharedPreferences.Editor editor) {
     editor.putBoolean(NavigationConstants.NAVIGATION_VIEW_SIMULATE_ROUTE, options.shouldSimulateRoute());
     editor.putString(NavigationConstants.NAVIGATION_VIEW_ROUTE_PROFILE_KEY, options.directionsProfile());
-    editor.putBoolean(NavigationConstants.NAVIGATION_VIEW_OFF_ROUTE_ENABLED_KEY, options.enableOffRouteDetection());
-    editor.putBoolean(NavigationConstants.NAVIGATION_VIEW_SNAP_ENABLED_KEY, options.snapToRoute());
   }
 
   private static void storeThemePreferences(NavigationLauncherOptions options, SharedPreferences.Editor editor) {

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

@@ -10,10 +10,6 @@
 @AutoValue
 public abstract class NavigationLauncherOptions extends NavigationUiOptions {
 
-  public abstract boolean enableOffRouteDetection();
-
-  public abstract boolean snapToRoute();
-
   @Nullable
   public abstract CameraPosition initialMapCameraPosition();
 
@@ -32,10 +28,6 @@ public abstract static class Builder {
 
     public abstract Builder waynameChipEnabled(boolean waynameChipEnabled);
 
-    public abstract Builder enableOffRouteDetection(boolean enableOffRouteDetection);
-
-    public abstract Builder snapToRoute(boolean snapToRoute);
-
     public abstract Builder initialMapCameraPosition(@Nullable CameraPosition initialMapCameraPosition);
 
     public abstract NavigationLauncherOptions build();
@@ -44,8 +36,6 @@ public abstract static class Builder {
   public static NavigationLauncherOptions.Builder builder() {
     return new AutoValue_NavigationLauncherOptions.Builder()
       .shouldSimulateRoute(false)
-      .enableOffRouteDetection(true)
-      .snapToRoute(true)
       .waynameChipEnabled(true);
   }
 }

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

@@ -331,9 +331,7 @@ public void startNavigation(@NonNull DirectionsRoute directionsRoute) {
 
   /**
    * Call this when the navigation session needs to end before the user reaches their final
-   * destination. There isn't a need to manually end the navigation session using this API when the
-   * user arrives unless you set {@link MapboxNavigationOptions#manuallyEndNavigationUponCompletion()}
-   * to true.
+   * destination.
    * <p>
    * Ending the navigation session ends and unbinds the navigation service meaning any milestone,
    * progress change, or off-route listeners will not be invoked anymore. A call returning false

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

@@ -15,36 +15,12 @@
 @AutoValue
 public abstract class MapboxNavigationOptions {
 
-  public abstract double maxTurnCompletionOffset();
-
-  public abstract double maneuverZoneRadius();
-
-  public abstract double maximumDistanceOffRoute();
-
-  public abstract double deadReckoningTimeInterval();
-
-  public abstract double maxManipulatedCourseAngle();
-
-  public abstract double userLocationSnapDistance();
-
-  public abstract int secondsBeforeReroute();
-
   public abstract boolean defaultMilestonesEnabled();
 
-  public abstract boolean snapToRoute();
-
-  public abstract boolean enableOffRouteDetection();
-
   public abstract boolean enableFasterRouteDetection();
 
-  public abstract boolean manuallyEndNavigationUponCompletion();
-
-  public abstract double metersRemainingTillArrival();
-
   public abstract boolean isFromNavigationUi();
 
-  public abstract double minimumDistanceBeforeRerouting();
-
   public abstract boolean isDebugLoggingEnabled();
 
   @Nullable
@@ -65,36 +41,12 @@ public abstract class MapboxNavigationOptions {
   @AutoValue.Builder
   public abstract static class Builder {
 
-    public abstract Builder maxTurnCompletionOffset(double maxTurnCompletionOffset);
-
-    public abstract Builder maneuverZoneRadius(double maneuverZoneRadius);
-
-    public abstract Builder maximumDistanceOffRoute(double maximumDistanceOffRoute);
-
-    public abstract Builder deadReckoningTimeInterval(double deadReckoningTimeInterval);
-
-    public abstract Builder maxManipulatedCourseAngle(double maxManipulatedCourseAngle);
-
-    public abstract Builder userLocationSnapDistance(double userLocationSnapDistance);
-
-    public abstract Builder secondsBeforeReroute(int secondsBeforeReroute);
-
     public abstract Builder defaultMilestonesEnabled(boolean defaultMilestonesEnabled);
 
-    public abstract Builder snapToRoute(boolean snapToRoute);
-
-    public abstract Builder enableOffRouteDetection(boolean enableOffRouteDetection);
-
     public abstract Builder enableFasterRouteDetection(boolean enableFasterRouteDetection);
 
-    public abstract Builder manuallyEndNavigationUponCompletion(boolean manuallyEndNavigation);
-
-    public abstract Builder metersRemainingTillArrival(double metersRemainingTillArrival);
-
     public abstract Builder isFromNavigationUi(boolean isFromNavigationUi);
 
-    public abstract Builder minimumDistanceBeforeRerouting(double distanceInMeters);
-
     public abstract Builder isDebugLoggingEnabled(boolean debugLoggingEnabled);
 
     public abstract Builder navigationNotification(NavigationNotification notification);
@@ -112,20 +64,8 @@ public abstract static class Builder {
 
   public static Builder builder() {
     return new AutoValue_MapboxNavigationOptions.Builder()
-      .maxTurnCompletionOffset(NavigationConstants.MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION)
-      .maneuverZoneRadius(NavigationConstants.MANEUVER_ZONE_RADIUS)
-      .maximumDistanceOffRoute(NavigationConstants.MAXIMUM_DISTANCE_BEFORE_OFF_ROUTE)
-      .deadReckoningTimeInterval(NavigationConstants.DEAD_RECKONING_TIME_INTERVAL)
-      .maxManipulatedCourseAngle(NavigationConstants.MAX_MANIPULATED_COURSE_ANGLE)
-      .userLocationSnapDistance(NavigationConstants.USER_LOCATION_SNAPPING_DISTANCE)
-      .secondsBeforeReroute(NavigationConstants.SECONDS_BEFORE_REROUTE)
-      .enableOffRouteDetection(true)
       .enableFasterRouteDetection(false)
-      .snapToRoute(true)
-      .manuallyEndNavigationUponCompletion(false)
       .defaultMilestonesEnabled(true)
-      .minimumDistanceBeforeRerouting(NavigationConstants.MINIMUM_DISTANCE_BEFORE_REROUTING)
-      .metersRemainingTillArrival(NavigationConstants.METERS_REMAINING_TILL_ARRIVAL)
       .isFromNavigationUi(false)
       .isDebugLoggingEnabled(false)
       .roundingIncrement(ROUNDING_INCREMENT_FIFTY)

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

@@ -3,8 +3,6 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.StringDef;
 
-import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener;
-
 /**
  * Navigation constants
  *
@@ -51,72 +49,6 @@ private NavigationConstants() {
    */
   public static final int NAVIGATION_NOTIFICATION_ID = 5678;
 
-  /**
-   * Threshold user must be within to count as completing a step. One of two heuristics used to know
-   * when a user completes a step, see {@link #MANEUVER_ZONE_RADIUS}. The users heading and the
-   * finalHeading are compared. If this number is within this defined constant, the user has
-   * completed the step.
-   *
-   * @since 0.1.0
-   */
-  static final int MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION = 30;
-
-  /**
-   * Radius in meters the user must enter to count as completing a step. One of two heuristics used
-   * to know when a user completes a step, see
-   * {@link #MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION}.
-   *
-   * @since 0.1.0
-   */
-  public static final int MANEUVER_ZONE_RADIUS = 40;
-
-  /**
-   * Maximum number of meters the user can travel away from step before the
-   * {@link OffRouteListener}'s called.
-   *
-   * @since 0.2.0
-   */
-  static final double MAXIMUM_DISTANCE_BEFORE_OFF_ROUTE = 20;
-
-  /**
-   * Seconds used before a reroute occurs.
-   *
-   * @since 0.2.0
-   */
-  static final int SECONDS_BEFORE_REROUTE = 3;
-
-  /**
-   * Accepted deviation excluding horizontal accuracy before the user is considered to be off route.
-   *
-   * @since 0.1.0
-   */
-  static final double USER_LOCATION_SNAPPING_DISTANCE = 10;
-
-  /**
-   * When calculating whether or not the user is on the route, we look where the user will be given
-   * their speed and this variable.
-   *
-   * @since 0.2.0
-   */
-  static final double DEAD_RECKONING_TIME_INTERVAL = 1.0;
-
-  /**
-   * Maximum angle the user puck will be rotated when snapping the user's course to the route line.
-   *
-   * @since 0.3.0
-   */
-  static final int MAX_MANIPULATED_COURSE_ANGLE = 25;
-
-  /**
-   * Meter radius which the user must be inside for an arrival milestone to be triggered and
-   * navigation to end.
-   */
-  public static final double METERS_REMAINING_TILL_ARRIVAL = 40;
-
-  public static final double MINIMUM_BACKUP_DISTANCE_FOR_OFF_ROUTE = 50;
-
-  public static final double MINIMUM_DISTANCE_BEFORE_REROUTING = 50;
-
   /**
    * Duration in which the AlertView is shown with the "Report Problem" text.
    */
@@ -234,8 +166,6 @@ private NavigationConstants() {
   public static final String NAVIGATION_VIEW_ROUTE_KEY = "route_json";
   public static final String NAVIGATION_VIEW_SIMULATE_ROUTE = "navigation_view_simulate_route";
   public static final String NAVIGATION_VIEW_ROUTE_PROFILE_KEY = "navigation_view_route_profile";
-  public static final String NAVIGATION_VIEW_OFF_ROUTE_ENABLED_KEY = "navigation_view_off_route_enabled";
-  public static final String NAVIGATION_VIEW_SNAP_ENABLED_KEY = "navigation_view_snap_enabled";
 
   // Step Maneuver Types
   public static final String STEP_MANEUVER_TYPE_TURN = "turn";