mapbox · cammace · Apr 14, 2017 · Apr 13, 2017 · Apr 13, 2017 · Apr 13, 2017
diff --git a/Makefile b/Makefile
@@ -116,8 +116,7 @@ mapmatching-fixtures:
 	curl "https://api.mapbox.com/matching/v5/mapbox/driving/$(MAP_MATCHING_COORDINATES)?geometries=polyline&access_token=$(MAPBOX_ACCESS_TOKEN)" \
 		-o mapbox/libjava-services/src/test/fixtures/mapmatching_v5_polyline.json
 
-distance-fixtures:
-	# Retrieve a duration matrix
-	curl -X POST --header "Content-Type:application/json" -d @mapbox/libjava-services/src/test/fixtures/distance_coordinates.json \
-		"https://api.mapbox.com/distances/v1/mapbox/driving?access_token=$(MAPBOX_ACCESS_TOKEN)" \
-		-o mapbox/libjava-services/src/test/fixtures/distance_v1.json
+optimized-trips-fixtures:
+	# request an optimized car trip with no additional options
+	curl "https://api.mapbox.com/optimized-trips/v1/mapbox/driving/-122.42,37.78;-122.45,37.91;-122.48,37.73?access_token=$(MAPBOX_ACCESS_TOKEN)" \
+		-o mapbox/libjava-services/src/test/fixtures/optimized_trip.json
diff --git a/mapbox/app/src/main/AndroidManifest.xml b/mapbox/app/src/main/AndroidManifest.xml
@@ -134,6 +134,13 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity"/>
         </activity>
+        <activity
+            android:name=".optimizedtrip.OptimizedTripActivity"
+            android:label="@string/title_optimized_trip">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity"/>
+        </activity>
 
         <!--
         Service to asynchronously fetch a location address using a Geocoder. Setting the

diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java
@@ -21,6 +21,8 @@
 import com.mapbox.services.android.testapp.geocoding.GeocodingServiceActivity;
 import com.mapbox.services.android.testapp.geocoding.GeocodingWidgetActivity;
 import com.mapbox.services.android.testapp.location.LocationEngineActivity;
+import com.mapbox.services.android.testapp.optimizedtrip.OptimizedTripActivity;
+
 import com.mapbox.services.android.testapp.staticimage.StaticImageActivity;
 import com.mapbox.services.android.testapp.turf.TurfBearingActivity;
 import com.mapbox.services.android.testapp.turf.TurfDestinationActivity;
