pull mapbox java deps from mapboxSdkServices 3.0.0

mapbox · Jan 19, 2018 · 41fea84 · 41fea84
1 parent d407881
commit 41fea84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle
@@ -45,6 +45,9 @@ dependencies {
   // Mapbox Android Services
   api (dependenciesList.mapboxServices) {
     transitive = true
+    exclude module: 'mapbox-java-geojson'
+    exclude module: 'mapbox-java-core'
+    exclude module: 'mapbox-java-services'
   }
 
   api dependenciesList.mapboxSdkServices

diff --git a/...c/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java b/...c/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java
@@ -4,8 +4,8 @@
 
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
 import com.mapbox.core.constants.Constants;
+import com.mapbox.geojson.LineString;
 import com.mapbox.geojson.Point;
-import com.mapbox.services.commons.geojson.LineString;
 import com.mapbox.turf.TurfConstants;
 import com.mapbox.turf.TurfMeasurement;
 
@@ -48,8 +48,8 @@ public Point target(RouteInformation routeInformation) {
     double bearing = 0;
     if (routeInformation.route() != null) {
       setupLineStringAndBearing(routeInformation.route());
-      lng = lineString.getCoordinates().get(0).getLongitude();
-      lat = lineString.getCoordinates().get(0).getLatitude();
+      lng = lineString.coordinates().get(0).longitude();
+      lat = lineString.coordinates().get(0).latitude();
       bearing = initialBearing;
     } else if (routeInformation.location() != null) {
       lng = routeInformation.location().getLongitude();
@@ -82,10 +82,10 @@ private void setupLineStringAndBearing(DirectionsRoute route) {
     lineString = LineString.fromPolyline(route.geometry(), Constants.PRECISION_6);
     initialBearing = TurfMeasurement.bearing(
             Point.fromLngLat(
-                    lineString.getCoordinates().get(0).getLongitude(), lineString.getCoordinates().get(0).getLatitude()
+                    lineString.coordinates().get(0).longitude(), lineString.coordinates().get(0).latitude()
             ),
             Point.fromLngLat(
-                    lineString.getCoordinates().get(1).getLongitude(), lineString.getCoordinates().get(1).getLatitude()
+                    lineString.coordinates().get(1).longitude(), lineString.coordinates().get(1).latitude()
             )
     );
   }