[android] - updated mas in testapp

4 files changed, 8 insertions, 11 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 93def53b5c..852fb4dc48 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -91,7 +91,7 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
 
     // Mapbox Android Services
-    compile('com.mapbox.mapboxsdk:mapbox-android-services:1.1.0@aar') {
+    compile('com.mapbox.mapboxsdk:mapbox-android-services:2.0.0-SNAPSHOT@aar') {
         transitive = true
     }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
index 705716355e..c06e58dc26 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -33,7 +33,6 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
 
     private MapView mMapView;
     private MapboxMap mMapboxMap;
-    private Random random = new Random();
 
     private LatLng dupontCircle = new LatLng(38.90962, -77.04341);
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
index 7c99e16b2e..18b4daf3a7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/geocoding/GeocoderActivity.java
@@ -26,7 +26,7 @@ import com.mapbox.services.commons.ServicesException;
 import com.mapbox.services.commons.models.Position;
 import com.mapbox.services.geocoding.v5.GeocodingCriteria;
 import com.mapbox.services.geocoding.v5.MapboxGeocoding;
-import com.mapbox.services.geocoding.v5.models.GeocodingFeature;
+import com.mapbox.services.geocoding.v5.models.CarmenFeature;
 import com.mapbox.services.geocoding.v5.models.GeocodingResponse;
 
 import java.util.List;
@@ -130,14 +130,14 @@ public class GeocoderActivity extends AppCompatActivity {
             MapboxGeocoding client = new MapboxGeocoding.Builder()
                     .setAccessToken(getString(R.string.mapbox_access_token))
                     .setCoordinates(Position.fromCoordinates(point.getLongitude(), point.getLatitude()))
-                    .setType(GeocodingCriteria.TYPE_POI)
+                    .setGeocodingType(GeocodingCriteria.TYPE_POI)
                     .build();
 
             client.enqueueCall(new Callback<GeocodingResponse>() {
                 @Override
                 public void onResponse(Call<GeocodingResponse> call, Response<GeocodingResponse> response) {
 
-                    List<GeocodingFeature> results = response.body().getFeatures();
+                    List<CarmenFeature> results = response.body().getFeatures();
                     if (results.size() > 0) {
                         String placeName = results.get(0).getPlaceName();
                         setSuccess(placeName);
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
index 7a6e425652..7cce3d4a8e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/navigation/LocationPickerActivity.java
@@ -28,10 +28,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.MarkerView;
 import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
@@ -48,7 +46,7 @@ import com.mapbox.services.commons.ServicesException;
 import com.mapbox.services.commons.models.Position;
 import com.mapbox.services.geocoding.v5.GeocodingCriteria;
 import com.mapbox.services.geocoding.v5.MapboxGeocoding;
-import com.mapbox.services.geocoding.v5.models.GeocodingFeature;
+import com.mapbox.services.geocoding.v5.models.CarmenFeature;
 import com.mapbox.services.geocoding.v5.models.GeocodingResponse;
 
 import java.util.List;
@@ -313,7 +311,7 @@ public class LocationPickerActivity extends AppCompatActivity {
             MapboxGeocoding client = new MapboxGeocoding.Builder()
                     .setAccessToken(getString(R.string.mapbox_access_token))
                     .setCoordinates(Position.fromCoordinates(point.getLongitude(), point.getLatitude()))
-                    .setType(GeocodingCriteria.TYPE_ADDRESS)
+                    .setGeocodingType(GeocodingCriteria.TYPE_ADDRESS)
                     .build();
 
             //Place the request
@@ -321,10 +319,10 @@ public class LocationPickerActivity extends AppCompatActivity {
                 @Override
                 public void onResponse(Call<GeocodingResponse> call, Response<GeocodingResponse> response) {
 
-                    List<GeocodingFeature> results = response.body().getFeatures();
+                    List<CarmenFeature> results = response.body().getFeatures();
                     String address = null;
                     if (results.size() > 0) {
-                        GeocodingFeature feature = results.get(0);
+                        CarmenFeature feature = results.get(0);
                         address = feature.getAddress() + " " + feature.getText();
                         Log.i(TAG, "address " + address);
                     } else {