diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src')
2 files changed, 77 insertions, 12 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt new file mode 100644 index 0000000000..9a92a23f9b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/TransformTest.kt @@ -0,0 +1,67 @@ +package com.mapbox.mapboxsdk.maps + +import android.support.test.espresso.UiController +import com.mapbox.mapboxsdk.camera.CameraUpdateFactory +import com.mapbox.mapboxsdk.geometry.LatLng +import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke +import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest +import com.mapbox.mapboxsdk.testapp.activity.maplayout.SimpleMapActivity +import com.mapbox.mapboxsdk.testapp.utils.TestConstants +import org.junit.Assert.assertEquals +import org.junit.Test + + +class TransformTest: BaseActivityTest() { + + override fun getActivityClass(): Class<*> = SimpleMapActivity::class.java + + companion object { + val initialCameraUpdate = CameraUpdateFactory.newLatLngZoom(LatLng(12.0,12.0), 12.0)!! + val scrollByCameraUpdate = CameraUpdateFactory.scrollBy(400.0f,0.0f)!! + } + + @Test + fun cameraUpdateScrollByWithPadding() { + validateTestSetup() + invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap -> + mapboxMap.moveCamera(initialCameraUpdate) + mapboxMap.moveCamera(scrollByCameraUpdate) + val expectedCameraPosition = mapboxMap.cameraPosition + + mapboxMap.moveCamera(initialCameraUpdate) + mapboxMap.setPadding(250,250,0,0) + mapboxMap.moveCamera(scrollByCameraUpdate) + val actualCameraPosition = mapboxMap.cameraPosition + + assertEquals("Camera position latitude should match", + expectedCameraPosition.target.latitude, + actualCameraPosition.target.longitude, + TestConstants.LAT_LNG_DELTA + ) + + assertEquals("Camera position longitude should match", + expectedCameraPosition.target.longitude, + actualCameraPosition.target.longitude, + TestConstants.LAT_LNG_DELTA + ) + } + } + + @Test + fun mapboxMapScrollByWithPadding() { + validateTestSetup() + invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap -> + mapboxMap.moveCamera(initialCameraUpdate) + mapboxMap.scrollBy(400.0f, 0.0f) + val expectedCameraPosition = mapboxMap.cameraPosition + + mapboxMap.moveCamera(initialCameraUpdate) + mapboxMap.setPadding(250,250,0,0) + mapboxMap.scrollBy(400.0f, 0.0f) + val actualCameraPosition = mapboxMap.cameraPosition + + assertEquals("Camera position should match", expectedCameraPosition, actualCameraPosition) + } + } + +}
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java index 4906559935..957f63329f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java @@ -11,7 +11,6 @@ import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.widget.SeekBar; import android.widget.TextView; - import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -36,7 +35,7 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal super.onCreate(savedInstanceState); setContentView(R.layout.activity_scroll_by); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); ActionBar actionBar = getSupportActionBar(); @@ -45,15 +44,15 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal actionBar.setDisplayShowHomeEnabled(true); } - seekBarX = (SeekBar) findViewById(R.id.seekbar_move_x); - TextView textViewX = (TextView) findViewById(R.id.textview_x); + seekBarX = findViewById(R.id.seekbar_move_x); + TextView textViewX = findViewById(R.id.textview_x); seekBarX.setOnSeekBarChangeListener(new PixelBarChangeListener(textViewX, R.string.scrollby_x_value)); - seekBarY = (SeekBar) findViewById(R.id.seekbar_move_y); - TextView textViewY = (TextView) findViewById(R.id.textview_y); + seekBarY = findViewById(R.id.seekbar_move_y); + TextView textViewY = findViewById(R.id.textview_y); seekBarY.setOnSeekBarChangeListener(new PixelBarChangeListener(textViewY, R.string.scrollby_y_value)); - mapView = (MapView) findViewById(R.id.mapView); + mapView = findViewById(R.id.mapView); mapView.setTag(true); mapView.onCreate(savedInstanceState); mapView.getMapAsync(this); @@ -65,11 +64,10 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal UiSettings uiSettings = mapboxMap.getUiSettings(); uiSettings.setLogoEnabled(false); uiSettings.setAttributionEnabled(false); - - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + FloatingActionButton fab = findViewById(R.id.fab); fab.setColorFilter(ContextCompat.getColor(ScrollByActivity.this, R.color.primary)); - fab.setOnClickListener(view -> mapboxMap.easeCamera(CameraUpdateFactory.scrollBy( - seekBarX.getProgress() * MULTIPLIER_PER_PIXEL, + fab.setOnClickListener(view -> mapboxMap.easeCamera( + CameraUpdateFactory.scrollBy(seekBarX.getProgress() * MULTIPLIER_PER_PIXEL, seekBarY.getProgress() * MULTIPLIER_PER_PIXEL) )); } @@ -133,7 +131,7 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal private int prefixTextResource; private TextView valueView; - public PixelBarChangeListener(@NonNull TextView textView, @StringRes int textRes) { + PixelBarChangeListener(@NonNull TextView textView, @StringRes int textRes) { valueView = textView; prefixTextResource = textRes; } |