mapbox · osana · Feb 8, 2018 · Jan 27, 2018
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -16,6 +16,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
@@ -42,8 +44,6 @@
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.Geometry;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;

diff --git a/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -11,6 +11,8 @@
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.Marker;
@@ -29,8 +31,6 @@
 import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.utils.BitmapUtils;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.Geometry;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

diff --git a/...oxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/...oxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java
@@ -5,10 +5,10 @@
 import android.support.annotation.UiThread;
 import android.support.annotation.WorkerThread;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.style.layers.Filter;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

diff --git a/...id/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/...id/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -4,10 +4,10 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
+import com.mapbox.geojson.Geometry;
 import com.mapbox.mapboxsdk.style.layers.Filter;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
-import com.mapbox.services.commons.geojson.Geometry;
 
 import java.net.URL;
 import java.util.ArrayList;

diff --git a/...oxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java b/...oxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeometryTileProvider.java
@@ -2,8 +2,8 @@
 
 import android.support.annotation.WorkerThread;
 
+import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.services.commons.geojson.FeatureCollection;
 
 /**
  * Interface that defines methods for working with {@link CustomGeometrySource}.

diff --git a/...oid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/...oid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java
@@ -5,8 +5,8 @@
 import android.support.annotation.Size;
 import android.support.annotation.UiThread;
 
+import com.mapbox.geojson.Feature;
 import com.mapbox.mapboxsdk.style.layers.Filter;
-import com.mapbox.services.commons.geojson.Feature;
 
 import java.net.URL;
 import java.util.ArrayList;

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -57,6 +57,8 @@ dependencies {
         transitive = true
     }
 
+    api dependenciesList.mapboxJavaTurf
+
     implementation dependenciesList.supportAppcompatV7
     implementation dependenciesList.supportRecyclerView
     implementation dependenciesList.supportDesign

diff --git a/...DKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java b/...DKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/GeoJsonSourceTests.java
@@ -13,9 +13,9 @@
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.ResourceUtils;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
-import com.mapbox.services.commons.geojson.Point;
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
+import com.mapbox.geojson.Point;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
@@ -67,7 +67,7 @@ public void testPointGeometry() {
 
       @Override
       public void perform(UiController uiController, View view) {
-        GeoJsonSource source = new GeoJsonSource("source", Point.fromCoordinates(new double[] {0d, 0d}));
+        GeoJsonSource source = new GeoJsonSource("source", Point.fromLngLat(0d, 0d));
         mapboxMap.addSource(source);
 
         mapboxMap.addLayer(new CircleLayer("layer", source.getId()));

diff --git a/...rc/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/...rc/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -12,6 +12,7 @@
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
+import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
@@ -25,8 +26,7 @@
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
-import com.mapbox.services.api.utils.turf.TurfMeasurement;
-import com.mapbox.services.commons.models.Position;
+import com.mapbox.turf.TurfMeasurement;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -272,8 +272,8 @@ public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) {
 
   private double getBearing(LatLng from, LatLng to) {
     return TurfMeasurement.bearing(
-      Position.fromCoordinates(from.getLongitude(), from.getLatitude()),
-      Position.fromCoordinates(to.getLongitude(), to.getLatitude())
+      Point.fromLngLat(from.getLongitude(), from.getLatitude()),
+      Point.fromLngLat(to.getLongitude(), to.getLatitude())
     );
   }
 

diff --git a/.../com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/.../com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java
@@ -7,10 +7,10 @@
 import android.widget.Toast;
 
 import com.google.gson.JsonElement;
+import com.mapbox.geojson.Feature;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
 
 import java.util.List;
 import java.util.Map;
@@ -62,12 +62,12 @@ private void debugOutput(List<Feature> features) {
     for (Feature feature : features) {
       if (feature != null) {
         Timber.i("Got feature %s with %s properties and Geometry %s",
-          feature.getId(),
-          feature.getProperties() != null ? feature.getProperties().entrySet().size() : "<null>",
-          feature.getGeometry() != null ? feature.getGeometry().getClass().getSimpleName() : "<null>"
+          feature.id(),
+          feature.properties() != null ? feature.properties().entrySet().size() : "<null>",
+          feature.geometry() != null ? feature.geometry().getClass().getSimpleName() : "<null>"
         );
-        if (feature.getProperties() != null) {
-          for (Map.Entry<String, JsonElement> entry : feature.getProperties().entrySet()) {
+        if (feature.properties() != null) {
+          for (Map.Entry<String, JsonElement> entry : feature.properties().entrySet()) {
             Timber.i("Prop %s - %s", entry.getKey(), entry.getValue());
           }
         }

diff --git a/.../mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java b/.../mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.java
@@ -7,14 +7,15 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
+
 
 import java.util.List;
 

diff --git a/...apbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/...apbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
@@ -7,13 +7,13 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.mapbox.geojson.Feature;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.utils.ResourceUtils;
-import com.mapbox.services.commons.geojson.Feature;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...om/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java b/...om/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.java
@@ -12,12 +12,13 @@
 import android.widget.TextView;
 
 import com.google.gson.JsonElement;
+import com.mapbox.geojson.Feature;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
+
 
 import java.util.List;
 import java.util.Map;
@@ -80,12 +81,12 @@ private void debugOutput(List<Feature> features) {
     for (Feature feature : features) {
       if (feature != null) {
         Timber.i("Got feature %s with %s properties and Geometry %s",
-          feature.getId(),
-          feature.getProperties() != null ? feature.getProperties().entrySet().size() : "<null>",
-          feature.getGeometry() != null ? feature.getGeometry().getClass().getSimpleName() : "<null>"
+          feature.id(),
+          feature.properties() != null ? feature.properties().entrySet().size() : "<null>",
+          feature.geometry() != null ? feature.geometry().getClass().getSimpleName() : "<null>"
         );
-        if (feature.getProperties() != null) {
-          for (Map.Entry<String, JsonElement> entry : feature.getProperties().entrySet()) {
+        if (feature.properties() != null) {
+          for (Map.Entry<String, JsonElement> entry : feature.properties().entrySet()) {
             Timber.i("Prop %s - %s", entry.getKey(), entry.getValue());
           }
         }
@@ -114,7 +115,7 @@ public View getInfoWindow(@NonNull Marker marker) {
         if (customMarker.features.size() > 0) {
           view.addView(row(String.format("Found %s features", customMarker.features.size())));
           Feature feature = customMarker.features.get(0);
-          for (Map.Entry<String, JsonElement> prop : feature.getProperties().entrySet()) {
+          for (Map.Entry<String, JsonElement> prop : feature.properties().entrySet()) {
             view.addView(row(String.format("%s: %s", prop.getKey(), prop.getValue())));
           }
         } else {

diff --git a/.../main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java b/.../main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
@@ -5,15 +5,16 @@
 import android.widget.Toast;
 
 import com.google.gson.JsonObject;
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
+import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
-import com.mapbox.services.commons.geojson.Point;
+
 
 import java.util.List;
 
@@ -42,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
       properties.addProperty("key1", "value1");
       final GeoJsonSource source = new GeoJsonSource("test-source",
         FeatureCollection.fromFeatures(new Feature[] {
-          Feature.fromGeometry(Point.fromCoordinates(new double[] {0, 0}), properties)
+          Feature.fromGeometry(Point.fromLngLat(0, 0), properties)
         }));
       mapboxMap.addSource(source);
 

diff --git a/...stApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java b/...stApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/CustomSpriteActivity.java
@@ -7,6 +7,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
+import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
@@ -15,10 +18,7 @@
 import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
-import com.mapbox.services.commons.geojson.Point;
-import com.mapbox.services.commons.models.Position;
+
 
 import timber.log.Timber;
 
@@ -58,7 +58,7 @@ public void onClick(View view) {
             mapboxMap.addImage(CUSTOM_ICON, BitmapFactory.decodeResource(getResources(), R.drawable.ic_car_top));
 
             // Add a source with a geojson point
-            point = Point.fromCoordinates(Position.fromCoordinates(13.400972d, 52.519003d));
+            point = Point.fromLngLat(13.400972d, 52.519003d);
             source = new GeoJsonSource(
               "point",
               FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)})
@@ -78,15 +78,13 @@ public void onClick(View view) {
             fab.setImageResource(R.drawable.ic_directions_car_black);
           } else {
             // Update point
-            point = Point.fromCoordinates(
-              Position.fromCoordinates(point.getCoordinates().getLongitude() + 0.001,
-                point.getCoordinates().getLatitude() + 0.001)
-            );
+            point = Point.fromLngLat(point.longitude() + 0.001,
+                point.latitude() + 0.001);
             source.setGeoJson(FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry(point)}));
 
             // Move the camera as well
             mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(
-              point.getCoordinates().getLatitude(), point.getCoordinates().getLongitude())));
+              point.latitude(), point.longitude())));
           }
         }
       });

diff --git a/...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java b/...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
@@ -12,7 +12,7 @@
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Polygon;
+import com.mapbox.geojson.Polygon;
 
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
@@ -35,7 +35,7 @@ public void onCreate(Bundle savedInstanceState) {
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(map -> {
       mapboxMap = map;
-      Polygon domTower = Polygon.fromCoordinates(new double[][][] {
+      Polygon domTower = Polygon.fromLngLats(new double[][][] {
         new double[][] {
           new double[] {
             5.12112557888031,

diff --git a/...TestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java b/...TestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/GridSourceActivity.java
@@ -5,6 +5,10 @@
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 
+import com.mapbox.geojson.Feature;
+import com.mapbox.geojson.FeatureCollection;
+import com.mapbox.geojson.MultiLineString;
+import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -13,10 +17,7 @@
 import com.mapbox.mapboxsdk.style.sources.CustomGeometrySource;
 import com.mapbox.mapboxsdk.style.sources.GeometryTileProvider;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.services.commons.geojson.Feature;
-import com.mapbox.services.commons.geojson.FeatureCollection;
-import com.mapbox.services.commons.geojson.MultiLineString;
-import com.mapbox.services.commons.models.Position;
+
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,18 +69,18 @@ public FeatureCollection getFeaturesForBounds(LatLngBounds bounds, int zoom) {
       List gridLines = new ArrayList();
       for (double y = Math.ceil(bounds.getLatNorth() / gridSpacing) * gridSpacing;
            y >= Math.floor(bounds.getLatSouth() / gridSpacing) * gridSpacing; y -= gridSpacing) {
-        gridLines.add(Arrays.asList(Position.fromCoordinates(bounds.getLonWest(), y),
-          Position.fromCoordinates(bounds.getLonEast(), y)));
+        gridLines.add(Arrays.asList(Point.fromLngLat(bounds.getLonWest(), y),
+          Point.fromLngLat(bounds.getLonEast(), y)));
       }
-      features.add(Feature.fromGeometry(MultiLineString.fromCoordinates(gridLines)));
+      features.add(Feature.fromGeometry(MultiLineString.fromLngLats(gridLines)));
 
       gridLines = new ArrayList();
       for (double x = Math.floor(bounds.getLonWest() / gridSpacing) * gridSpacing;
            x <= Math.ceil(bounds.getLonEast() / gridSpacing) * gridSpacing; x += gridSpacing) {
-        gridLines.add(Arrays.asList(Position.fromCoordinates(x, bounds.getLatSouth()),
-          Position.fromCoordinates(x, bounds.getLatNorth())));
+        gridLines.add(Arrays.asList(Point.fromLngLat(x, bounds.getLatSouth()),
+          Point.fromLngLat(x, bounds.getLatNorth())));
       }
-      features.add(Feature.fromGeometry(MultiLineString.fromCoordinates(gridLines)));
+      features.add(Feature.fromGeometry(MultiLineString.fromLngLats(gridLines)));
 
       return FeatureCollection.fromFeatures(features);
     }