diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-04-15 11:58:46 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-04-17 11:40:15 +0200 |
commit | d89b13f9555b3cde33499ed7bcece20c166e4dfd (patch) | |
tree | 1d52f5f57f8ba6c7b13a11655f46766169933f88 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | |
parent | 425553646bc79286687f240da34144b44949c9f1 (diff) | |
download | qtlocation-mapboxgl-d89b13f9555b3cde33499ed7bcece20c166e4dfd.tar.gz |
[android] - unify has surface state handling
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java')
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 7409a83136..249a5f8d7b 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -68,9 +68,6 @@ final class NativeMapView implements NativeMap { // Flag to indicate destroy was called private boolean destroyed = false; - // Flag to indicate surface was destroyed - private boolean hasSurface = false; - // Holds the pointer to JNI NativeMapView @Keep private long nativePtr = 0; @@ -535,7 +532,7 @@ final class NativeMapView implements NativeMap { @Override @NonNull public long[] queryPointAnnotations(RectF rect) { - if (checkState("queryPointAnnotations")) { + if (checkState("queryPointAnnotations") || !mapRenderer.hasSurface()) { return new long[] {}; } return nativeQueryPointAnnotations(rect); @@ -544,7 +541,7 @@ final class NativeMapView implements NativeMap { @Override @NonNull public long[] queryShapeAnnotations(RectF rectF) { - if (checkState("queryShapeAnnotations")) { + if (checkState("queryShapeAnnotations") || !mapRenderer.hasSurface()) { return new long[] {}; } return nativeQueryShapeAnnotations(rectF); @@ -893,7 +890,7 @@ final class NativeMapView implements NativeMap { public List<Feature> queryRenderedFeatures(@NonNull PointF coordinates, @Nullable String[] layerIds, @Nullable Expression filter) { - if (checkState("queryRenderedFeatures") || !hasSurface) { + if (checkState("queryRenderedFeatures") || !mapRenderer.hasSurface()) { return new ArrayList<>(); } Feature[] features = nativeQueryRenderedFeaturesForPoint(coordinates.x / pixelRatio, @@ -906,7 +903,7 @@ final class NativeMapView implements NativeMap { public List<Feature> queryRenderedFeatures(@NonNull RectF coordinates, @Nullable String[] layerIds, @Nullable Expression filter) { - if (checkState("queryRenderedFeatures") || !hasSurface) { + if (checkState("queryRenderedFeatures") || !mapRenderer.hasSurface()) { return new ArrayList<>(); } Feature[] features = nativeQueryRenderedFeaturesForBox( @@ -1426,16 +1423,6 @@ final class NativeMapView implements NativeMap { return destroyed; } - @Override - public boolean hasSurface() { - return hasSurface; - } - - @Override - public void setHasSurface(boolean hasSurface) { - this.hasSurface = hasSurface; - } - public interface ViewCallback { @Nullable Bitmap getViewContent(); |