[android] - consitent use of ms unit for time in java code, unit conversion always happens in cpp code (#8578)
This commit is contained in:
@@ -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
|
||||
//
|
||||
|
||||
@@ -397,7 +397,7 @@ void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu
|
||||
}
|
||||
|
||||
mbgl::AnimationOptions animationOptions;
|
||||
animationOptions.duration.emplace(mbgl::Duration(duration));
|
||||
animationOptions.duration.emplace(mbgl::Milliseconds(duration));
|
||||
if (!easing) {
|
||||
// add a linear interpolator instead of easing
|
||||
animationOptions.easing.emplace(mbgl::util::UnitBezier { 0, 0, 1, 1 });
|
||||
@@ -421,7 +421,7 @@ void NativeMapView::flyTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitud
|
||||
}
|
||||
|
||||
mbgl::AnimationOptions animationOptions;
|
||||
animationOptions.duration.emplace(mbgl::Duration(duration));
|
||||
animationOptions.duration.emplace(mbgl::Milliseconds(duration));
|
||||
map->flyTo(cameraOptions, animationOptions);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user