Revert: Add shift for location of camera.

2 files changed, 4 insertions, 69 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
index 6544a01a07..6a01d14249 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt
@@ -13,21 +13,18 @@ import com.mapbox.android.core.location.LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.android.core.permissions.PermissionsListener
 import com.mapbox.android.core.permissions.PermissionsManager
-import com.mapbox.geojson.Point
-import com.mapbox.geojson.shifter.CoordinateShifter
-import com.mapbox.geojson.shifter.CoordinateShifterManager
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
+import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions
-import com.mapbox.mapboxsdk.location.modes.CameraMode.TRACKING
 import com.mapbox.mapboxsdk.maps.MapView
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.testapp.R
 import kotlinx.android.synthetic.main.activity_location_layer_fragment.*
-import java.util.ArrayList
 
 class LocationFragmentActivity : AppCompatActivity() {
   private lateinit var permissionsManager: PermissionsManager
-  private var shift = false
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_location_layer_fragment)
@@ -44,18 +41,6 @@ class LocationFragmentActivity : AppCompatActivity() {
         this.onBackPressed()
       }
     }
-
-    shifter.setOnClickListener{
-      if(!shift) {
-        Toast.makeText(this, "Shifter is on.",Toast.LENGTH_LONG).show()
-        CoordinateShifterManager.setCoordinateShifter(coordinateShifter())
-      }else{
-        Toast.makeText(this, "Shifter is off.",Toast.LENGTH_LONG).show()
-        CoordinateShifterManager.setCoordinateShifter(null)
-      }
-      shift = !shift
-    }
-
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
     if (PermissionsManager.areLocationPermissionsGranted(this)) {
@@ -89,41 +74,6 @@ class LocationFragmentActivity : AppCompatActivity() {
     }
   }
 
-  private fun coordinateShifter(): CoordinateShifter {
-    return object : CoordinateShifter {
-      override fun shiftLonLat(lon: Double, lat: Double): List<Double> {
-        return shift(lon, lat)
-      }
-
-      override fun shiftLonLatAlt(lon: Double, lat: Double, altitude: Double): List<Double> {
-        val shiftedLongLat = shift(lon, lat)
-        shiftedLongLat.add(altitude)
-        return shiftedLongLat
-      }
-
-      override fun unshiftPoint(shiftedPoint: Point): List<Double> {
-        val shiftedCoordinates = ArrayList<Double>(2)
-        shiftedCoordinates.add(shiftedPoint.longitude())
-        shiftedCoordinates.add(shiftedPoint.latitude())
-        return shiftedCoordinates
-      }
-
-      override fun unshiftPoint(shiftedCoordinates: List<Double>): List<Double> {
-        // Left empty on purpose
-        return shiftedCoordinates
-      }
-
-      private fun shift(lon: Double, lat: Double): MutableList<Double> {
-        val shiftedCoordinates = ArrayList<Double>(3)
-        val shiftedLon = lon + 0.5
-        val shiftedLat = lat + 0.5
-        shiftedCoordinates.add(shiftedLon)
-        shiftedCoordinates.add(shiftedLat)
-        return shiftedCoordinates
-      }
-    }
-  }
-
   override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
     super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     permissionsManager.onRequestPermissionsResult(requestCode, permissions, grantResults)
@@ -150,7 +100,6 @@ class LocationFragmentActivity : AppCompatActivity() {
       mapView.onCreate(savedInstanceState)
       mapView.getMapAsync {
         mapboxMap = it
-        mapboxMap.setMinZoomPreference(12.0)
         it.setStyle(Style.MAPBOX_STREETS) { style ->
           val component = mapboxMap.locationComponent
 
@@ -161,13 +110,12 @@ class LocationFragmentActivity : AppCompatActivity() {
 
           component.isLocationComponentEnabled = true
           component.locationEngine?.getLastLocation(this)
-          component.cameraMode = TRACKING
         }
       }
     }
 
     override fun onSuccess(result: LocationEngineResult?) {
-//        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0))
+        mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(result?.lastLocation), 12.0))
     }
 
     override fun onFailure(exception: Exception) {
@@ -207,7 +155,6 @@ class LocationFragmentActivity : AppCompatActivity() {
     override fun onDestroyView() {
       super.onDestroyView()
       mapView.onDestroy()
-      CoordinateShifterManager.setCoordinateShifter(null)
     }
   }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
index efd1e6ebe8..3c1436a1a8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml
@@ -10,18 +10,6 @@
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/shifter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:tint="@android:color/white"
-        app:backgroundTint="@color/accent"
-        app:layout_constraintBottom_toTopOf="@+id/fab"
-        app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_add" />
-
-    <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"