NAVAND-960: allow different PredictiveCacheLocationOptions for different zooms

dzinad · dzinad · commit 471b7afd1798 · 2023-01-24T17:41:39.000+03:00
diff --git a/changelog/unreleased/features/dd.md b/changelog/unreleased/features/dd.md
@@ -0,0 +1 @@
+- Introduced `PredictiveCacheOptions.Builder#predictiveCacheMapsOptionsList` as an alternative for deprecated `PredictiveCacheOptions.Builder#predictiveCacheMapsOptions`. This allows to use different `PredictiveCacheLocationOptions` for different zoom level ranges.
diff --git a/libnavigation-base/api/current.txt b/libnavigation-base/api/current.txt
@@ -542,17 +542,20 @@ package com.mapbox.navigation.base.options {
   }
 
   public final class PredictiveCacheOptions {
-    method public com.mapbox.navigation.base.options.PredictiveCacheMapsOptions getPredictiveCacheMapsOptions();
+    method @Deprecated public com.mapbox.navigation.base.options.PredictiveCacheMapsOptions getPredictiveCacheMapsOptions();
+    method public java.util.List<com.mapbox.navigation.base.options.PredictiveCacheMapsOptions> getPredictiveCacheMapsOptionsList();
     method public com.mapbox.navigation.base.options.PredictiveCacheNavigationOptions getPredictiveCacheNavigationOptions();
     method public com.mapbox.navigation.base.options.PredictiveCacheOptions.Builder toBuilder();
-    property public final com.mapbox.navigation.base.options.PredictiveCacheMapsOptions predictiveCacheMapsOptions;
+    property @Deprecated public final com.mapbox.navigation.base.options.PredictiveCacheMapsOptions predictiveCacheMapsOptions;
+    property public final java.util.List<com.mapbox.navigation.base.options.PredictiveCacheMapsOptions> predictiveCacheMapsOptionsList;
     property public final com.mapbox.navigation.base.options.PredictiveCacheNavigationOptions predictiveCacheNavigationOptions;
   }
 
   public static final class PredictiveCacheOptions.Builder {
     ctor public PredictiveCacheOptions.Builder();
     method public com.mapbox.navigation.base.options.PredictiveCacheOptions build();
-    method public com.mapbox.navigation.base.options.PredictiveCacheOptions.Builder predictiveCacheMapsOptions(com.mapbox.navigation.base.options.PredictiveCacheMapsOptions predictiveCacheMapsOptions);
+    method @Deprecated public com.mapbox.navigation.base.options.PredictiveCacheOptions.Builder predictiveCacheMapsOptions(com.mapbox.navigation.base.options.PredictiveCacheMapsOptions predictiveCacheMapsOptions);
+    method @kotlin.jvm.Throws(exceptionClasses=IllegalArgumentException::class) public com.mapbox.navigation.base.options.PredictiveCacheOptions.Builder predictiveCacheMapsOptionsList(java.util.List<com.mapbox.navigation.base.options.PredictiveCacheMapsOptions> predictiveCacheMapsOptionsList) throws java.lang.IllegalArgumentException;
     method public com.mapbox.navigation.base.options.PredictiveCacheOptions.Builder predictiveCacheNavigationOptions(com.mapbox.navigation.base.options.PredictiveCacheNavigationOptions predictiveCacheNavigationOptions);
   }
 
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/PredictiveCacheOptions.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/options/PredictiveCacheOptions.kt
@@ -4,13 +4,24 @@ package com.mapbox.navigation.base.options
  * PredictiveCacheOptions
  *
  * @param predictiveCacheNavigationOptions [PredictiveCacheNavigationOptions] Predictive cache Navigation related options.
