Converted a few of SDK files (one package) to Kotlin (#637)

Co-authored-by: Artak Kalantarian <artak@amazon.com> Co-authored-by: Birk Skyum <74932975+birkskyum@users.noreply.github.com>
2022-12-24 11:07:20 -08:00
parent cf35b29b54
commit ccd3c60e55
16 changed files with 1062 additions and 1277 deletions
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactoryTest.kt
@@ -37,8 +37,8 @@ class CameraUpdateFactoryTest : BaseTest() {
        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0))

        val cameraPosition = mapboxMap.cameraPosition
-        assertEquals("latitude should match:", 60.0, cameraPosition.target.latitude, 0.1)
-        assertEquals("longitude should match:", 24.0, cameraPosition.target.longitude, 0.1)
+        assertEquals("latitude should match:", 60.0, cameraPosition.target!!.latitude, 0.1)
+        assertEquals("longitude should match:", 24.0, cameraPosition.target!!.longitude, 0.1)
        assertEquals("bearing should match:", 0.0, cameraPosition.bearing, 0.1)
        assertEquals("zoom should match", 5.5, cameraPosition.zoom, 0.1)
        assertEquals("tilt should match:", 0.0, cameraPosition.tilt, 0.1)
@@ -61,8 +61,8 @@ class CameraUpdateFactoryTest : BaseTest() {
        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0))

        val cameraPosition = mapboxMap.cameraPosition
-        assertEquals("latitude should match:", 60.0, cameraPosition.target.latitude, 0.1)
-        assertEquals("longitude should match:", 24.0, cameraPosition.target.longitude, 0.1)
+        assertEquals("latitude should match:", 60.0, cameraPosition.target!!.latitude, 0.1)
+        assertEquals("longitude should match:", 24.0, cameraPosition.target!!.longitude, 0.1)
        assertEquals("bearing should match:", 0.0, cameraPosition.bearing, 0.1)
        assertEquals("zoom should match", 6.0, cameraPosition.zoom, 0.1)
        assertEquals("tilt should match:", 45.0, cameraPosition.tilt, 0.1)
@@ -85,8 +85,8 @@ class CameraUpdateFactoryTest : BaseTest() {
        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0))

        val cameraPosition = mapboxMap.cameraPosition
-        assertEquals("latitude should match:", 60.0, cameraPosition.target.latitude, 0.1)
-        assertEquals("longitude should match:", 24.0, cameraPosition.target.longitude, 0.1)
+        assertEquals("latitude should match:", 60.0, cameraPosition.target!!.latitude, 0.1)
+        assertEquals("longitude should match:", 24.0, cameraPosition.target!!.longitude, 0.1)
        assertEquals("bearing should match:", 30.0, cameraPosition.bearing, 0.1)
        assertEquals("zoom should match", 5.3, cameraPosition.zoom, 0.1)
        assertEquals("tilt should match:", 0.0, cameraPosition.tilt, 0.1)
@@ -109,8 +109,8 @@ class CameraUpdateFactoryTest : BaseTest() {
        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 0))

        val cameraPosition = mapboxMap.cameraPosition
-        assertEquals("latitude should match:", 60.0, cameraPosition.target.latitude, 0.1)
-        assertEquals("longitude should match:", 24.0, cameraPosition.target.longitude, 0.1)
+        assertEquals("latitude should match:", 60.0, cameraPosition.target!!.latitude, 0.1)
+        assertEquals("longitude should match:", 24.0, cameraPosition.target!!.longitude, 0.1)
        assertEquals("bearing should match:", 30.0, cameraPosition.bearing, 0.1)
        assertEquals("zoom should match", 5.6, cameraPosition.zoom, 0.1)
        assertEquals("tilt should match:", 45.0, cameraPosition.tilt, 0.1)
