1 files changed, 20 insertions, 29 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
index 861f2fef34..c8bef26856 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QuerySourceFeaturesActivity.java
@@ -1,15 +1,12 @@
 package com.mapbox.mapboxsdk.testapp.activity.feature;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.google.gson.JsonObject;
-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.CircleLayer;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
@@ -38,32 +35,26 @@ public class QuerySourceFeaturesActivity extends AppCompatActivity {
     // Initialize map as normal
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(final MapboxMap mapboxMap) {
-        QuerySourceFeaturesActivity.this.mapboxMap = mapboxMap;
-
-        JsonObject properties = new JsonObject();
-        properties.addProperty("key1", "value1");
-        final GeoJsonSource source = new GeoJsonSource("test-source",
-          FeatureCollection.fromFeatures(new Feature[] {
-            Feature.fromGeometry(Point.fromCoordinates(new double[] {0, 0}), properties)
-          }));
-        mapboxMap.addSource(source);
-
-        mapboxMap.addLayer(new CircleLayer("test-layer", source.getId()).withFilter(Filter.neq("key1", "value1")));
-
-        // Add a click listener
-        mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
-          @Override
-          public void onMapClick(@NonNull LatLng point) {
-            // Query
-            List<Feature> features = source.querySourceFeatures(Filter.eq("key1", "value1"));
-            Toast.makeText(QuerySourceFeaturesActivity.this, String.format("Found %s features",
-              features.size()), Toast.LENGTH_SHORT).show();
-          }
-        });
-      }
+    mapView.getMapAsync(mapboxMap -> {
+      QuerySourceFeaturesActivity.this.mapboxMap = mapboxMap;
+
+      JsonObject properties = new JsonObject();
+      properties.addProperty("key1", "value1");
+      final GeoJsonSource source = new GeoJsonSource("test-source",
+        FeatureCollection.fromFeatures(new Feature[] {
+          Feature.fromGeometry(Point.fromCoordinates(new double[] {0, 0}), properties)
+        }));
+      mapboxMap.addSource(source);
+
+      mapboxMap.addLayer(new CircleLayer("test-layer", source.getId()).withFilter(Filter.neq("key1", "value1")));
+
+      // Add a click listener
+      mapboxMap.setOnMapClickListener(point -> {
+        // Query
+        List<Feature> features = source.querySourceFeatures(Filter.eq("key1", "value1"));
+        Toast.makeText(QuerySourceFeaturesActivity.this, String.format("Found %s features",
+          features.size()), Toast.LENGTH_SHORT).show();
+      });
     });
 
   }