Migrate to NN 201.0.0

mapbox · Jan 23, 2024 · 61120d0 · 61120d0
1 parent ad77e78
commit 61120d0
Show file tree

Hide file tree

Showing 35 changed files with 255 additions and 323 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ allprojects {
     // we allow access to snapshots repo if ALLOW_SNAPSHOT_REPOSITORY is set, what means we are running on CI
     // with Navigation Native forced to be some snapshot version
     // if you need to use snapshots while development, just set `addSnapshotsRepo` to true manually
-    def addSnapshotsRepo = true//project.hasProperty('ALLOW_SNAPSHOT_REPOSITORY') ? project.property('ALLOW_SNAPSHOT_REPOSITORY') : (System.getenv("ALLOW_SNAPSHOT_REPOSITORY")?.toBoolean() ?: false)
+    def addSnapshotsRepo = project.hasProperty('ALLOW_SNAPSHOT_REPOSITORY') ? project.property('ALLOW_SNAPSHOT_REPOSITORY') : (System.getenv("ALLOW_SNAPSHOT_REPOSITORY")?.toBoolean() ?: false)
     if (addSnapshotsRepo) {
       println("Snapshot repository reference added.")
       maven {

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/AdasisActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/AdasisActivity.kt
@@ -29,7 +29,9 @@ import com.mapbox.navigation.base.route.RouterFailure
 import com.mapbox.navigation.base.route.RouterOrigin
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.MapboxNavigationProvider
-import com.mapbox.navigation.core.adasis.AdasisConfig
+import com.mapbox.navigation.core.adas.AdasisConfig
+import com.mapbox.navigation.core.adas.AdasisDataSendingConfig
+import com.mapbox.navigation.core.adas.AdasisMessageBinaryFormat
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.replay.MapboxReplayer
 import com.mapbox.navigation.core.replay.ReplayLocationEngine
@@ -121,7 +123,7 @@ class AdasisActivity : AppCompatActivity() {
                     routeLineView.renderRouteDrawData(mapboxMap.getStyle()!!, this)
                 }
             }
-            isNavigating = true
+            isNavigating = result.navigationRoutes.isNotEmpty()
             startSimulation(result.navigationRoutes[0].directionsRoute)
         }
     }
@@ -280,16 +282,20 @@ class AdasisActivity : AppCompatActivity() {
             mapboxNavigation.registerRouteProgressObserver(routeProgressObserver)
             mapboxNavigation.registerRouteProgressObserver(replayProgressObserver)
 
-            mapboxNavigation.setAdasisMessageCallback(
-                AdasisConfig.Builder().build()
-            ) { messageBuffer, context ->
+            val dataSendingConfig = AdasisDataSendingConfig.Builder(
+                AdasisMessageBinaryFormat.FlatBuffers,
+            ).build()
+
+            mapboxNavigation.setAdasisMessageObserver(
+                AdasisConfig.Builder(dataSendingConfig).build()
+            ) { messageBuffer ->
                 this@AdasisActivity.runOnUiThread {
                     // TODO decode buffer and print data
                     adasisMessagesLog += "${numberOfMessages++}: ${messageBuffer.size} bytes\n"
                     binding.adasisMsgLog.text = adasisMessagesLog
                     binding.scrollContainer.fullScroll(View.FOCUS_DOWN)
 
-                    Log.d(TAG, "Adasis message: $messageBuffer, context: $context")
+                    Log.d(TAG, "Adasis message: $messageBuffer")
                 }
             }
         }
@@ -302,7 +308,7 @@ class AdasisActivity : AppCompatActivity() {
         mapboxNavigation.unregisterLocationObserver(locationObserver)
         mapboxNavigation.unregisterRouteProgressObserver(routeProgressObserver)
         mapboxNavigation.unregisterRouteProgressObserver(replayProgressObserver)
-        mapboxNavigation.resetAdasisMessageCallback()
+        mapboxNavigation.resetAdasisMessageObserver()
     }
 
     override fun onDestroy() {

diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle
@@ -16,13 +16,13 @@ ext {
 }
 
 def getVersionName() {
-//    if (project.hasProperty('VERSION_NAME')) {
-//      return project.property('VERSION_NAME')
-//    }
-//    def prefix = project.ext.releaseTagPrefix
-//    def cmd = ["git", "describe", "--tag", "--match", "$prefix*", "--abbrev=0"]
-//    def version = cmd.execute().text
-    return "2.19.0-preview.1-SNAPSHOT"
+    if (project.hasProperty('VERSION_NAME')) {
+      return project.property('VERSION_NAME')
+    }
+    def prefix = project.ext.releaseTagPrefix
+    def cmd = ["git", "describe", "--tag", "--match", "$prefix*", "--abbrev=0"]
+    def version = cmd.execute().text
+    return project.ext.snapshot ? getSnapshotVersion(version) : getReleaseVersion(version)
 }
 
 def getReleaseVersion(String version) {

diff --git a/gradle/dependencies.gradle b/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-lpo-flatbuffers-vectors-13-SNAPSHOT'
+      mapboxNavigatorVersion = '201.0.0'
   }
   println("Navigation Native version: " + mapboxNavigatorVersion)
   def androidXWorkManagerVersion = project.hasProperty('WORK_MANAGER_VERSION') ? project.property('WORK_MANAGER_VERSION') : '2.7.0'