use MAS 3.0-beta.4upstream/osana-mas-beta4

3 files changed, 17 insertions, 27 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index 5c740554cd..4a2f29b503 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -187,7 +187,7 @@ public class GeoJsonSource extends Source {
    *
    * @param geometry the GeoJSON {@link Geometry} to set
    */
-  public void setGeoJson(Geometry<?> geometry) {
+  public void setGeoJson(Geometry geometry) {
     nativeSetGeometry(geometry);
   }
 
@@ -259,7 +259,7 @@ public class GeoJsonSource extends Source {
 
   private native void nativeSetFeature(Feature feature);
 
-  private native void nativeSetGeometry(Geometry<?> geometry);
+  private native void nativeSetGeometry(Geometry geometry);
 
   private native Feature[] querySourceFeatures(Object[] filter);
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
index 15d7024abf..471fcd438b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionActivity.java
@@ -4,6 +4,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
+import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -14,6 +15,8 @@ import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.geojson.Polygon;
 
+import java.util.Arrays;
+
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionHeight;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpacity;
@@ -35,30 +38,17 @@ public class FillExtrusionActivity extends AppCompatActivity {
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(map -> {
       mapboxMap = map;
-      Polygon domTower = Polygon.fromLngLats(new double[][][] {
-        new double[][] {
-          new double[] {
-            5.12112557888031,
-            52.09071040847704
-          },
-          new double[] {
-            5.121227502822875,
-            52.09053901776669
-          },
-          new double[] {
-            5.121484994888306,
-            52.090601641371805
-          },
-          new double[] {
-            5.1213884353637695,
-            52.090766439912635
-          },
-          new double[] {
-            5.12112557888031,
-            52.09071040847704
-          }
-        }
-      });
+      Polygon domTower = Polygon.fromLngLats(
+        Arrays.asList(
+          Arrays.asList(
+            Point.fromLngLat(5.12112557888031, 52.09071040847704),
+            Point.fromLngLat(5.121227502822875, 52.09053901776669),
+            Point.fromLngLat(5.121484994888306, 52.090601641371805),
+            Point.fromLngLat(5.1213884353637695, 52.090766439912635),
+            Point.fromLngLat(5.12112557888031, 52.09071040847704)
+          )
+        )
+      );
 
       GeoJsonSource source = new GeoJsonSource("extrusion-source", domTower);
       map.addSource(source);
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index 695cca3a29..02c1f4775f 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -8,7 +8,7 @@ ext {
     ]
 
     versions = [
-            mapboxServices : '3.0.0-beta.2',
+            mapboxServices : '3.0.0-beta.4',
             mapboxTelemetry: '3.0.0-beta.1',
             mapboxGestures : '0.1.0-20180227.133736-12',
             supportLib     : '25.4.0',