tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] rename required TransitionOptions field

Browse Source
This commit is contained in:
Łukasz Paczos
2019-01-21 17:39:14 +01:00
committed by Łukasz Paczos
parent a4b814dd16
commit 9604953d90
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
View File

@@ -10,6 +10,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng
import com.mapbox.mapboxsdk.geometry.LatLngBounds
import com.mapbox.mapboxsdk.geometry.ProjectedMeters
import com.mapbox.mapboxsdk.maps.renderer.MapRenderer
import com.mapbox.mapboxsdk.style.layers.TransitionOptions
import com.mapbox.mapboxsdk.testapp.utils.TestConstants
import junit.framework.Assert.assertEquals
import org.junit.Before
@@ -319,6 +320,14 @@ class NativeMapViewTest {
assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
}
@Test
@UiThreadTest
fun testTransitionOptions() {
val transitionOptions = TransitionOptions(500, 500)
nativeMapView.transitionOptions = transitionOptions
assertEquals(transitionOptions, nativeMapView.transitionOptions)
}
class DummyRenderer(context: Context) : MapRenderer(context, null) {
override fun requestRender() {

2
platform/android/src/native_map_view.cpp
View File

@@ -688,7 +688,7 @@ jni::Local<jni::Object<TransitionOptions>> NativeMapView::getTransitionOptions(J
void NativeMapView::setTransitionOptions(JNIEnv& env, const jni::Object<TransitionOptions>& options) {
const mbgl::style::TransitionOptions transitionOptions(
Duration(mbgl::Milliseconds(TransitionOptions::getDuration(env, options))),
Duration(mbgl::Milliseconds(TransitionOptions::getOffset(env, options)))
Duration(mbgl::Milliseconds(TransitionOptions::getDelay(env, options)))
);
map->getStyle().setTransitionOptions(transitionOptions);
}

4
platform/android/src/style/transition_options.cpp
View File

@@ -15,9 +15,9 @@ long TransitionOptions::getDuration(jni::JNIEnv& env, const jni::Object<Transiti
return transitionOptions.Get(env, field);
}
long TransitionOptions::getOffset(jni::JNIEnv& env, const jni::Object<TransitionOptions>& transitionOptions) {
long TransitionOptions::getDelay(jni::JNIEnv& env, const jni::Object<TransitionOptions>& transitionOptions) {
static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
static auto field = javaClass.GetField<jlong>(env, "offset");
static auto field = javaClass.GetField<jlong>(env, "delay");
return transitionOptions.Get(env, field);
}

2
platform/android/src/style/transition_options.hpp
View File

@@ -15,7 +15,7 @@ public:
static long getDuration(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
static long getOffset(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
static long getDelay(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
static void registerNative(jni::JNIEnv&);
};