1 files changed, 49 insertions, 53 deletions
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 9a7790c6e5..a88a489cb1 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
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp.activity.style;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
@@ -10,7 +9,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 import com.mapbox.mapboxsdk.testapp.R;
@@ -26,6 +24,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionOpa
 public class FillExtrusionActivity extends AppCompatActivity {
 
   private MapView mapView;
+  private MapboxMap mapboxMap;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -34,58 +33,55 @@ public class FillExtrusionActivity extends AppCompatActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(@NonNull
-                             final MapboxMap map) {
-        Polygon domTower = Polygon.fromCoordinates(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
-            }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+      Polygon domTower = Polygon.fromCoordinates(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
           }
-        });
-
-        GeoJsonSource source = new GeoJsonSource("extrusion-source", domTower);
-        map.addSource(source);
-
-        map.addLayer(
-          new FillExtrusionLayer("extrusion-layer", source.getId())
-            .withProperties(
-              fillExtrusionHeight(40f),
-              fillExtrusionOpacity(0.5f),
-              fillExtrusionColor(Color.RED)
-            )
-        );
-
-        map.animateCamera(
-          CameraUpdateFactory.newCameraPosition(
-            new CameraPosition.Builder()
-              .target(new LatLng(52.09071040847704, 5.12112557888031))
-              .tilt(45.0)
-              .zoom(18)
-              .build()
-          ),
-          10000
-        );
-      }
+        }
+      });
+
+      GeoJsonSource source = new GeoJsonSource("extrusion-source", domTower);
+      map.addSource(source);
+
+      mapboxMap.addLayer(
+        new FillExtrusionLayer("extrusion-layer", source.getId())
+          .withProperties(
+            fillExtrusionHeight(40f),
+            fillExtrusionOpacity(0.5f),
+            fillExtrusionColor(Color.RED)
+          )
+      );
+
+      mapboxMap.animateCamera(
+        CameraUpdateFactory.newCameraPosition(
+          new CameraPosition.Builder()
+            .target(new LatLng(52.09071040847704, 5.12112557888031))
+            .tilt(45.0)
+            .zoom(18)
+            .build()
+        ),
+        10000
+      );
     });
   }