diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-04-11 14:50:36 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-04-12 13:12:31 +0200 |
commit | 58696a0704503837014bf6612eba6d537075c15e (patch) | |
tree | a5f423e3403d2378e72547ba579a7741f5b3afc4 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java | |
parent | 6c2948d3e68e25deea658d02190039db14a67723 (diff) | |
download | qtlocation-mapboxgl-58696a0704503837014bf6612eba6d537075c15e.tar.gz |
[android] - rework test to use query activity, fix attempt to render without surface crash
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java')
2 files changed, 9 insertions, 13 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java index 35ed45442c..9031240443 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.testapp.activity.feature; +import android.graphics.PointF; import android.graphics.RectF; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -89,6 +90,11 @@ public class QueryRenderedFeaturesBoxCountActivity extends AppCompatActivity { protected void onStart() { super.onStart(); mapView.onStart(); + + if (mapboxMap != null) { + // Regression test for #14394 + mapboxMap.queryRenderedFeatures(new PointF(0,0)); + } } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java index 8d82dbf6cf..7d2d245f6e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java @@ -1,10 +1,8 @@ package com.mapbox.mapboxsdk.testapp.activity.maplayout; -import android.graphics.PointF; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.testapp.R; @@ -14,7 +12,6 @@ import com.mapbox.mapboxsdk.testapp.R; public class SimpleMapActivity extends AppCompatActivity { private MapView mapView; - private MapboxMap mapboxMap; @Override protected void onCreate(Bundle savedInstanceState) { @@ -22,22 +19,15 @@ public class SimpleMapActivity extends AppCompatActivity { setContentView(R.layout.activity_map_simple); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); - mapView.getMapAsync(map -> { - mapboxMap = map; - mapboxMap.setStyle( - new Style.Builder().fromUrl(Style.MAPBOX_STREETS) - ); - }); + mapView.getMapAsync(mapboxMap -> mapboxMap.setStyle( + new Style.Builder().fromUrl(Style.MAPBOX_STREETS) + )); } @Override protected void onStart() { super.onStart(); mapView.onStart(); - if (mapboxMap != null) { - // Regression test for #14394 - mapboxMap.queryRenderedFeatures(new PointF(0,0)); - } } @Override |