[android] - Refactor dependencies, introduce focused components (#7189)

* [android] - refactor dependencies

* ignore tests

1 files changed, 11 insertions, 1 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
index 9c96450a4c..04105ebc59 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java
@@ -257,7 +257,7 @@ public final class CameraUpdateFactory {
                 float scaleX = (uiSettings.getWidth() - padding.left - padding.right) / width;
                 float scaleY = (uiSettings.getHeight() - padding.top - padding.bottom) / height;
                 minScale = scaleX < scaleY ? scaleX : scaleY;
-                zoom = projection.calculateZoom(minScale);
+                zoom = calculateZoom(mapboxMap, minScale);
                 zoom = MathUtils.clamp(zoom, mapboxMap.getMinZoom(), mapboxMap.getMaxZoom());
             }
 
@@ -275,6 +275,16 @@ public final class CameraUpdateFactory {
                     .bearing(0)
                     .build();
         }
+
+        /**
+         * Calculates a zoom level based on minimum scale and current scale from MapView
+         *
+         * @param minScale The minimum scale to calculate the zoom level.
+         * @return zoom level that fits the MapView.
+         */
+        public double calculateZoom(MapboxMap mapboxMap, float minScale) {
+            return Math.log(mapboxMap.getCameraPosition().zoom * minScale) / Math.log(2);
+        }
     }
 
     static final class CameraMoveUpdate implements CameraUpdate {