diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-02-07 10:26:25 +0100 |
---|---|---|
committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-02-11 16:55:49 +0100 |
commit | f56d56b3c60881a45aaa5a1b1ef1280ef37dd045 (patch) | |
tree | 5acd5948f7cebd7097f6d95f7fdd06347be5aec5 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | |
parent | 7acaa3b467552e952354b17bd39b913a02a90167 (diff) | |
download | qtlocation-mapboxgl-upstream/lp-13770-gestures-bounds.tar.gz |
[android] limit the acceptable gestures offset if camera bounds are presentupstream/lp-13770-gestures-bounds
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 | 36 |
1 files changed, 32 insertions, 4 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 10942d521c..ed06dc605c 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 @@ -10,6 +10,7 @@ import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; + import com.mapbox.geojson.Feature; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.LibraryLoader; @@ -214,13 +215,22 @@ final class NativeMapView implements NativeMap { } @Override - public void setLatLngBounds(LatLngBounds latLngBounds) { + public void setLatLngBounds(@Nullable LatLngBounds latLngBounds) { if (checkState("setLatLngBounds")) { return; } nativeSetLatLngBounds(latLngBounds); } + @NonNull + @Override + public LatLngBounds getLatLngBounds() { + if (checkState("getLatLngBounds")) { + return LatLngBounds.world(); + } + return nativeGetLatLngBounds(); + } + @Override public void cancelTransitions() { if (checkState("cancelTransitions")) { @@ -254,11 +264,11 @@ final class NativeMapView implements NativeMap { } @Override - public LatLng getLatLng() { + public LatLng getLatLng(boolean padded) { if (checkState("")) { return new LatLng(); } - return nativeGetLatLng(); + return nativeGetLatLng(padded); } @Override @@ -665,6 +675,17 @@ final class NativeMapView implements NativeMap { } @Override + @NonNull + public PointF pixelForLatLngRaw(@NonNull LatLng latLng) { + if (checkState("pixelForLatLngRaw")) { + return new PointF(); + } + PointF pointF = nativePixelForLatLngRaw(latLng.getLatitude(), latLng.getLongitude()); + pointF.set(pointF.x * pixelRatio, pointF.y * pixelRatio); + return pointF; + } + + @Override public LatLng latLngForPixel(@NonNull PointF pixel) { if (checkState("latLngForPixel")) { return new LatLng(); @@ -1095,6 +1116,9 @@ final class NativeMapView implements NativeMap { private native void nativeSetLatLngBounds(LatLngBounds latLngBounds); @Keep + private native LatLngBounds nativeGetLatLngBounds(); + + @Keep private native void nativeCancelTransitions(); @Keep @@ -1108,7 +1132,7 @@ final class NativeMapView implements NativeMap { @NonNull @Keep - private native LatLng nativeGetLatLng(); + private native LatLng nativeGetLatLng(boolean padded); @NonNull @Keep @@ -1242,6 +1266,10 @@ final class NativeMapView implements NativeMap { @NonNull @Keep + private native PointF nativePixelForLatLngRaw(double lat, double lon); + + @NonNull + @Keep private native LatLng nativeLatLngForPixel(float x, float y); @Keep |