Kyv onboard route

app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/MockNavigationActivity.java

@@ -32,6 +32,7 @@
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.services.android.navigation.testapp.utils.Utils;
+import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;
 import com.mapbox.services.android.navigation.v5.navigation.metrics.MapboxMetricsReporter;
 import com.mapbox.services.android.navigation.v5.navigation.metrics.MetricEvent;
 import com.mapbox.services.android.navigation.v5.navigation.metrics.MetricsObserver;
@@ -48,7 +49,6 @@
 import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation;
 import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationEventListener;
-import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;
 import com.mapbox.services.android.navigation.v5.navigation.RefreshCallback;
 import com.mapbox.services.android.navigation.v5.navigation.RefreshError;
 import com.mapbox.services.android.navigation.v5.navigation.RouteRefresh;

examples/build.gradle

@@ -84,9 +84,11 @@ android {
 
 dependencies {
     implementation project(':libdirections-offboard')
+    implementation project(':libdirections-onboard')
     implementation project(':libtrip-notification')
     implementation project(':libnavigation-util')
     implementation project(':liblogger')
+    implementation project(':libnavigator')
 
     //ktlint
     ktlint dependenciesList.ktlint

examples/src/main/AndroidManifest.xml

@@ -48,6 +48,22 @@
                 android:value=".MainActivity"/>
         </activity>
 
+        <activity
+            android:name=".activity.OnboardRouterActivityKt"
+            android:label="@string/title_onboard_router_kotlin">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
+
+        <activity
+            android:name=".activity.OnboardRouterActivityJava"
+            android:label="@string/title_onboard_router_java">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
+
         <activity android:name=".activity.TripServiceActivityKt"
             android:label="@string/title_trip_service_kotlin"
             android:screenOrientation="portrait">

examples/src/main/java/com/mapbox/navigation/examples/MainActivity.java

@@ -22,6 +22,8 @@
 import com.mapbox.navigation.examples.activity.MockNavigationActivity;
 import com.mapbox.navigation.examples.activity.OffboardRouterActivityJava;
 import com.mapbox.navigation.examples.activity.OffboardRouterActivityKt;
+import com.mapbox.navigation.examples.activity.OnboardRouterActivityJava;
+import com.mapbox.navigation.examples.activity.OnboardRouterActivityKt;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,6 +69,16 @@ protected void onCreate(Bundle savedInstanceState) {
         getString(R.string.title_offboard_router_java),
         getString(R.string.description_offboard_router_java),
         OffboardRouterActivityJava.class
+      ),
+      new SampleItem(
+        getString(R.string.title_onboard_router_kotlin),
+        getString(R.string.description_onboard_router_kotlin),
+        OnboardRouterActivityKt.class
+      ),
+      new SampleItem(
+        getString(R.string.title_onboard_router_java),
+        getString(R.string.description_onboard_router_java),
+        OnboardRouterActivityJava.class
       )
     ));
 

examples/src/main/java/com/mapbox/navigation/examples/activity/OnboardRouterActivityJava.java

