NN bump

Author: DzmitryFomchyn

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxNavigationActivity.kt

@@ -443,7 +443,7 @@ class MapboxNavigationActivity : AppCompatActivity() {
         mapboxNavigation.registerLocationObserver(locationObserver)
         mapboxNavigation.registerVoiceInstructionsObserver(voiceInstructionsObserver)
         mapboxNavigation.setAdasisMessageCallback(AdasisConfig.Builder().build()) { message ->
-            Log.d("AdasisTest.", "Adasis message: ${message.toFlatBuffer()}")
+            Log.d("AdasisTest.", "Adasis message: $message")
         }
     }
 

gradle/artifact-settings.gradle

@@ -23,7 +23,7 @@ def getVersionName() {
 //    def cmd = ["git", "describe", "--tag", "--match", "$prefix*", "--abbrev=0"]
 //    def version = cmd.execute().text
 //    return project.ext.snapshot ? getSnapshotVersion(version) : getReleaseVersion(version)
-    return "2.17.0-adas-preview-3-SNAPSHOT"
+    return "2.17.0-adas-preview-4-SNAPSHOT"
 }
 
 def getReleaseVersion(String version) {

gradle/dependencies.gradle

@@ -13,7 +13,7 @@ ext {
   // version which we should use in this build
   def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
   if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
-      mapboxNavigatorVersion = 'nio-adas-snapshot-preparation-25-SNAPSHOT'
+      mapboxNavigatorVersion = 'nio-adas-main-publish-30-SNAPSHOT'
   }
   println("Navigation Native version: " + mapboxNavigatorVersion)
   def androidXWorkManagerVersion = project.hasProperty('WORK_MANAGER_VERSION') ? project.property('WORK_MANAGER_VERSION') : '2.7.0'

libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt

@@ -44,7 +44,6 @@ import com.mapbox.navigation.base.trip.notification.NotificationAction
 import com.mapbox.navigation.base.trip.notification.TripNotification
 import com.mapbox.navigation.base.trip.notification.TripNotificationInterceptor
 import com.mapbox.navigation.core.accounts.BillingController
-import com.mapbox.navigation.core.adasis.ADASISv2Message
 import com.mapbox.navigation.core.adasis.ADASISv2MessageCallback
 import com.mapbox.navigation.core.adasis.AdasisConfig
 import com.mapbox.navigation.core.arrival.ArrivalController
@@ -2000,9 +1999,7 @@ class MapboxNavigation @VisibleForTesting internal constructor(
     fun setAdasisMessageCallback(adasisConfig: AdasisConfig, callback: ADASISv2MessageCallback) {
         navigator.setAdasisMessageCallback(
             { message ->
-                callback.onMessage(
-                    ADASISv2Message.createFromNativeADASISv2Message(message)
-                )
+                callback.onMessage(message)
             },
             adasisConfig.toNativeAdasisConfig()
         )

libnavigation-core/src/main/java/com/mapbox/navigation/core/adasis/ADASISv2Message.kt

@@ -10,7 +10,7 @@ fun interface ADASISv2MessageCallback {
 
     /**
      * Called when ADASIS message is available
-     * @param message ADASIS message
+     * @param messageBuffer Message buffer in format specified via [AdasisConfigDataSending.messageBinaryFormat]
      */
-    fun onMessage(message: ADASISv2Message)
+    fun onMessage(messageBuffer: List<Byte>)
 }

libnavigation-core/src/main/java/com/mapbox/navigation/core/adasis/ADASISv2MessageCallback.kt

@@ -68,7 +68,7 @@ class AdasisConfig private constructor(
     class Builder {
 
         private var cycleTimes: AdasisConfigCycleTimes = AdasisConfigCycleTimes()
-        private var dataSending: AdasisConfigDataSending = AdasisConfigDataSending()
+        private var dataSending: AdasisConfigDataSending = AdasisConfigDataSending(AdasisMessageBinaryFormat.FlatBuffers)
         private var pathsOptions: AdasisConfigPathsConfigs = AdasisConfigPathsConfigs(
             mpp = AdasisConfigPathLevelOptions(
                 Stub(AdasisConfigMessageOptions()),

libnavigation-core/src/main/java/com/mapbox/navigation/core/adasis/AdasisConfig.kt

@@ -5,6 +5,7 @@ import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 /**
  * Data sending configuration
  *
+ * @param messageBinaryFormat binary format in which Adasis message will be sent
  * @param messageIntervalMs interval between sending messages in milliseconds
  * @param messagesInPackage number of messages in one package (one message is 8 bytes)
  * @param sortProfileShortsByOffset if true, profile shorts will be sorted by offset
@@ -14,6 +15,7 @@ import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
  */
 @ExperimentalPreviewMapboxNavigationAPI
 class AdasisConfigDataSending(
+    val messageBinaryFormat: AdasisMessageBinaryFormat,
     val messageIntervalMs: Int = 80,
     val messagesInPackage: Int = 20,
     val sortProfileShortsByOffset: Boolean = true,
@@ -24,6 +26,7 @@ class AdasisConfigDataSending(
     @JvmSynthetic
     internal fun toNativeAdasisConfigDataSending(): com.mapbox.navigator.AdasisConfigDataSending {
         return com.mapbox.navigator.AdasisConfigDataSending(
+            messageBinaryFormat.toNativeMessageBinaryFormat(),
             messageIntervalMs,
             messagesInPackage,
             sortProfileShortsByOffset,
@@ -41,6 +44,7 @@ class AdasisConfigDataSending(
 
         other as AdasisConfigDataSending
 
+        if (messageBinaryFormat != other.messageBinaryFormat) return false
         if (messageIntervalMs != other.messageIntervalMs) return false
         if (messagesInPackage != other.messagesInPackage) return false
         if (sortProfileShortsByOffset != other.sortProfileShortsByOffset) return false
@@ -55,6 +59,7 @@ class AdasisConfigDataSending(
      */
     override fun hashCode(): Int {
         var result = messageIntervalMs
+        result = 31 * result + messageBinaryFormat.hashCode()
         result = 31 * result + messagesInPackage
         result = 31 * result + sortProfileShortsByOffset.hashCode()
         result = 31 * result + sortProfileLongsByOffset.hashCode()
@@ -67,6 +72,7 @@ class AdasisConfigDataSending(
      */
     override fun toString(): String {
         return "AdasisConfigDataSending(" +
+            "messageBinaryFormat=$messageBinaryFormat, " +
             "messageIntervalMs=$messageIntervalMs, " +
             "messagesInPackage=$messagesInPackage, " +
             "sortProfileShortsByOffset=$sortProfileShortsByOffset, " +

libnavigation-core/src/main/java/com/mapbox/navigation/core/adasis/AdasisConfigDataSending.kt

@@ -0,0 +1,38 @@
+package com.mapbox.navigation.core.adasis
+
+import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
+import com.mapbox.navigation.core.MapboxNavigation
+import com.mapbox.navigator.MessageBinaryFormat
+
+/**
+ * Binary format in which Adasis message will be sent.
+ *
+ * @see [MapboxNavigation.setAdasisMessageCallback]
+ */
+@ExperimentalPreviewMapboxNavigationAPI
+abstract class AdasisMessageBinaryFormat {
+
+    /**
+     * ADASISv2 standard 8 byte payload, CAN compatible. Big endian
+     */
+    object AdasisV2BigEndian : AdasisMessageBinaryFormat()
+
+    /**
+     * ADASISv2 standard 8 byte payload, CAN compatible. Little endian
+     */
+    object AdasisV2LittleEndian : AdasisMessageBinaryFormat()
+
+    /**
+     * ADASISv2 message structures serialised with FlatBuffers scheme
+     */
+    object FlatBuffers : AdasisMessageBinaryFormat()
+
+    internal fun toNativeMessageBinaryFormat(): MessageBinaryFormat {
+        return when (this) {
+            is AdasisV2BigEndian -> MessageBinaryFormat.ADASISV2_BE
+            is AdasisV2LittleEndian -> MessageBinaryFormat.ADASISV2_LE
+            is FlatBuffers -> MessageBinaryFormat.FLAT_BUFFERS
+            else -> throw IllegalStateException("Unknown format: $this")
+        }
+    }
+}

libnavigation-core/src/main/java/com/mapbox/navigation/core/adasis/AdasisMessageBinaryFormat.kt

@@ -42,7 +42,7 @@ class SpeedLimitInfo private constructor(
      * Returns a hash code value for the object.
      */
     override fun hashCode(): Int {
-        var result = value.toInt()
+        var result = value
         result = 31 * result + speedUnit.hashCode()
         result = 31 * result + type.hashCode()
         result = 31 * result + restriction.hashCode()
@@ -71,6 +71,12 @@ class SpeedLimitInfo private constructor(
          */
         object Explicit : Type()
 
+        /**
+         * Edge does not start the way, no sign on the edge.
+         * Speed limit time is the same of on previous edge.
+         */
+        object Prolonged : Type()
+
         /**
          * Type is unknown.
          */
@@ -83,6 +89,7 @@ class SpeedLimitInfo private constructor(
                 return when (nativeObj) {
                     SpeedLimitType.IMPLICIT -> Implicit
                     SpeedLimitType.EXPLICIT -> Explicit
+                    SpeedLimitType.PROLONGED -> Prolonged
                     SpeedLimitType.UNKNOWN -> Unknown
                 }
             }