@@ -53,6 +55,10 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_main);
 
     final List<SampleItem> samples = new ArrayList<>(Arrays.asList(
+      new SampleItem(
+        getString(R.string.title_optimized_trip),
+        getString(R.string.description_optimized_trip),
+        OptimizedTripActivity.class),
       new SampleItem(
         getString(R.string.title_location),
         getString(R.string.description_location),

diff --git a/...rc/main/java/com/mapbox/services/android/testapp/optimizedtrip/OptimizedTripActivity.java b/...rc/main/java/com/mapbox/services/android/testapp/optimizedtrip/OptimizedTripActivity.java
@@ -0,0 +1,207 @@
+package com.mapbox.services.android.testapp.optimizedtrip;
+
+import android.animation.ValueAnimator;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
+import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.geometry.LatLngBounds;
+import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.style.layers.LineLayer;
+import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
+import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
+import com.mapbox.services.Constants;
+import com.mapbox.services.android.testapp.R;
+import com.mapbox.services.api.directions.v5.DirectionsCriteria;
+import com.mapbox.services.api.optimizedtrips.v1.MapboxOptimizedTrips;
+import com.mapbox.services.api.optimizedtrips.v1.models.OptimizedTripsResponse;
+import com.mapbox.services.api.utils.turf.TurfConstants;
+import com.mapbox.services.api.utils.turf.TurfMeasurement;
+import com.mapbox.services.api.utils.turf.TurfMisc;
+import com.mapbox.services.commons.geojson.Feature;
+import com.mapbox.services.commons.geojson.FeatureCollection;
+import com.mapbox.services.commons.geojson.LineString;
+import com.mapbox.services.commons.geojson.Point;
+import com.mapbox.services.commons.models.Position;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import timber.log.Timber;
+
+public class OptimizedTripActivity extends AppCompatActivity implements OnMapReadyCallback {
+
+  private static final String LINE_SOURCE = "line-source";
+  private static final String LINE_LAYER = "line-layer";
+
+  private MapView mapView;
+  private MapboxMap mapboxMap;
+  private List<MarkerOptions> tripStops;
+  private ValueAnimator valueAnimator;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_optimized_trip);
+
+    tripStops = new ArrayList<>();
+    tripStops.add(new MarkerOptions().position(new LatLng(40.74302, -73.99322)));
+    tripStops.add(new MarkerOptions().position(new LatLng(40.74451, -73.97920)));
+    tripStops.add(new MarkerOptions().position(new LatLng(40.75979, -73.99179)));
+    tripStops.add(new MarkerOptions().position(new LatLng(40.76369, -73.97144)));
+    tripStops.add(new MarkerOptions().position(new LatLng(40.75906, -73.98812)));
+
+    mapView = (MapView) findViewById(R.id.mapView);
+    mapView.onCreate(savedInstanceState);
+    mapView.getMapAsync(this);
+
+  }
+
+  @Override
+  public void onMapReady(MapboxMap mapboxMap) {
+    this.mapboxMap = mapboxMap;
+    mapboxMap.addMarkers(tripStops);
+
+    MapboxOptimizedTrips.Builder builder = new MapboxOptimizedTrips.Builder()
+      .setAccessToken(Mapbox.getAccessToken())
+      .setProfile(DirectionsCriteria.PROFILE_DRIVING)
+      // .setRoundTrip(false)
+      .setSource(DirectionsCriteria.SOURCE_FIRST)
+      // .setDestination(DirectionsCriteria.SOURCE_LAST)
+      .setOverview(DirectionsCriteria.OVERVIEW_FULL);
+
+    List<Position> coords = new ArrayList<>();
+    LatLngBounds.Builder boundsBuilder = new LatLngBounds.Builder();
+    for (MarkerOptions markerOptions : tripStops) {
+      coords.add(Position.fromCoordinates(
+        markerOptions.getPosition().getLongitude(),
+        markerOptions.getPosition().getLatitude())
+      );
+
+      boundsBuilder.include(markerOptions.getPosition());
+    }
+
+    mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(boundsBuilder.build(), 150));
+
+    MapboxOptimizedTrips client = builder.setCoordinates(coords).build();
+    client.enqueueCall(new Callback<OptimizedTripsResponse>() {
+      @Override
+      public void onResponse(Call<OptimizedTripsResponse> call, Response<OptimizedTripsResponse> response) {
+        Timber.v("Call Url: %s", call.request().url().toString());
+
+        drawLine(response.body().getTrips().get(0).getGeometry());
+      }
+
+      @Override
+      public void onFailure(Call<OptimizedTripsResponse> call, Throwable throwable) {
+        Timber.e("Calling optimize trips failed: ", throwable);
+      }
+    });
+  }
+
+  private void drawLine(String geometry) {
+
+    LineString linestring = LineString.fromPolyline(geometry, Constants.PRECISION_6);
+    FeatureCollection featureCollection
+      = FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(linestring)});
+
+    GeoJsonSource source = new GeoJsonSource(LINE_SOURCE, featureCollection);
+    mapboxMap.addSource(source);
+
+    LineLayer layer = new LineLayer(LINE_LAYER, LINE_SOURCE).withProperties(
+      PropertyFactory.lineWidth(5f),
+      PropertyFactory.lineColor(Color.parseColor("#009DF9"))
+    );
+
+    mapboxMap.addLayerBelow(layer, "poi-parks-scalerank2");
+
+    startAnimation(
+      Position.fromCoordinates(
+        tripStops.get(0).getPosition().getLongitude(),
+        tripStops.get(0).getPosition().getLatitude()),
+      linestring);
+
+  }
+
+  private void startAnimation(final Position startPosition, final LineString route) {
+
+    final double routeDistance = TurfMeasurement.lineDistance(route, TurfConstants.UNIT_METERS);
+
+    valueAnimator = ValueAnimator.ofFloat(0, 1);
+    valueAnimator.setDuration(30000);
+    valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+      @Override
+      public void onAnimationUpdate(ValueAnimator animation) {
+        Point currentPoint = TurfMeasurement.along(
+          route,
+          routeDistance * (double) animation.getAnimatedFraction(),
+          TurfConstants.UNIT_METERS
+        );
+        LineString newLine = TurfMisc.lineSlice(Point.fromCoordinates(startPosition), currentPoint, route);
+
+        GeoJsonSource source = mapboxMap.getSourceAs(LINE_SOURCE);
+        if (source != null) {
+          FeatureCollection newRouteFeature
+            = FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(newLine)});
+          source.setGeoJson(newRouteFeature);
+
+        }
+      }
+    });
+    valueAnimator.start();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    mapView.onResume();
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+    if (valueAnimator != null) {
+      valueAnimator.removeAllUpdateListeners();
+    }
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    mapView.onPause();
+  }
+
+  @Override
+  public void onLowMemory() {
+    super.onLowMemory();
+    mapView.onLowMemory();
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    mapView.onDestroy();
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    mapView.onSaveInstanceState(outState);
+  }
+}
diff --git a/mapbox/app/src/main/res/layout/activity_optimized_trip.xml b/mapbox/app/src/main/res/layout/activity_optimized_trip.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".optimizedtrip.OptimizedTripActivity">
+
+    <com.mapbox.mapboxsdk.maps.MapView
+        android:id="@+id/mapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        mapbox:mapbox_styleUrl="@string/mapbox_style_light"/>
+
+</RelativeLayout>
diff --git a/mapbox/app/src/main/res/values/strings.xml b/mapbox/app/src/main/res/values/strings.xml
@@ -59,6 +59,9 @@
     <string name="description_turf_inside">Use Turf to determine if something is within a polygon.</string>
     <string name="description_turf_midpoint">Use Turf to get a midpoint.</string>
     <string name="description_connectivity">Keep track of the connectivity status.</string>