- * @param predictiveCacheMapsOptions [PredictiveCacheMapsOptions] Predictive cache Maps related options.
+ * @param predictiveCacheMapsOptionsList List of predictive cache Maps related options ([PredictiveCacheMapsOptions]).
+ *  Use this instead of [predictiveCacheMapsOptions] so that you can specify different
+ *  [PredictiveCacheLocationOptions]s for different zoom level ranges.
  */
 class PredictiveCacheOptions private constructor(
     val predictiveCacheNavigationOptions: PredictiveCacheNavigationOptions,
-    val predictiveCacheMapsOptions: PredictiveCacheMapsOptions,
+    val predictiveCacheMapsOptionsList: List<PredictiveCacheMapsOptions>
 ) {
 
+    /**
+     * Predictive cache Maps related options.
+     * @deprecated use predictiveCacheMapsOptionsList instead to provide different
+     * [PredictiveCacheLocationOptions]s for different zoom level ranges.
+     */
+    @Deprecated("Use predictiveCacheMapsOptionsList")
+    val predictiveCacheMapsOptions: PredictiveCacheMapsOptions =
+        predictiveCacheMapsOptionsList.first()
+
     /**
      * Get a builder to customize a subset of current options.
      */
@@ -29,7 +40,7 @@ class PredictiveCacheOptions private constructor(
         other as PredictiveCacheOptions
 
         if (predictiveCacheNavigationOptions != other.predictiveCacheNavigationOptions) return false
-        if (predictiveCacheMapsOptions != other.predictiveCacheMapsOptions) return false
+        if (predictiveCacheMapsOptionsList != other.predictiveCacheMapsOptionsList) return false
 
         return true
     }
@@ -39,7 +50,7 @@ class PredictiveCacheOptions private constructor(
      */
     override fun hashCode(): Int {
         var result = predictiveCacheNavigationOptions.hashCode()
-        result = 31 * result + predictiveCacheMapsOptions.hashCode()
+        result = 31 * result + predictiveCacheMapsOptionsList.hashCode()
         return result
     }
 
@@ -49,7 +60,7 @@ class PredictiveCacheOptions private constructor(
     override fun toString(): String {
         return "PredictiveCacheOptions(" +
             "predictiveCacheNavigationOptions=$predictiveCacheNavigationOptions, " +
-            "predictiveCacheMapsOptions=$predictiveCacheMapsOptions" +
+            "predictiveCacheMapsOptionsList=$predictiveCacheMapsOptionsList" +
             ")"
     }
 
@@ -58,7 +69,7 @@ class PredictiveCacheOptions private constructor(
      */
     class Builder {
         private var predictiveCacheNavigationOptions: PredictiveCacheNavigationOptions? = null
-        private var predictiveCacheMapsOptions: PredictiveCacheMapsOptions? = null
+        private var predictiveCacheMapsOptionsList = emptyList<PredictiveCacheMapsOptions>()
 
         /**
          * Predictive cache Navigation related options.
@@ -71,17 +82,42 @@ class PredictiveCacheOptions private constructor(
 
         /**
          * Predictive cache Maps related options.
+         * @deprecated use predictiveCacheMapsOptionsList instead to provide different
+         * [PredictiveCacheLocationOptions]s for different zoom level ranges.
          */
+        @Deprecated(
+            "Use predictiveCacheMapsOptionsList",
+            ReplaceWith("predictiveCacheMapsOptionsList(listOf(predictiveCacheMapsOptions))")
+        )
         fun predictiveCacheMapsOptions(
             predictiveCacheMapsOptions: PredictiveCacheMapsOptions
-        ): Builder = apply { this.predictiveCacheMapsOptions = predictiveCacheMapsOptions }
+        ): Builder = predictiveCacheMapsOptionsList(listOf(predictiveCacheMapsOptions))
+
+        /**
+         * List of predictive cache Maps related options ([PredictiveCacheMapsOptions]).
+         * Use this instead of [predictiveCacheMapsOptions] so that you can specify different
+         * [PredictiveCacheLocationOptions]s for different zoom level ranges.
+         *
+         * @throws IllegalArgumentException if [predictiveCacheMapsOptionsList] is empty.
+         */
+        @Throws(IllegalArgumentException::class)
+        fun predictiveCacheMapsOptionsList(
+            predictiveCacheMapsOptionsList: List<PredictiveCacheMapsOptions>
+        ): Builder = apply {
+            if (predictiveCacheMapsOptionsList.isEmpty()) {
+                throw IllegalArgumentException("predictiveCacheMapsOptionsList must not be empty")
+            }
+            this.predictiveCacheMapsOptionsList = predictiveCacheMapsOptionsList.toList()
+        }
 
         /**
          * Build [PredictiveCacheOptions].
          */
         fun build(): PredictiveCacheOptions = PredictiveCacheOptions(
             predictiveCacheNavigationOptions ?: PredictiveCacheNavigationOptions.Builder().build(),
-            predictiveCacheMapsOptions ?: PredictiveCacheMapsOptions.Builder().build(),
+            predictiveCacheMapsOptionsList.ifEmpty {
+                listOf(PredictiveCacheMapsOptions.Builder().build())
+            }
         )
     }
 }
diff --git a/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsBuilderTest.kt b/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsBuilderTest.kt
@@ -0,0 +1,44 @@
+package com.mapbox.navigation.base.options
+
+import com.mapbox.navigation.testing.BuilderTest
+import org.junit.Test
+import kotlin.reflect.KClass
+
+class PredictiveCacheOptionsBuilderTest :
+    BuilderTest<PredictiveCacheOptions, PredictiveCacheOptions.Builder>() {
+    override fun getImplementationClass(): KClass<PredictiveCacheOptions> =
+        PredictiveCacheOptions::class
+
+    override fun getFilledUpBuilder(): PredictiveCacheOptions.Builder =
+        PredictiveCacheOptions.Builder().apply {
+            predictiveCacheNavigationOptions(
+                PredictiveCacheNavigationOptions.Builder().apply {
+                    predictiveCacheLocationOptions(
+                        PredictiveCacheLocationOptions.Builder().apply {
+                            currentLocationRadiusInMeters(300)
+                            routeBufferRadiusInMeters(50)
+                            destinationLocationRadiusInMeters(20)
+                        }.build()
+                    )
+                }.build()
+            )
+            predictiveCacheMapsOptions(
+                PredictiveCacheMapsOptions.Builder().apply {
+                    predictiveCacheLocationOptions(
+                        PredictiveCacheLocationOptions.Builder().apply {
+                            currentLocationRadiusInMeters(100)
+                            routeBufferRadiusInMeters(2)
+                            destinationLocationRadiusInMeters(15)
+                        }.build()
+                    )
+                    minZoom(1)
+                    maxZoom(3)
+                }.build()
+            )
+        }
+
+    @Test
+    override fun trigger() {
+        // trigger, see KDoc
+    }
+}
diff --git a/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsTest.kt b/libnavigation-base/src/test/java/com/mapbox/navigation/base/options/PredictiveCacheOptionsTest.kt
@@ -1,44 +1,80 @@
 package com.mapbox.navigation.base.options
 
-import com.mapbox.navigation.testing.BuilderTest
+import org.junit.Assert.assertEquals
 import org.junit.Test
-import kotlin.reflect.KClass
-
-class PredictiveCacheOptionsTest :
-    BuilderTest<PredictiveCacheOptions, PredictiveCacheOptions.Builder>() {
-    override fun getImplementationClass(): KClass<PredictiveCacheOptions> =
-        PredictiveCacheOptions::class
-
-    override fun getFilledUpBuilder(): PredictiveCacheOptions.Builder =
-        PredictiveCacheOptions.Builder().apply {
-            predictiveCacheNavigationOptions(
-                PredictiveCacheNavigationOptions.Builder().apply {
-                    predictiveCacheLocationOptions(
-                        PredictiveCacheLocationOptions.Builder().apply {
-                            currentLocationRadiusInMeters(300)
-                            routeBufferRadiusInMeters(50)
-                            destinationLocationRadiusInMeters(20)
-                        }.build()
-                    )
-                }.build()
-            )
-            predictiveCacheMapsOptions(
-                PredictiveCacheMapsOptions.Builder().apply {
-                    predictiveCacheLocationOptions(
-                        PredictiveCacheLocationOptions.Builder().apply {
-                            currentLocationRadiusInMeters(100)
-                            routeBufferRadiusInMeters(2)
-                            destinationLocationRadiusInMeters(15)
-                        }.build()
-                    )
-                    minZoom(1)
-                    maxZoom(3)
-                }.build()
-            )
-        }
+
+class PredictiveCacheOptionsTest {
+
+    @Test
+    fun defaultMapsOptionsList() {
+        val expected = PredictiveCacheMapsOptions.Builder().build()
+        val actual = PredictiveCacheOptions.Builder().build()
+
+        assertEquals(expected, actual.predictiveCacheMapsOptions)
+        assertEquals(listOf(expected), actual.predictiveCacheMapsOptionsList)
+    }
+
+    @Test
+    fun deprecatedMapsOptions() {
+        val mapsOptions = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build()
+        val actual = PredictiveCacheOptions.Builder()
+            .predictiveCacheMapsOptions(mapsOptions)
+            .build()
+
+        assertEquals(mapsOptions, actual.predictiveCacheMapsOptions)
+        assertEquals(listOf(mapsOptions), actual.predictiveCacheMapsOptionsList)
+    }
+
+    @Test
+    fun customMapsOptionsList() {
+        val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build()
+        val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build()
+        val actual = PredictiveCacheOptions.Builder()
+            .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2))
+            .build()
+
+        assertEquals(mapsOptions1, actual.predictiveCacheMapsOptions)
+        assertEquals(listOf(mapsOptions1, mapsOptions2), actual.predictiveCacheMapsOptionsList)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun customEmptyMapsOptionsList() {
+        PredictiveCacheOptions.Builder()
+            .predictiveCacheMapsOptionsList(emptyList())
+            .build()
+    }
 
     @Test
-    override fun trigger() {
-        // trigger, see KDoc
+    fun customMapsOptionsAfterDeprecatedMapsOptions() {
+        val deprecatedMapsOptions = PredictiveCacheMapsOptions.Builder()
+            .minZoom(7)
+            .maxZoom(9)
+            .build()
+        val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build()
+        val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build()
+        val actual = PredictiveCacheOptions.Builder()
+            .predictiveCacheMapsOptions(deprecatedMapsOptions)
+            .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2))
+            .build()
+
+        assertEquals(mapsOptions1, actual.predictiveCacheMapsOptions)
+        assertEquals(listOf(mapsOptions1, mapsOptions2), actual.predictiveCacheMapsOptionsList)
+    }
+
+    @Test
+    fun deprecatedMapsOptionsAfterCustomMapsOptionsList() {
+        val deprecatedMapsOptions = PredictiveCacheMapsOptions.Builder()
+            .minZoom(7)
+            .maxZoom(9)
+            .build()
+        val mapsOptions1 = PredictiveCacheMapsOptions.Builder().minZoom(12).maxZoom(14).build()
+        val mapsOptions2 = PredictiveCacheMapsOptions.Builder().minZoom(11).maxZoom(13).build()
+        val actual = PredictiveCacheOptions.Builder()
+            .predictiveCacheMapsOptionsList(listOf(mapsOptions1, mapsOptions2))
+            .predictiveCacheMapsOptions(deprecatedMapsOptions)
+            .build()
+
+        assertEquals(deprecatedMapsOptions, actual.predictiveCacheMapsOptions)
+        assertEquals(listOf(deprecatedMapsOptions), actual.predictiveCacheMapsOptionsList)
     }
 }
diff --git a/libnavigation-core/api/current.txt b/libnavigation-core/api/current.txt
@@ -529,6 +529,9 @@ package com.mapbox.navigation.core.replay.history {
     property public final Double? time;
   }
 
+  public final class ReplayEventLocationMapperKt {
+  }
+
   public final class ReplayEventUpdateLocation implements com.mapbox.navigation.core.replay.history.ReplayEventBase {
     ctor public ReplayEventUpdateLocation(@com.google.gson.annotations.SerializedName("event_timestamp") double eventTimestamp, @com.google.gson.annotations.SerializedName("location") com.mapbox.navigation.core.replay.history.ReplayEventLocation location);
     method public double component1();
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/PredictiveCache.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/PredictiveCache.kt
@@ -11,14 +11,14 @@ object PredictiveCache {
     internal val cachedNavigationPredictiveCacheControllers =
         mutableSetOf<PredictiveCacheController>()
     internal val cachedMapsPredictiveCacheControllers =
-        mutableMapOf<Any, Pair<TilesetDescriptor, PredictiveCacheController>>()
+        mutableMapOf<Any, List<Pair<TilesetDescriptor, PredictiveCacheController>>>()
     internal val cachedMapsPredictiveCacheControllersTileVariant =
         mutableMapOf<Any, MutableMap<String, PredictiveCacheController>>()
 
     internal val navPredictiveCacheLocationOptions =
         mutableSetOf<PredictiveCacheLocationOptions>()
-    internal val mapsPredictiveCacheLocationOptions =
-        mutableMapOf<Any, Triple<TilesetDescriptor, TileStore, PredictiveCacheLocationOptions>>()
+    internal val mapsPredictiveCacheLocationOptions = mutableMapOf<Any,
+        Pair<TileStore, List<Pair<TilesetDescriptor, PredictiveCacheLocationOptions>>>>()
     internal val mapsPredictiveCacheLocationOptionsTileVariant =
         mutableMapOf<Any, MutableMap<String, Pair<TileStore, PredictiveCacheLocationOptions>>>()
 
@@ -35,12 +35,11 @@ object PredictiveCache {
                 createNavigationController(it)
             }
             mapsOptions.forEach { entry ->
-                entry.value.let { (descriptor, tileStore, options) ->
-                    createMapsController(
+                entry.value.let { (tileStore, descriptorsAndOptions) ->
+                    createMapsControllers(
                         mapboxMap = entry.key,
-                        tilesetDescriptor = descriptor,
                         tileStore = tileStore,
-                        predictiveCacheLocationOptions = options
+                        descriptorsAndOptions = descriptorsAndOptions
                     )
                 }
             }
@@ -69,9 +68,7 @@ object PredictiveCache {
     }
 
     @Deprecated(
-        "Use createMapsController(" +
-            "mapboxMap, tileStore, tilesetDescriptor, predictiveCacheLocationOptions" +
-            ") instead."
+        "Use createMapsControllers(mapboxMap, tileStore, descriptorsAndOptions) instead."
     )
     fun createMapsController(
         mapboxMap: Any,
@@ -97,23 +94,21 @@ object PredictiveCache {
         mapsPredictiveCacheLocationOptionsTileVariant[mapboxMap] = locationOptions
     }
 
-    fun createMapsController(
+    fun createMapsControllers(
         mapboxMap: Any,
         tileStore: TileStore,
-        tilesetDescriptor: TilesetDescriptor,
-        predictiveCacheLocationOptions: PredictiveCacheLocationOptions
+        descriptorsAndOptions: List<Pair<TilesetDescriptor, PredictiveCacheLocationOptions>>
     ) {
-        val predictiveCacheController =
-            MapboxNativeNavigatorImpl.createMapsPredictiveCacheController(
+        val descriptorsToPredictiveCacheControllers = descriptorsAndOptions.map {
+            it.first to MapboxNativeNavigatorImpl.createMapsPredictiveCacheController(
                 tileStore,
-                tilesetDescriptor,
-                predictiveCacheLocationOptions
+                it.first,
+                it.second
             )
+        }
 
-        cachedMapsPredictiveCacheControllers[mapboxMap] =
-            Pair(tilesetDescriptor, predictiveCacheController)
-        mapsPredictiveCacheLocationOptions[mapboxMap] =
-            Triple(tilesetDescriptor, tileStore, predictiveCacheLocationOptions)
+        cachedMapsPredictiveCacheControllers[mapboxMap] = descriptorsToPredictiveCacheControllers
+        mapsPredictiveCacheLocationOptions[mapboxMap] = tileStore to descriptorsAndOptions
     }
 
     @Deprecated("Will be removed with other TileVariant logic")
diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/cache/PredictiveCacheTests.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/cache/PredictiveCacheTests.kt
diff --git a/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/PredictiveCacheController.kt b/libnavui-maps/src/main/java/com/mapbox/navigation/ui/maps/PredictiveCacheController.kt
diff --git a/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/PredictiveCacheControllerTest.kt b/libnavui-maps/src/test/java/com/mapbox/navigation/ui/maps/PredictiveCacheControllerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+- Introduced `PredictiveCacheOptions.Builder#predictiveCacheMapsOptionsList` as an alternative for deprecated `PredictiveCacheOptions.Builder#predictiveCacheMapsOptions`. This allows to use different `PredictiveCacheLocationOptions` for different zoom level ranges.
Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,9 @@ package com.mapbox.navigation.core.replay.history {`
`529`	`529`	`property public final Double? time;`
`530`	`530`	`}`
`531`	`531`
	`532`	`+ public final class ReplayEventLocationMapperKt {`
	`533`	`+ }`
	`534`	`+`
`532`	`535`	`public final class ReplayEventUpdateLocation implements com.mapbox.navigation.core.replay.history.ReplayEventBase {`
`533`	`536`	`ctor public ReplayEventUpdateLocation(@com.google.gson.annotations.SerializedName("event_timestamp") double eventTimestamp, @com.google.gson.annotations.SerializedName("location") com.mapbox.navigation.core.replay.history.ReplayEventLocation location);`
`534`	`537`	`method public double component1();`