bump mapboxNavigator to 6.2.0 version and cleanup

mapbox · May 16, 2019 · 17d7551 · 17d7551
1 parent 9f64e87
commit 17d7551
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/.../com/mapbox/services/android/navigation/testapp/activity/OfflineRegionDownloadActivity.kt b/.../com/mapbox/services/android/navigation/testapp/activity/OfflineRegionDownloadActivity.kt
@@ -219,11 +219,11 @@ class OfflineRegionDownloadActivity : AppCompatActivity(), RouteTileDownloadList
         //val minZoom: Double = mapboxMap.cameraPosition.zoom
         //val maxZoom: Double = mapboxMap.maxZoomLevel
         val pixelRatio: Float = this.resources.displayMetrics.density
-        //val definition: OfflineTilePyramidRegionDefinition = OfflineTilePyramidRegionDefinition(
-        //        styleUrl, bounds, minZoom, maxZoom, pixelRatio)
-        // TODO Testing downloading a Geometry and using OfflineGeometryRegionDefinition as definition
-        val definition: OfflineGeometryRegionDefinition = OfflineGeometryRegionDefinition(
-                styleUrl, geometry, minZoom, maxZoom, pixelRatio)
+        val definition: OfflineTilePyramidRegionDefinition = OfflineTilePyramidRegionDefinition(
+                styleUrl, bounds, minZoom, maxZoom, pixelRatio)
+        // TODO Testing downloading a Geometry using OfflineGeometryRegionDefinition as definition
+        //val definition: OfflineGeometryRegionDefinition = OfflineGeometryRegionDefinition(
+        //        styleUrl, geometry, minZoom, maxZoom, pixelRatio)
 
         val metadata: ByteArray
         val jsonObject: JSONObject = JSONObject()

diff --git a/...services/android/navigation/testapp/activity/navigationui/NavigationLauncherActivity.java b/...services/android/navigation/testapp/activity/navigationui/NavigationLauncherActivity.java
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -44,7 +43,6 @@
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.services.android.navigation.testapp.NavigationSettingsActivity;
 import com.mapbox.services.android.navigation.testapp.R;
-import com.mapbox.services.android.navigation.ui.v5.MapOfflineOptions;
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher;
 import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions;
 import com.mapbox.services.android.navigation.ui.v5.camera.CameraUpdateMode;
@@ -356,11 +354,13 @@ private void launchNavigationWithRoute() {
     if (!offlineVersion.isEmpty()) {
       optionsBuilder.offlineRoutingTilesVersion(offlineVersion);
     }
-    // TODO Testing merging previously downloaded region
-    File downloadDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-    String databaseFilePath = downloadDirectory + "/" + "kingfarm.db";
-    String offlineStyleUrl = "mapbox://styles/mapbox/navigation-guidance-day-v4";
-    optionsBuilder.offlineMapOptions(new MapOfflineOptions(databaseFilePath, offlineStyleUrl));
+    // TODO Testing dynamic offline
+    /**
+     * File downloadDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+     * String databaseFilePath = downloadDirectory + "/" + "kingfarm.db";
+     * String offlineStyleUrl = "mapbox://styles/mapbox/navigation-guidance-day-v4";
+     * optionsBuilder.offlineMapOptions(new MapOfflineOptions(databaseFilePath, offlineStyleUrl));
+     */
     NavigationLauncher.startNavigation(this, optionsBuilder.build());
   }
 

diff --git a/build.gradle b/build.gradle
@@ -31,8 +31,6 @@ task testReport(type: TestReport, group: 'Build') {
 
 allprojects {
   repositories {
-    // TODO Remove when Maps SDK is released
-    maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
     google()
     mavenCentral()
     jcenter()

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -12,7 +12,7 @@ ext {
       mapboxSdkServices      : '4.8.0',
       mapboxEvents           : '4.4.1',
       mapboxCore             : '1.2.0',
-      mapboxNavigator        : 'route_buffer-SNAPSHOT-7',
+      mapboxNavigator        : '6.2.0',
       mapboxCrashMonitor     : '2.0.0',
       mapboxAnnotationPlugin : '0.6.0',
       mapboxSearchSdk        : '0.1.0-SNAPSHOT',

diff --git a/.../java/com/mapbox/services/android/navigation/ui/v5/NavigationOfflineDatabaseCallback.java b/.../java/com/mapbox/services/android/navigation/ui/v5/NavigationOfflineDatabaseCallback.java
@@ -16,15 +16,11 @@ class NavigationOfflineDatabaseCallback implements OfflineDatabaseLoadedCallback
 
   @Override
   public void onComplete() {
-    // TODO Remove debug log after testing
-    Timber.d("NavigationOfflineDatabaseCallback#onComplete");
     navigation.addProgressChangeListener(mapOfflineManager);
   }
 
   @Override
   public void onError(String error) {
-    // TODO Remove debug log after testing
-    Timber.d("NavigationOfflineDatabaseCallback#onError %s", error);
     Timber.e(error);
   }