+    <string name="title_optimized_trip">Optimized Trip</string>
+    <string name="description_optimized_trip">Use the optimized trip API to solve the traveling salesperson problem</string>
+
 
     <string-array name="turf_calculation_items">
         <item>Select calculation</item>

diff --git a/...java-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java b/...java-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsCriteria.java
@@ -117,6 +117,11 @@ public class DirectionsCriteria {
    */
   public static final String RESPONSE_OK = "Ok";
 
+  public static final String SOURCE_FIRST = "first";
+  public static final String SOURCE_ANY = "any";
+  public static final String SOURCE_LAST = "last";
+
+
   /**
    * There was no route found for the given query.
    *

diff --git a/...bjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsService.java b/...bjava-services/src/main/java/com/mapbox/services/api/directions/v5/DirectionsService.java
@@ -32,7 +32,7 @@ public interface DirectionsService {
    *                         the angle of approach
    * @param continueStraight Define whether the route should continue straight even if the route
    *                         will be slower.  @return A retrofit Call object
-   * @param annotations       An annotations object that contains additional details about each line segment along the
+   * @param annotations      An annotations object that contains additional details about each line segment along the
    *                         route geometry. Each entry in an annotations field corresponds to a coordinate along the
    *                         route geometry.
    * @since 1.0.0

diff --git a/...ibjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java b/...ibjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java
@@ -161,6 +161,10 @@ public Builder() {
       this.geometries = DirectionsCriteria.GEOMETRY_POLYLINE6;
     }
 
+    /*
+     * Setters
+     */
+
     /**
      * The SDK currently only supports {@code Polyline} geometry (not GeoJSON) to simplify the response. You do have
      * the option on whether the precision is 5 or 6 using either {@link DirectionsCriteria#GEOMETRY_POLYLINE} or
@@ -175,10 +179,6 @@ public T setGeometry(String geometries) {
       return (T) this;
     }
 
-    /*
-     * Setters
-     */
-
     /**
      * @param user User string
      * @return Builder