From 152b48fd92f9c7c33b45b4b1974da43c55d35d42 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 30 Mar 2017 13:25:42 +0200 Subject: [android] - consitent use of ms unit for time in java code, unit conversion always happens in cpp code (#8578) --- .../src/main/java/com/mapbox/mapboxsdk/maps/Transform.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java') diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java index ec4b903a74..6699bedfac 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java @@ -13,8 +13,6 @@ import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.widgets.MyLocationView; -import java.util.concurrent.TimeUnit; - import timber.log.Timber; import static com.mapbox.mapboxsdk.maps.MapView.REGION_DID_CHANGE_ANIMATED; @@ -108,7 +106,7 @@ final class Transform implements MapView.OnMapChangedListener { mapView.addOnMapChangedListener(this); } - mapView.easeTo(cameraPosition.bearing, cameraPosition.target, getDurationNano(durationMs), cameraPosition.tilt, + mapView.easeTo(cameraPosition.bearing, cameraPosition.target, durationMs, cameraPosition.tilt, cameraPosition.zoom, easingInterpolator); } } @@ -126,7 +124,7 @@ final class Transform implements MapView.OnMapChangedListener { mapView.addOnMapChangedListener(this); } - mapView.flyTo(cameraPosition.bearing, cameraPosition.target, getDurationNano(durationMs), cameraPosition.tilt, + mapView.flyTo(cameraPosition.bearing, cameraPosition.target, durationMs, cameraPosition.tilt, cameraPosition.zoom); } } @@ -161,10 +159,6 @@ final class Transform implements MapView.OnMapChangedListener { this.onCameraChangeListener = listener; } - private long getDurationNano(long durationMs) { - return durationMs > 0 ? TimeUnit.NANOSECONDS.convert(durationMs, TimeUnit.MILLISECONDS) : 0; - } - // // non Camera API // -- cgit v1.2.1