@@ -0,0 +1,214 @@
+package com.mapbox.navigation.examples.activity;
+
+import android.os.Bundle;
+import android.os.Environment;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.mapbox.api.directions.v5.models.DirectionsRoute;
+import com.mapbox.geojson.Point;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
+import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.maps.Style;
+import com.mapbox.navigation.base.route.Router;
+import com.mapbox.navigation.base.route.model.Route;
+import com.mapbox.navigation.base.route.model.RouteOptionsNavigation;
+import com.mapbox.navigation.examples.R;
+import com.mapbox.navigation.examples.utils.Utils;
+import com.mapbox.navigation.examples.utils.extensions.Mappers;
+import com.mapbox.navigation.route.onboard.MapboxOnboardRouter;
+import com.mapbox.navigation.route.onboard.model.Config;
+import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import timber.log.Timber;
+
+public class OnboardRouterActivityJava extends AppCompatActivity implements OnMapReadyCallback,
+        MapboxMap.OnMapClickListener {
+
+  private Router onboardRouter;
+  private MapboxMap mapboxMap;
+
+  private DirectionsRoute route;
+  private NavigationMapRoute navigationMapRoute;
+  private Point origin;
+  private Point destination;
+  private Point waypoint;
+
+  @BindView(R.id.mapView)
+  MapView mapView;
+
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_mock_navigation);
+    ButterKnife.bind(this);
+
+    setupRouter();
+
+    mapView.onCreate(savedInstanceState);
+    mapView.getMapAsync(this);
+  }
+
+  private void setupRouter() {
+    File file = new File(
+            Environment.getExternalStoragePublicDirectory("Offline").getAbsolutePath(),
+            "2019_04_13-00_00_11");
+    File fileTiles = new File(file, "tiles");
+    Config config = new Config(
+            fileTiles.getAbsolutePath(),
+            null,
+            null,
+            null,
+            null // working with pre-fetched tiles only
+    );
+
+    onboardRouter = new MapboxOnboardRouter(config, null);
+  }
+
+
+  @OnClick(R.id.newLocationFab)
+  public void onNewLocationClick() {
+    newOrigin();
+  }
+
+  private void newOrigin() {
+    if (mapboxMap != null) {
+      clearMap();
+      LatLng latLng = new LatLng(47.05991, 9.49183);
+      origin = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
+      mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 12));
+    }
+  }
+
+  @Override
+  public void onMapReady(@NonNull MapboxMap mapboxMap) {
+    this.mapboxMap = mapboxMap;
+    this.mapboxMap.addOnMapClickListener(this);
+    mapboxMap.setStyle(Style.MAPBOX_STREETS, style -> {
+      navigationMapRoute = new NavigationMapRoute(mapView, mapboxMap);
+      Snackbar.make(findViewById(R.id.container), "Tap map to place waypoint", Snackbar.LENGTH_LONG).show();
+      newOrigin();
+    });
+  }
+
+  private void clearMap() {
+    if (mapboxMap != null) {
+      mapboxMap.clear();
+      route = null;
+      destination = null;
+      waypoint = null;
+      navigationMapRoute.updateRouteVisibilityTo(false);
+      navigationMapRoute.updateRouteArrowVisibilityTo(false);
+    }
+  }
+
+  private void findRoute() {
+    RouteOptionsNavigation.Builder optionsBuilder = new RouteOptionsNavigation.Builder()
+            .accessToken(Utils.getMapboxAccessToken(this))
+            .origin(origin)
+            .destination(destination);
+    if (waypoint != null) {
+      optionsBuilder.addWaypoint(waypoint);
+    }
+    onboardRouter.getRoute(optionsBuilder.build(), new Router.Callback() {
+      @Override
+      public void onResponse(@NotNull List<Route> routes) {
+        if (!routes.isEmpty()) {
+          route = Mappers.mapToDirectionsRoute(routes.get(0));
+          navigationMapRoute.addRoute(route);
+        }
+      }
+
+      @Override
+      public void onFailure(@NotNull Throwable throwable) {
+        Timber.e(throwable, "onRoutesRequestFailure: navigation.getRoute()");
+      }
+    });
+  }
+
+  @Override
+  public boolean onMapClick(@NonNull LatLng point) {
+    if (destination == null) {
+      destination = Point.fromLngLat(point.getLongitude(), point.getLatitude());
+      mapboxMap.addMarker(new MarkerOptions().position(point));
+      findRoute();
+    } else if (waypoint == null) {
+      waypoint = Point.fromLngLat(point.getLongitude(), point.getLatitude());
+      mapboxMap.addMarker(new MarkerOptions().position(point));
+      findRoute();
+    } else {
+      Toast.makeText(this, "Only 2 waypoints supported for this example", Toast.LENGTH_LONG).show();
+      clearMap();
+    }
+    return false;
+  }
+
+  /*
+   * Activity lifecycle methods
+   */
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    mapView.onResume();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    mapView.onPause();
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
+  @Override
+  public void onLowMemory() {
+    super.onLowMemory();
+    mapView.onLowMemory();
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    if (onboardRouter != null) {
+      onboardRouter.cancel();
+      onboardRouter = null;
+    }
+    if (mapboxMap != null) {
+      mapboxMap.removeOnMapClickListener(this);
+      mapView.onDestroy();
+    }
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    mapView.onSaveInstanceState(outState);
+  }
+}