@@ -133,8 +133,8 @@ class CameraUpdateFactoryTest : BaseTest() {
        mapboxMap.moveCamera(CameraUpdateFactory.newLatLngBounds(bounds, 30.0, 40.0, 0))

        val cameraPosition = mapboxMap.cameraPosition
-        assertEquals("latitude should match:", 60.0, cameraPosition.target.latitude, 0.1)
-        assertEquals("longitude should match:", 24.0, cameraPosition.target.longitude, 0.1)
+        assertEquals("latitude should match:", 60.0, cameraPosition.target!!.latitude, 0.1)
+        assertEquals("longitude should match:", 24.0, cameraPosition.target!!.longitude, 0.1)
        assertEquals("bearing should match:", 30.0, cameraPosition.bearing, 0.1)
        assertEquals("zoom should match", 5.6, cameraPosition.zoom, 0.1)
        assertEquals("tilt should match:", 40.0, cameraPosition.tilt, 0.1)
@@ -144,7 +144,7 @@ class CameraUpdateFactoryTest : BaseTest() {
    @UiThreadTest
    fun withPadding_cameraInvalidated_paddingPersisting() {
        val initialCameraPosition = mapboxMap.cameraPosition
-        val initialPoint = mapboxMap.projection.toScreenLocation(initialCameraPosition.target)
+        val initialPoint = mapboxMap.projection.toScreenLocation(initialCameraPosition.target!!)

        val bottomPadding = mapView.height / 4
        val leftPadding = mapView.width / 4
@@ -154,10 +154,10 @@ class CameraUpdateFactoryTest : BaseTest() {
        Assert.assertArrayEquals(intArrayOf(leftPadding, 0, 0, bottomPadding), mapboxMap.padding)

        val resultingCameraPosition = mapboxMap.cameraPosition
-        assertEquals(initialCameraPosition.target, resultingCameraPosition.target)
+        assertEquals(initialCameraPosition.target!!, resultingCameraPosition.target!!)
        assertEquals(
            PointF(initialPoint.x + leftPadding / 2, initialPoint.y - bottomPadding / 2),
-            mapboxMap.projection.toScreenLocation(resultingCameraPosition.target)
+            mapboxMap.projection.toScreenLocation(resultingCameraPosition.target!!)
        )
        Assert.assertArrayEquals(padding, resultingCameraPosition.padding, 0.0001)
    }
@@ -175,12 +175,12 @@ class CameraUpdateFactoryTest : BaseTest() {
        Assert.assertArrayEquals(intArrayOf(0, topPadding, rightPadding, 0), mapboxMap.padding)

        val resultingCameraPosition = mapboxMap.cameraPosition
-        assertEquals(expectedTarget.latitude, resultingCameraPosition.target.latitude, 0.1)
-        assertEquals(expectedTarget.longitude, resultingCameraPosition.target.longitude, 0.1)
+        assertEquals(expectedTarget.latitude, resultingCameraPosition.target!!.latitude, 0.1)
+        assertEquals(expectedTarget!!.longitude, resultingCameraPosition.target!!.longitude, 0.1)

        val centerLatLng = mapboxMap.projection.fromScreenLocation(PointF((mapView.width / 2).toFloat(), (mapView.height / 2).toFloat()))
-        assertTrue(centerLatLng.latitude > resultingCameraPosition.target.latitude)
-        assertTrue(centerLatLng.longitude > resultingCameraPosition.target.longitude)
+        assertTrue(centerLatLng.latitude > resultingCameraPosition.target!!.latitude)
+        assertTrue(centerLatLng.longitude > resultingCameraPosition.target!!.longitude)
        Assert.assertArrayEquals(padding, resultingCameraPosition.padding, 0.0001)
    }
 }
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt
@@ -1093,8 +1093,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(77.0, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(location.latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(location.longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(location.latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(location.longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)

                location.bearing = 92f
                location.latitude = 30.0
@@ -1104,8 +1104,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS) // Waiting for the animation to finish

                assertEquals(92.0, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(location.latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(location.longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(location.latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(location.longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)
            }
        }

@@ -1130,8 +1130,8 @@ class LocationComponentTest : EspressoTest() {
                )
                component.isLocationComponentEnabled = true
                component.cameraMode = CameraMode.NONE_GPS
-                val latitude = mapboxMap.cameraPosition.target.latitude
-                val longitude = mapboxMap.cameraPosition.target.longitude
+                val latitude = mapboxMap.cameraPosition.target!!.latitude
+                val longitude = mapboxMap.cameraPosition.target!!.longitude

                location.bearing = 77f
                component.forceLocationUpdate(location)
@@ -1139,8 +1139,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(77.0, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)

                location.bearing = 92f
                location.latitude = 30.0
@@ -1150,8 +1150,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(92.0, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)
            }
        }

@@ -1176,8 +1176,8 @@ class LocationComponentTest : EspressoTest() {
                )
                component.isLocationComponentEnabled = true
                component.cameraMode = CameraMode.NONE
-                val latitude = mapboxMap.cameraPosition.target.latitude
-                val longitude = mapboxMap.cameraPosition.target.longitude
+                val latitude = mapboxMap.cameraPosition.target!!.latitude
+                val longitude = mapboxMap.cameraPosition.target!!.longitude
                val bearing = mapboxMap.cameraPosition.bearing

                location.bearing = 77f
@@ -1186,8 +1186,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(bearing, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)

                location.bearing = 92f
                location.latitude = 30.0
@@ -1197,8 +1197,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(bearing, mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)
            }
        }

@@ -1294,7 +1294,7 @@ class LocationComponentTest : EspressoTest() {
    }

    @Test
-    @Ignore
+    @Ignore("No explanation")
    fun animators_zoomWhileTrackingCanceledOnModeChange() {
        val componentAction = object : LocationComponentAction.OnPerformLocationComponentAction {
            override fun onLocationComponentAction(
@@ -1391,7 +1391,7 @@ class LocationComponentTest : EspressoTest() {
    }

    @Test
-    @Ignore
+    @Ignore("No explanation")
    fun animators_cancelZoomWhileTracking() {
        val componentAction = object : LocationComponentAction.OnPerformLocationComponentAction {
            override fun onLocationComponentAction(
@@ -1482,7 +1482,7 @@ class LocationComponentTest : EspressoTest() {
    }

    @Test
-    @Ignore
+    @Ignore("No explanation")
    fun animators_tiltWhileTrackingCanceledOnModeChange() {
        val componentAction = object : LocationComponentAction.OnPerformLocationComponentAction {
            override fun onLocationComponentAction(
@@ -1578,7 +1578,7 @@ class LocationComponentTest : EspressoTest() {
    }

    @Test
-    @Ignore
+    @Ignore("No explanation")
    fun animators_cancelTiltWhileTracking() {
        val componentAction = object : LocationComponentAction.OnPerformLocationComponentAction {
            override fun onLocationComponentAction(
@@ -1635,8 +1635,8 @@ class LocationComponentTest : EspressoTest() {
                uiController.loopMainThreadForAtLeast(MAX_ANIMATION_DURATION_MS)

                assertEquals(location.bearing.toDouble(), mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(location.latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(location.longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(location.latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(location.longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)
            }
        }

@@ -1667,12 +1667,12 @@ class LocationComponentTest : EspressoTest() {
                mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(target))
                mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(15.0))
                mapboxMap.moveCamera(CameraUpdateFactory.bearingTo(90.0))
-                assertTrue(Utils.immediateAnimation(mapboxMap.projection, mapboxMap.cameraPosition.target, LatLng(location)))
+                assertTrue(Utils.immediateAnimation(mapboxMap.projection, mapboxMap.cameraPosition.target!!, LatLng(location)))

                component.cameraMode = CameraMode.TRACKING_GPS
                assertEquals(location.bearing.toDouble(), mapboxMap.cameraPosition.bearing, 0.1)
-                assertEquals(location.latitude, mapboxMap.cameraPosition.target.latitude, 0.1)
-                assertEquals(location.longitude, mapboxMap.cameraPosition.target.longitude, 0.1)
+                assertEquals(location.latitude, mapboxMap.cameraPosition.target!!.latitude, 0.1)
+                assertEquals(location.longitude, mapboxMap.cameraPosition.target!!.longitude, 0.1)
            }
        }

--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt
@@ -674,8 +674,8 @@ class LocationLayerControllerTest : EspressoTest() {

                assertThat(
                    Math.abs(zoom - mapboxMap.cameraPosition.zoom) < 0.1 &&
-                        Math.abs(target.latitude - mapboxMap.cameraPosition.target.latitude) < 0.1 &&
-                        Math.abs(target.longitude - mapboxMap.cameraPosition.target.longitude) < 0.1,
+                        Math.abs(target.latitude - mapboxMap.cameraPosition.target!!.latitude) < 0.1 &&
+                        Math.abs(target!!.longitude - mapboxMap.cameraPosition.target!!.longitude) < 0.1,
                    `is`(true)
                )

@@ -720,8 +720,8 @@ class LocationLayerControllerTest : EspressoTest() {

                assertThat(
                    abs(zoom - mapboxMap.cameraPosition.zoom) < 0.1 &&
-                        abs(target.latitude - mapboxMap.cameraPosition.target.latitude) < 0.1 &&
-                        abs(target.longitude - mapboxMap.cameraPosition.target.longitude) < 0.1,
+                        abs(target.latitude - mapboxMap.cameraPosition.target!!.latitude) < 0.1 &&
+                        abs(target!!.longitude - mapboxMap.cameraPosition.target!!.longitude) < 0.1,
                    `is`(true)
                )

--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/MapGestureDetectorTest.kt
@@ -61,8 +61,8 @@ class MapGestureDetectorTest : BaseTest() {
        // move to expected target
        onView(withId(R.id.mapView)).perform(move(-maxWidth / 2f, -maxHeight / 2f, withVelocity = false))
        rule.runOnUiThread {
-            Assert.assertNotEquals(initialCameraPosition!!.target.latitude, mapboxMap.cameraPosition.target.latitude, 1.0)
-            Assert.assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.latitude, mapboxMap.cameraPosition.target!!.latitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.longitude, mapboxMap.cameraPosition.target!!.longitude, 1.0)
        }
    }

@@ -72,14 +72,14 @@ class MapGestureDetectorTest : BaseTest() {
        validateTestSetup()
        var initialTarget: LatLng? = null
        rule.runOnUiThread {
-            initialTarget = mapboxMap.cameraPosition.target
+            initialTarget = mapboxMap.cameraPosition.target!!
        }

        onView(withId(R.id.mapView)).perform(quickScale(maxHeight / 2f))
        rule.runOnUiThread {
            // camera did not move
-            Assert.assertEquals(initialTarget!!.latitude, mapboxMap.cameraPosition.target.latitude, 1.0)
-            Assert.assertEquals(initialTarget!!.longitude, mapboxMap.cameraPosition.target.longitude, 1.0)
+            Assert.assertEquals(initialTarget!!.latitude, mapboxMap.cameraPosition.target!!.latitude, 1.0)
+            Assert.assertEquals(initialTarget!!.longitude, mapboxMap.cameraPosition.target!!.longitude, 1.0)
        }
    }

@@ -100,8 +100,8 @@ class MapGestureDetectorTest : BaseTest() {
        // move to expected target
        onView(withId(R.id.mapView)).perform(move(-maxWidth / 2f, -maxHeight / 2f, withVelocity = false))
        rule.runOnUiThread {
-            Assert.assertNotEquals(initialCameraPosition!!.target.latitude, mapboxMap.cameraPosition.target.latitude, 1.0)
-            Assert.assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.latitude, mapboxMap.cameraPosition.target!!.latitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.longitude, mapboxMap.cameraPosition.target!!.longitude, 1.0)
        }
    }

@@ -172,8 +172,8 @@ class MapGestureDetectorTest : BaseTest() {
        // move to expected target
        onView(withId(R.id.mapView)).perform(move(-maxWidth / 2f, -maxHeight / 2f, withVelocity = false))
        rule.runOnUiThread {
-            Assert.assertNotEquals(initialCameraPosition!!.target.latitude, mapboxMap.cameraPosition.target.latitude, 1.0)
-            Assert.assertNotEquals(initialCameraPosition!!.target.longitude, mapboxMap.cameraPosition.target.longitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.latitude, mapboxMap.cameraPosition.target!!.latitude, 1.0)
+            Assert.assertNotEquals(initialCameraPosition!!.target!!.longitude, mapboxMap.cameraPosition.target!!.longitude, 1.0)
        }
    }

--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
@@ -172,8 +172,8 @@ class NativeMapViewTest : AppCenter() {
        nativeMapView.contentPadding = doubleArrayOf(1.0, 2.0, 3.0, 4.0)
        nativeMapView.jumpTo(LATLNG_TEST, ZOOM_TEST, PITCH_TEST, BEARING_TEST, PADDING_TEST)
        val actual = nativeMapView.cameraPosition
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, DELTA)
        assertEquals("Bearing should match", expected.bearing, actual.bearing, DELTA)
        assertEquals("Pitch should match", expected.tilt, actual.tilt, DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, DELTA)
@@ -322,11 +322,11 @@ class NativeMapViewTest : AppCenter() {
            .build()
        // verify that the lazily set padding is ignored when a value is provided with the camera
        nativeMapView.contentPadding = doubleArrayOf(1.0, 2.0, 3.0, 4.0)
-        nativeMapView.flyTo(expected.target, expected.zoom, expected.bearing, expected.tilt, PADDING_TEST, 0)
+        nativeMapView.flyTo(expected.target!!, expected.zoom, expected.bearing, expected.tilt, PADDING_TEST, 0)
        val actual = nativeMapView.cameraPosition
        assertEquals("Bearing should match", expected.bearing, actual.bearing, TestConstants.BEARING_DELTA)
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, TestConstants.LAT_LNG_DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, TestConstants.LAT_LNG_DELTA)
        assertEquals("Tilt should match", expected.tilt, actual.tilt, TestConstants.TILT_DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
        Assert.assertArrayEquals(expected.padding, actual.padding, DELTA)
@@ -344,11 +344,11 @@ class NativeMapViewTest : AppCenter() {
            .build()
        // verify that the lazily set padding is ignored when a value is provided with the camera
        nativeMapView.contentPadding = doubleArrayOf(1.0, 2.0, 3.0, 4.0)
-        nativeMapView.easeTo(expected.target, expected.zoom, expected.bearing, expected.tilt, PADDING_TEST, 0, false)
+        nativeMapView.easeTo(expected.target!!, expected.zoom, expected.bearing, expected.tilt, PADDING_TEST, 0, false)
        val actual = nativeMapView.cameraPosition
        assertEquals("Bearing should match", expected.bearing, actual.bearing, TestConstants.BEARING_DELTA)
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, TestConstants.LAT_LNG_DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, TestConstants.LAT_LNG_DELTA)
        assertEquals("Tilt should match", expected.tilt, actual.tilt, TestConstants.TILT_DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
        Assert.assertArrayEquals(expected.padding, actual.padding, DELTA)
@@ -368,8 +368,8 @@ class NativeMapViewTest : AppCenter() {
        nativeMapView.resetPosition()
        val actual = nativeMapView.cameraPosition
        assertEquals("Bearing should match", expected.bearing, actual.bearing, TestConstants.BEARING_DELTA)
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, TestConstants.LAT_LNG_DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, TestConstants.LAT_LNG_DELTA)
        assertEquals("Tilt should match", expected.tilt, actual.tilt, TestConstants.TILT_DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
        Assert.assertArrayEquals(expected.padding, actual.padding, DELTA)
@@ -391,8 +391,8 @@ class NativeMapViewTest : AppCenter() {
            0.0
        )
        assertEquals("Bearing should match", expected.bearing, actual.bearing, TestConstants.BEARING_DELTA)
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, TestConstants.LAT_LNG_DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, TestConstants.LAT_LNG_DELTA)
        assertEquals("Tilt should match", expected.tilt, actual.tilt, TestConstants.TILT_DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
    }
@@ -409,8 +409,8 @@ class NativeMapViewTest : AppCenter() {
        nativeMapView.moveBy(12.0, 12.0, 0)
        val actual = nativeMapView.cameraPosition
        assertEquals("Bearing should match", expected.bearing, actual.bearing, TestConstants.BEARING_DELTA)
-        assertEquals("Latitude should match", expected.target.latitude, actual.target.latitude, TestConstants.LAT_LNG_DELTA)
-        assertEquals("Longitude should match", expected.target.longitude, actual.target.longitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Latitude should match", expected.target!!.latitude, actual.target!!.latitude, TestConstants.LAT_LNG_DELTA)
+        assertEquals("Longitude should match", expected.target!!.longitude, actual.target!!.longitude, TestConstants.LAT_LNG_DELTA)
        assertEquals("Tilt should match", expected.tilt, actual.tilt, TestConstants.TILT_DELTA)
        assertEquals("Zoom should match", expected.zoom, actual.zoom, TestConstants.ZOOM_DELTA)
    }
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
@@ -29,7 +29,7 @@ public class CompassViewTest extends EspressoTest {
  }

  @Test
-  @Ignore
+  @Ignore("No explanation given")
  public void testVisible() {
    validateTestSetup();
    invoke(mapboxMap, (uiController, mapboxMap) -> {
@@ -38,7 +38,7 @@ public class CompassViewTest extends EspressoTest {
          .bearing(45)
          .zoom(1)
          .target(new LatLng())
-          .build()
+            .build()
      ));
      uiController.loopMainThreadForAtLeast(500);
    });
@@ -46,7 +46,7 @@ public class CompassViewTest extends EspressoTest {
  }

  @Test
-  @Ignore
+  @Ignore("No explanation given")
  public void testClick() {
    validateTestSetup();
    invoke(mapboxMap, (uiController, mapboxMap) -> mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(
@@ -61,7 +61,7 @@ public class CompassViewTest extends EspressoTest {
    onView(withTagValue(is("compassView"))).check(matches(not(isDisplayed())));
    invoke(mapboxMap, (uiController, mapboxMap) -> {
      CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-      assertEquals("Camera bearing should face north, ", 0, cameraPosition.bearing, TestConstants.BEARING_DELTA);
+      assertEquals("Camera bearing should face north, ", 0, cameraPosition.getBearing(), TestConstants.BEARING_DELTA);
    });
  }
 }
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.kt
@@ -32,9 +32,9 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_camera_animator)
        mapView = findViewById<View>(R.id.mapView) as MapView
-        if (mapView != null) {
-            mapView!!.onCreate(savedInstanceState)
-            mapView!!.getMapAsync(this)
+        if (::mapView.isInitialized) {
+            mapView.onCreate(savedInstanceState)
+            mapView.getMapAsync(this)
        }
    }

@@ -54,8 +54,8 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
                    .zoom(14.5)
                    .bearing(135.0)
                    .build()
-            set = createExampleAnimator(mapboxMap!!.cameraPosition, animatedPosition)
-            set!!.start()
+            set = createExampleAnimator(mapboxMap.cameraPosition, animatedPosition)
+            set.start()
        }
    }

@@ -67,7 +67,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        targetPosition: CameraPosition
    ): Animator {
        val animatorSet = AnimatorSet()
-        animatorSet.play(createLatLngAnimator(currentPosition.target, targetPosition.target))
+        animatorSet.play(createLatLngAnimator(currentPosition.target!!, targetPosition.target!!))
        animatorSet.play(createZoomAnimator(currentPosition.zoom, targetPosition.zoom))
        animatorSet.play(createBearingAnimator(currentPosition.bearing, targetPosition.bearing))
        animatorSet.play(createTiltAnimator(currentPosition.tilt, targetPosition.tilt))
@@ -80,7 +80,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        latLngAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
        latLngAnimator.interpolator = FastOutSlowInInterpolator()
        latLngAnimator.addUpdateListener { animation: ValueAnimator ->
-            mapboxMap!!.moveCamera(
+            mapboxMap.moveCamera(
                CameraUpdateFactory.newLatLng((animation.animatedValue as LatLng))
            )
        }
@@ -93,7 +93,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        zoomAnimator.startDelay = (600 * ANIMATION_DELAY_FACTOR).toLong()
        zoomAnimator.interpolator = AnticipateOvershootInterpolator()
        zoomAnimator.addUpdateListener { animation: ValueAnimator ->
-            mapboxMap!!.moveCamera(
+            mapboxMap.moveCamera(
                CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
            )
        }
@@ -107,7 +107,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        bearingAnimator.startDelay = (1000 * ANIMATION_DELAY_FACTOR).toLong()
        bearingAnimator.interpolator = FastOutLinearInInterpolator()
        bearingAnimator.addUpdateListener { animation: ValueAnimator ->
-            mapboxMap!!.moveCamera(
+            mapboxMap.moveCamera(
                CameraUpdateFactory.bearingTo((animation.animatedValue as Float).toDouble())
            )
        }
@@ -119,7 +119,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        tiltAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
        tiltAnimator.startDelay = (1500 * ANIMATION_DELAY_FACTOR).toLong()
        tiltAnimator.addUpdateListener { animation: ValueAnimator ->
-            mapboxMap!!.moveCamera(
+            mapboxMap.moveCamera(
                CameraUpdateFactory.tiltTo((animation.animatedValue as Float).toDouble())
            )
        }
@@ -139,7 +139,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (mapboxMap == null) {
+        if (!::mapboxMap.isInitialized) {
            return false
        }
        if (item.itemId != android.R.id.home) {
@@ -151,7 +151,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
    }

    private fun resetCameraPosition() {
-        mapboxMap!!.moveCamera(
+        mapboxMap.moveCamera(
            CameraUpdateFactory.newCameraPosition(
                CameraPosition.Builder()
                    .target(START_LAT_LNG)
@@ -176,7 +176,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
        zoomAnimator.duration = (duration * ANIMATION_DELAY_FACTOR).toLong()
        zoomAnimator.interpolator = interpolator
        zoomAnimator.addUpdateListener { animation: ValueAnimator ->
-            mapboxMap!!.moveCamera(
+            mapboxMap.moveCamera(
                CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
            )
        }
@@ -188,43 +188,47 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
    //
    override fun onStart() {
        super.onStart()
-        mapView!!.onStart()
+        mapView.onStart()
    }

    override fun onResume() {
        super.onResume()
-        mapView!!.onResume()
+        mapView.onResume()
    }

    override fun onPause() {
        super.onPause()
-        mapView!!.onPause()
+        mapView.onPause()
    }

    override fun onStop() {
        super.onStop()
-        mapView!!.onStop()
+        mapView.onStop()
        for (i in 0 until animators.size()) {
            animators[animators.keyAt(i)]!!.cancel()
        }
        if (set != null) {
-            set!!.cancel()
+            set.cancel()
        }
    }

    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
+        mapView.onSaveInstanceState(outState)
    }

    override fun onDestroy() {
        super.onDestroy()
-        mapView!!.onDestroy()
+        if (::mapView.isInitialized) {
+            mapView.onDestroy()
+        }
    }

    override fun onLowMemory() {
        super.onLowMemory()
-        mapView!!.onLowMemory()
+        if (::mapView.isInitialized) {
+            mapView.onLowMemory()
+        }
    }

    /** Helper class to evaluate LatLng objects with a ValueAnimator */
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.kt
@@ -28,8 +28,7 @@ import com.mapbox.mapboxsdk.testapp.R
 import timber.log.Timber

 /** Test activity showcasing how to listen to camera change events. */
-class CameraPositionActivity :
-    FragmentActivity(), OnMapReadyCallback, View.OnClickListener, OnMapLongClickListener {
+class CameraPositionActivity : FragmentActivity(), OnMapReadyCallback, View.OnClickListener, OnMapLongClickListener {
    private lateinit var mapView: MapView
    private lateinit var mapboxMap: MapboxMap
    private lateinit var fab: FloatingActionButton
@@ -56,7 +55,7 @@ class CameraPositionActivity :
            toggleLogCameraChanges()

            // listen to long click events to toggle logging camera changes
-            mapboxMap!!.addOnMapLongClickListener(this)
+            mapboxMap.addOnMapLongClickListener(this)
        }
    }

@@ -68,8 +67,7 @@ class CameraPositionActivity :
    @SuppressLint("InflateParams")
    override fun onClick(view: View) {
        val context = view.context
-        val dialogContent =
-            LayoutInflater.from(context).inflate(R.layout.dialog_camera_position, null)
+        val dialogContent = LayoutInflater.from(context).inflate(R.layout.dialog_camera_position, null)
        val builder = AlertDialog.Builder(context)
        builder.setTitle(R.string.dialog_camera_position)
        builder.setView(onInflateDialogContent(dialogContent))
@@ -82,49 +80,51 @@ class CameraPositionActivity :
    private fun toggleLogCameraChanges() {
        logCameraChanges = !logCameraChanges
        if (logCameraChanges) {
-            mapboxMap!!.addOnCameraIdleListener(idleListener)
-            mapboxMap!!.addOnCameraMoveCancelListener(moveCanceledListener)
-            mapboxMap!!.addOnCameraMoveListener(moveListener)
-            mapboxMap!!.addOnCameraMoveStartedListener(moveStartedListener)
+            mapboxMap.addOnCameraIdleListener(idleListener)
+            mapboxMap.addOnCameraMoveCancelListener(moveCanceledListener)
+            mapboxMap.addOnCameraMoveListener(moveListener)
+            mapboxMap.addOnCameraMoveStartedListener(moveStartedListener)
        } else {
-            mapboxMap!!.removeOnCameraIdleListener(idleListener)
-            mapboxMap!!.removeOnCameraMoveCancelListener(moveCanceledListener)
-            mapboxMap!!.removeOnCameraMoveListener(moveListener)
-            mapboxMap!!.removeOnCameraMoveStartedListener(moveStartedListener)
+            mapboxMap.removeOnCameraIdleListener(idleListener)
+            mapboxMap.removeOnCameraMoveCancelListener(moveCanceledListener)
+            mapboxMap.removeOnCameraMoveListener(moveListener)
+            mapboxMap.removeOnCameraMoveStartedListener(moveStartedListener)
        }
    }

    override fun onStart() {
        super.onStart()
-        mapView!!.onStart()
+        mapView.onStart()
    }

    override fun onResume() {
        super.onResume()
-        mapView!!.onResume()
+        mapView.onResume()
    }

    override fun onPause() {
        super.onPause()
-        mapView!!.onPause()
+        mapView.onPause()
    }

    override fun onStop() {
        super.onStop()
-        mapView!!.onStop()
+        mapView.onStop()
    }

    override fun onDestroy() {
        super.onDestroy()
-        if (mapboxMap != null) {
-            mapboxMap!!.removeOnMapLongClickListener(this)
+        if (::mapboxMap.isInitialized) {
+            mapboxMap.removeOnMapLongClickListener(this)
+        }
+        if (::mapView.isInitialized) {
+            mapView.onDestroy()
        }
-        mapView!!.onDestroy()
    }

    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
+        mapView.onSaveInstanceState(outState)
    }

    private fun onInflateDialogContent(view: View): View {
@@ -136,13 +136,7 @@ class CameraPositionActivity :
        return view
    }

-    private fun linkTextView(
-        view: View,
-        @IdRes textViewRes: Int,
-        @IdRes seekBarRes: Int,
-        listener: ValueChangeListener,
-        defaultValue: Int
-    ) {
+    private fun linkTextView(view: View, @IdRes textViewRes: Int, @IdRes seekBarRes: Int, listener: ValueChangeListener, defaultValue: Int) {
        val value = view.findViewById<View>(textViewRes) as TextView
        val seekBar = view.findViewById<View>(seekBarRes) as SeekBar
        listener.setLinkedValueView(value)
@@ -152,42 +146,30 @@ class CameraPositionActivity :

    private val idleListener = OnCameraIdleListener {
        Timber.e("OnCameraIdle")
-        fab!!.setColorFilter(
+        fab.setColorFilter(
            ContextCompat.getColor(this@CameraPositionActivity, android.R.color.holo_green_dark)
        )
    }
    private val moveListener = OnCameraMoveListener {
        Timber.e("OnCameraMove")
-        fab!!.setColorFilter(
-            ContextCompat.getColor(
-                this@CameraPositionActivity,
-                android.R.color.holo_orange_dark
-            )
+        fab.setColorFilter(
+            ContextCompat.getColor(this@CameraPositionActivity, android.R.color.holo_orange_dark)
        )
    }
    private val moveCanceledListener = OnCameraMoveCanceledListener {
        Timber.e("OnCameraMoveCanceled")
    }
-    private val moveStartedListener: OnCameraMoveStartedListener =
-        object : OnCameraMoveStartedListener {
-            private val REASONS =
-                arrayOf(
-                    "REASON_API_GESTURE",
-                    "REASON_DEVELOPER_ANIMATION",
-                    "REASON_API_ANIMATION"
-                )
+    private val moveStartedListener: OnCameraMoveStartedListener = object : OnCameraMoveStartedListener {
+        private val REASONS = arrayOf("REASON_API_GESTURE", "REASON_DEVELOPER_ANIMATION", "REASON_API_ANIMATION")

-            override fun onCameraMoveStarted(reason: Int) {
-                // reason ranges from 1 <-> 3
-                fab!!.setColorFilter(
-                    ContextCompat.getColor(
-                        this@CameraPositionActivity,
-                        android.R.color.holo_red_dark
-                    )
-                )
-                Timber.e("OnCameraMoveStarted: %s", REASONS[reason - 1])
-            }
+        override fun onCameraMoveStarted(reason: Int) {
+            // reason ranges from 1 <-> 3
+            fab.setColorFilter(
+                ContextCompat.getColor(this@CameraPositionActivity, android.R.color.holo_red_dark)
+            )
+            Timber.e("OnCameraMoveStarted: %s", REASONS[reason - 1])
        }
+    }

    private open inner class ValueChangeListener : OnSeekBarChangeListener {
        protected var textView: TextView? = null
@@ -208,58 +190,20 @@ class CameraPositionActivity :
        }
    }

-    private class DialogClickListener(
-        private val mapboxMap: MapboxMap?,
-        private val dialogContent: View
-    ) : DialogInterface.OnClickListener {
+    private class DialogClickListener(private val mapboxMap: MapboxMap?, private val dialogContent: View) : DialogInterface.OnClickListener {
        override fun onClick(dialog: DialogInterface, which: Int) {
-            val latitude =
-                (dialogContent.findViewById<View>(R.id.value_lat) as TextView)
-                    .text
-                    .toString()
-                    .toDouble()
-            val longitude =
-                (dialogContent.findViewById<View>(R.id.value_lon) as TextView)
-                    .text
-                    .toString()
-                    .toDouble()
-            val zoom =
-                (dialogContent.findViewById<View>(R.id.value_zoom) as TextView)
-                    .text
-                    .toString()
-                    .toDouble()
-            val bearing =
-                (dialogContent.findViewById<View>(R.id.value_bearing) as TextView)
-                    .text
-                    .toString()
-                    .toDouble()
-            val tilt =
-                (dialogContent.findViewById<View>(R.id.value_tilt) as TextView)
-                    .text
-                    .toString()
-                    .toDouble()
-            if (latitude < GeometryConstants.MIN_LATITUDE ||
-                latitude > GeometryConstants.MAX_LATITUDE
-            ) {
-                Toast.makeText(
-                    dialogContent.context,
-                    "latitude value must be set " +
-                        " between " +
-                        GeometryConstants.MIN_LATITUDE +
-                        " and " +
-                        GeometryConstants.MAX_LATITUDE,
-                    Toast.LENGTH_SHORT
-                )
-                    .show()
+            val latitude = (dialogContent.findViewById<View>(R.id.value_lat) as TextView).text.toString().toDouble()
+            val longitude = (dialogContent.findViewById<View>(R.id.value_lon) as TextView).text.toString().toDouble()
+            val zoom = (dialogContent.findViewById<View>(R.id.value_zoom) as TextView).text.toString().toDouble()
+            val bearing = (dialogContent.findViewById<View>(R.id.value_bearing) as TextView).text.toString().toDouble()
+            val tilt = (dialogContent.findViewById<View>(R.id.value_tilt) as TextView).text.toString().toDouble()
+            if (latitude < GeometryConstants.MIN_LATITUDE || latitude > GeometryConstants.MAX_LATITUDE) {
+                Toast.makeText(dialogContent.context, "latitude value must be set between " + GeometryConstants.MIN_LATITUDE + " and " + GeometryConstants.MAX_LATITUDE, Toast.LENGTH_SHORT).show()
                return
            }
-            val cameraPosition =
-                CameraPosition.Builder()
-                    .target(LatLng(latitude, longitude))
-                    .zoom(zoom)
-                    .bearing(bearing)
-                    .tilt(tilt)
-                    .build()
+
+            val cameraPosition = CameraPosition.Builder().target(LatLng(latitude, longitude)).zoom(zoom).bearing(bearing).tilt(tilt).build()
+
            mapboxMap!!.animateCamera(
                CameraUpdateFactory.newCameraPosition(cameraPosition),
                5000,