From 229e35e9c38159632771f8da7ab1fd8681ac853c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 10 Sep 2018 13:49:07 +0200 Subject: [android] use the SparseArray instead of the HashMap in location animator coordinator --- .../location/LocationAnimatorCoordinator.java | 52 ++++++++-------- .../mapbox/mapboxsdk/location/MapboxAnimator.java | 2 +- .../location/LocationAnimatorCoordinatorTest.kt | 72 +++++++++++----------- 3 files changed, 62 insertions(+), 64 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java index 67a9727f5c..b8baa0d497 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java @@ -2,11 +2,11 @@ package com.mapbox.mapboxsdk.location; import android.animation.Animator; import android.animation.AnimatorSet; -import android.annotation.SuppressLint; import android.location.Location; import android.os.SystemClock; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.SparseArray; import android.view.animation.LinearInterpolator; import com.mapbox.mapboxsdk.camera.CameraPosition; @@ -14,9 +14,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static com.mapbox.mapboxsdk.location.LocationComponentConstants.ACCURACY_RADIUS_ANIMATION_DURATION; import static com.mapbox.mapboxsdk.location.LocationComponentConstants.COMPASS_UPDATE_RATE_MS; @@ -34,8 +32,7 @@ import static com.mapbox.mapboxsdk.location.MapboxAnimator.ANIMATOR_ZOOM; final class LocationAnimatorCoordinator { - @SuppressLint("UseSparseArrays") - final Map animatorMap = new HashMap<>(); + final SparseArray animatorArray = new SparseArray<>(); final List layerListeners = new ArrayList<>(); final List cameraListeners = new ArrayList<>(); @@ -126,7 +123,7 @@ final class LocationAnimatorCoordinator { private LatLng getPreviousLayerLatLng() { LatLng previousLatLng; - MapboxAnimator latLngAnimator = animatorMap.get(ANIMATOR_LAYER_LATLNG); + MapboxAnimator latLngAnimator = animatorArray.get(ANIMATOR_LAYER_LATLNG); if (latLngAnimator != null) { previousLatLng = (LatLng) latLngAnimator.getAnimatedValue(); } else { @@ -136,7 +133,7 @@ final class LocationAnimatorCoordinator { } private float getPreviousLayerGpsBearing() { - LayerGpsBearingAnimator animator = (LayerGpsBearingAnimator) animatorMap.get(ANIMATOR_LAYER_GPS_BEARING); + LayerGpsBearingAnimator animator = (LayerGpsBearingAnimator) animatorArray.get(ANIMATOR_LAYER_GPS_BEARING); float previousBearing; if (animator != null) { previousBearing = (float) animator.getAnimatedValue(); @@ -148,7 +145,7 @@ final class LocationAnimatorCoordinator { private float getPreviousLayerCompassBearing() { LayerCompassBearingAnimator animator = - (LayerCompassBearingAnimator) animatorMap.get(ANIMATOR_LAYER_COMPASS_BEARING); + (LayerCompassBearingAnimator) animatorArray.get(ANIMATOR_LAYER_COMPASS_BEARING); float previousBearing; if (animator != null) { @@ -160,7 +157,7 @@ final class LocationAnimatorCoordinator { } private float getPreviousAccuracyRadius() { - LayerAccuracyAnimator animator = (LayerAccuracyAnimator) animatorMap.get(ANIMATOR_LAYER_ACCURACY); + LayerAccuracyAnimator animator = (LayerAccuracyAnimator) animatorArray.get(ANIMATOR_LAYER_ACCURACY); float previousRadius; if (animator != null) { previousRadius = (float) animator.getAnimatedValue(); @@ -243,10 +240,10 @@ final class LocationAnimatorCoordinator { private void playLocationAnimators(long duration) { List locationAnimators = new ArrayList<>(); - locationAnimators.add(animatorMap.get(ANIMATOR_LAYER_LATLNG)); - locationAnimators.add(animatorMap.get(ANIMATOR_LAYER_GPS_BEARING)); - locationAnimators.add(animatorMap.get(ANIMATOR_CAMERA_LATLNG)); - locationAnimators.add(animatorMap.get(ANIMATOR_CAMERA_GPS_BEARING)); + locationAnimators.add(animatorArray.get(ANIMATOR_LAYER_LATLNG)); + locationAnimators.add(animatorArray.get(ANIMATOR_LAYER_GPS_BEARING)); + locationAnimators.add(animatorArray.get(ANIMATOR_CAMERA_LATLNG)); + locationAnimators.add(animatorArray.get(ANIMATOR_CAMERA_GPS_BEARING)); AnimatorSet locationAnimatorSet = new AnimatorSet(); locationAnimatorSet.playTogether(locationAnimators); locationAnimatorSet.setInterpolator(new LinearInterpolator()); @@ -256,8 +253,8 @@ final class LocationAnimatorCoordinator { private void playCompassAnimators(long duration) { List compassAnimators = new ArrayList<>(); - compassAnimators.add(animatorMap.get(ANIMATOR_LAYER_COMPASS_BEARING)); - compassAnimators.add(animatorMap.get(ANIMATOR_CAMERA_COMPASS_BEARING)); + compassAnimators.add(animatorArray.get(ANIMATOR_LAYER_COMPASS_BEARING)); + compassAnimators.add(animatorArray.get(ANIMATOR_CAMERA_COMPASS_BEARING)); AnimatorSet compassAnimatorSet = new AnimatorSet(); compassAnimatorSet.playTogether(compassAnimators); compassAnimatorSet.setDuration(duration); @@ -265,27 +262,27 @@ final class LocationAnimatorCoordinator { } private void playAccuracyAnimator(long duration) { - MapboxAnimator animator = animatorMap.get(ANIMATOR_LAYER_ACCURACY); + MapboxAnimator animator = animatorArray.get(ANIMATOR_LAYER_ACCURACY); animator.setDuration(duration); animator.start(); } private void playZoomAnimator(long duration) { - MapboxAnimator animator = animatorMap.get(ANIMATOR_ZOOM); + MapboxAnimator animator = animatorArray.get(ANIMATOR_ZOOM); animator.setDuration(duration); animator.start(); } private void playTiltAnimator(long duration) { - MapboxAnimator animator = animatorMap.get(ANIMATOR_TILT); + MapboxAnimator animator = animatorArray.get(ANIMATOR_TILT); animator.setDuration(duration); animator.start(); } private void playCameraLocationAnimators(long duration) { List locationAnimators = new ArrayList<>(); - locationAnimators.add(animatorMap.get(ANIMATOR_CAMERA_LATLNG)); - locationAnimators.add(animatorMap.get(ANIMATOR_CAMERA_GPS_BEARING)); + locationAnimators.add(animatorArray.get(ANIMATOR_CAMERA_LATLNG)); + locationAnimators.add(animatorArray.get(ANIMATOR_CAMERA_GPS_BEARING)); AnimatorSet locationAnimatorSet = new AnimatorSet(); locationAnimatorSet.playTogether(locationAnimators); locationAnimatorSet.setInterpolator(new LinearInterpolator()); @@ -305,7 +302,7 @@ final class LocationAnimatorCoordinator { } private void resetCameraLatLngAnimation(CameraPosition currentCameraPosition) { - CameraLatLngAnimator animator = (CameraLatLngAnimator) animatorMap.get(ANIMATOR_CAMERA_LATLNG); + CameraLatLngAnimator animator = (CameraLatLngAnimator) animatorArray.get(ANIMATOR_CAMERA_LATLNG); if (animator == null) { return; } @@ -317,7 +314,7 @@ final class LocationAnimatorCoordinator { } private void resetCameraGpsBearingAnimation(CameraPosition currentCameraPosition, boolean isGpsNorth) { - CameraGpsBearingAnimator animator = (CameraGpsBearingAnimator) animatorMap.get(ANIMATOR_CAMERA_GPS_BEARING); + CameraGpsBearingAnimator animator = (CameraGpsBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_GPS_BEARING); if (animator == null) { return; } @@ -332,7 +329,7 @@ final class LocationAnimatorCoordinator { private void resetCameraCompassAnimation(CameraPosition currentCameraPosition) { CameraCompassBearingAnimator animator = - (CameraCompassBearingAnimator) animatorMap.get(ANIMATOR_CAMERA_COMPASS_BEARING); + (CameraCompassBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_COMPASS_BEARING); if (animator == null) { return; } @@ -346,7 +343,7 @@ final class LocationAnimatorCoordinator { private void createNewAnimator(@MapboxAnimator.Type int animatorType, MapboxAnimator animator) { cancelAnimator(animatorType); - animatorMap.put(animatorType, animator); + animatorArray.put(animatorType, animator); } void cancelZoomAnimation() { @@ -358,18 +355,19 @@ final class LocationAnimatorCoordinator { } void cancelAllAnimations() { - for (@MapboxAnimator.Type int animatorType : animatorMap.keySet()) { + for (int i = 0; i < animatorArray.size(); i++) { + @MapboxAnimator.Type int animatorType = animatorArray.keyAt(i); cancelAnimator(animatorType); } } private void cancelAnimator(@MapboxAnimator.Type int animatorType) { - MapboxAnimator animator = animatorMap.get(animatorType); + MapboxAnimator animator = animatorArray.get(animatorType); if (animator != null) { animator.cancel(); animator.removeAllUpdateListeners(); animator.removeAllListeners(); - animatorMap.put(animatorType, null); + animatorArray.put(animatorType, null); } } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java index b22601a15c..a72bf08a86 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxAnimator.java @@ -11,7 +11,7 @@ import java.lang.annotation.RetentionPolicy; import java.util.List; /** - * Abstract class for all of the plugin animators. + * Abstract class for all of the location component animators. * * @param Data type that will be animated. * @param Listener of animation updates. diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt index a3ac653e81..2c94642610 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt @@ -29,10 +29,10 @@ class LocationAnimatorCoordinatorTest { fun feedNewLocation_animatorsAreCreated() { locationAnimatorCoordinator.feedNewLocation(Location(""), cameraPosition, false) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_LATLNG] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_GPS_BEARING] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_LATLNG] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_GPS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_LATLNG] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_GPS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_LATLNG] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_GPS_BEARING] != null) } @Test @@ -43,16 +43,16 @@ class LocationAnimatorCoordinatorTest { location.bearing = 35f locationAnimatorCoordinator.feedNewLocation(location, cameraPosition, false) - val cameraLatLngTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_LATLNG]?.target as LatLng + val cameraLatLngTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_LATLNG]?.target as LatLng assertEquals(cameraLatLngTarget.latitude, cameraLatLngTarget.latitude) - val layerLatLngTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_LATLNG]?.target as LatLng + val layerLatLngTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_LATLNG]?.target as LatLng assertEquals(layerLatLngTarget.latitude, layerLatLngTarget.latitude) - val cameraBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_GPS_BEARING]?.target as Float + val cameraBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_GPS_BEARING]?.target as Float assertEquals(location.bearing, cameraBearingTarget) - val layerBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_GPS_BEARING]?.target as Float + val layerBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_GPS_BEARING]?.target as Float assertEquals(location.bearing, layerBearingTarget) } @@ -64,10 +64,10 @@ class LocationAnimatorCoordinatorTest { location.bearing = 35f locationAnimatorCoordinator.feedNewLocation(location, cameraPosition, false) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_LATLNG] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_GPS_BEARING] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_LATLNG] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_GPS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_LATLNG] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_GPS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_LATLNG] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_GPS_BEARING] != null) } @Test @@ -78,16 +78,16 @@ class LocationAnimatorCoordinatorTest { location.bearing = 35f locationAnimatorCoordinator.feedNewLocation(location, cameraPosition, true) - val cameraLatLngTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_LATLNG]?.target as LatLng + val cameraLatLngTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_LATLNG]?.target as LatLng assertEquals(cameraLatLngTarget.latitude, cameraLatLngTarget.latitude) - val layerLatLngTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_LATLNG]?.target as LatLng + val layerLatLngTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_LATLNG]?.target as LatLng assertEquals(layerLatLngTarget.latitude, layerLatLngTarget.latitude) - val cameraBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_GPS_BEARING]?.target as Float + val cameraBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_GPS_BEARING]?.target as Float assertEquals(0f, cameraBearingTarget) - val layerBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_GPS_BEARING]?.target as Float + val layerBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_GPS_BEARING]?.target as Float assertEquals(location.bearing, layerBearingTarget) } @@ -95,8 +95,8 @@ class LocationAnimatorCoordinatorTest { fun feedNewCompassBearing_animatorsAreCreated() { locationAnimatorCoordinator.feedNewCompassBearing(77f, cameraPosition) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_COMPASS_BEARING] != null) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_COMPASS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_COMPASS_BEARING] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_COMPASS_BEARING] != null) } @Test @@ -104,10 +104,10 @@ class LocationAnimatorCoordinatorTest { val bearing = 77f locationAnimatorCoordinator.feedNewCompassBearing(bearing, cameraPosition) - val cameraBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_COMPASS_BEARING]?.target as Float + val cameraBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_COMPASS_BEARING]?.target as Float assertEquals(bearing, cameraBearingTarget) - val layerBearingTarget = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_COMPASS_BEARING]?.target as Float + val layerBearingTarget = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_COMPASS_BEARING]?.target as Float assertEquals(bearing, layerBearingTarget) } @@ -115,7 +115,7 @@ class LocationAnimatorCoordinatorTest { fun feedNewAccuracyRadius_animatorsCreated() { locationAnimatorCoordinator.feedNewAccuracyRadius(150f, false) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY] != null) } @Test @@ -123,10 +123,10 @@ class LocationAnimatorCoordinatorTest { val accuracy = 150f locationAnimatorCoordinator.feedNewAccuracyRadius(accuracy, false) - val layerAccuracy = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY]?.target as Float + val layerAccuracy = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY]?.target as Float assertEquals(layerAccuracy, accuracy) - val animationDuration = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY]?.duration as Long + val animationDuration = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY]?.duration as Long assertEquals(LocationComponentConstants.ACCURACY_RADIUS_ANIMATION_DURATION, animationDuration) } @@ -134,7 +134,7 @@ class LocationAnimatorCoordinatorTest { fun feedNewAccuracyRadius_noAnimation_animatorsCreated() { locationAnimatorCoordinator.feedNewAccuracyRadius(150f, true) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY] != null) } @Test @@ -142,10 +142,10 @@ class LocationAnimatorCoordinatorTest { val accuracy = 150f locationAnimatorCoordinator.feedNewAccuracyRadius(accuracy, true) - val layerAccuracy = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY]?.target as Float + val layerAccuracy = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY]?.target as Float assertEquals(layerAccuracy, accuracy) - val animationDuration = locationAnimatorCoordinator.animatorMap[ANIMATOR_LAYER_ACCURACY]?.duration as Long + val animationDuration = locationAnimatorCoordinator.animatorArray[ANIMATOR_LAYER_ACCURACY]?.duration as Long assertEquals(0L, animationDuration) } @@ -158,7 +158,7 @@ class LocationAnimatorCoordinatorTest { null ) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_ZOOM] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_ZOOM] != null) } @Test @@ -171,10 +171,10 @@ class LocationAnimatorCoordinatorTest { null ) - val animationDuration = locationAnimatorCoordinator.animatorMap[ANIMATOR_ZOOM]?.duration as Long + val animationDuration = locationAnimatorCoordinator.animatorArray[ANIMATOR_ZOOM]?.duration as Long assertEquals(DEFAULT_TRACKING_ZOOM_ANIM_DURATION, animationDuration) - val target = locationAnimatorCoordinator.animatorMap[ANIMATOR_ZOOM]?.target as Float + val target = locationAnimatorCoordinator.animatorArray[ANIMATOR_ZOOM]?.target as Float assertEquals(zoom, target) } @@ -187,7 +187,7 @@ class LocationAnimatorCoordinatorTest { null ) - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_TILT] != null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_TILT] != null) } @Test @@ -200,10 +200,10 @@ class LocationAnimatorCoordinatorTest { null ) - val animationDuration = locationAnimatorCoordinator.animatorMap[ANIMATOR_TILT]?.duration as Long + val animationDuration = locationAnimatorCoordinator.animatorArray[ANIMATOR_TILT]?.duration as Long assertEquals(DEFAULT_TRACKING_TILT_ANIM_DURATION, animationDuration) - val target = locationAnimatorCoordinator.animatorMap[ANIMATOR_TILT]?.target as Float + val target = locationAnimatorCoordinator.animatorArray[ANIMATOR_TILT]?.target as Float assertEquals(tilt, target) } @@ -212,7 +212,7 @@ class LocationAnimatorCoordinatorTest { locationAnimatorCoordinator.feedNewLocation(Location(""), cameraPosition, true) locationAnimatorCoordinator.cancelAllAnimations() - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_CAMERA_LATLNG] == null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_CAMERA_LATLNG] == null) } @Test @@ -225,7 +225,7 @@ class LocationAnimatorCoordinatorTest { ) locationAnimatorCoordinator.cancelZoomAnimation() - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_ZOOM] == null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_ZOOM] == null) } @Test @@ -239,13 +239,13 @@ class LocationAnimatorCoordinatorTest { locationAnimatorCoordinator.cancelTiltAnimation() - assertTrue(locationAnimatorCoordinator.animatorMap[ANIMATOR_TILT] == null) + assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_TILT] == null) } @Test fun resetAllCameraAnimations_empty() { locationAnimatorCoordinator.resetAllCameraAnimations(cameraPosition, false) - assertTrue(locationAnimatorCoordinator.animatorMap.isEmpty()) + assertTrue(locationAnimatorCoordinator.animatorArray.size() == 0) } @Test -- cgit v1.2.1