@rnmapbox/maps 10.1.0-beta.25 → 10.1.0-beta.26

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXOfflineModule.kt

@@ -30,6 +30,7 @@ import java.nio.file.StandardCopyOption
 import java.util.concurrent.CountDownLatch
 
 import com.rnmapbox.rnmbx.v11compat.offlinemanager.*
+import com.rnmapbox.rnmbx.v11compat.resourceoption.getMapboxAccessToken
 
 data class ZoomRange(val minZoom: Byte, val maxZoom: Byte) {
 
@@ -103,7 +104,9 @@ class RNMBXOfflineModule(private val mReactContext: ReactApplicationContext) :
 
 
     val tileStore: TileStore by lazy {
-        TileStore.create()
+        val result = TileStore.create()
+        result.setAccessToken(RNMBXModule.getAccessToken(mReactContext));
+        result
     }
 
     val offlineManager: OfflineManager by lazy {

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -1,6 +1,8 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
 import com.mapbox.common.TileStore
+import com.mapbox.common.TileStoreOptions
+import com.mapbox.common.toValue
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
 import com.mapbox.maps.ResourceOptions
@@ -16,4 +18,8 @@ fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): Offli
         tileStore
       ).build()
   )
+}
+
+fun TileStore.setAccessToken(token: String) {
+  this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
 }

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -1,5 +1,6 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
+import com.mapbox.common.MapboxOptions
 import com.mapbox.common.TileStore
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
@@ -9,4 +10,7 @@ fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager
 }
 fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager {
   return OfflineManager()
+}
+fun TileStore.setAccessToken(token: String) {
+  MapboxOptions.accessToken = token
 }

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -46,23 +46,16 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
+  #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
     customHeaders.forEach {(key,value) in
       download.request.headers[key] = value
     }
     return download
   }
+  #endif
 
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
-  
-  #if RNMBX_11
-  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
-    customHeaders.forEach {(key,value) in
-      upload.headers[key] = value
-    }
-    return upload
-  }
-  #endif
 }

package/lib/typescript/src/components/Viewport.d.ts

@@ -18,7 +18,7 @@ declare type FollowPuckOptions = {
      *  - number: sets the camera bearing to the constant value on every frame
      *
      * On Android, 'heading' and 'coruse' sets the camera bearing to the same as the location puck's bearing. See
-     * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0-rc.1/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
+     * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
      *
      * @default 'heading'
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.0-beta.25",
+  "version": "10.1.0-beta.26",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
     "build:examples.json": "cd example; jest __tests__/dumpExamplesJson.ts",
     "lint:plugin": "yarn eslint plugin/src/*",
     "build": "yarn bob build",
-    "prepare": "yarn bob build && yarn husky install"
+    "prepare": "yarn bob build"
   },
   "peerDependencies": {
     "expo": ">=47.0.0",

package/src/components/Viewport.tsx

@@ -41,7 +41,7 @@ type FollowPuckOptions = {
    *  - number: sets the camera bearing to the constant value on every frame
    *
    * On Android, 'heading' and 'coruse' sets the camera bearing to the same as the location puck's bearing. See
-   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0-rc.1/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
+   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
    *
    * @default 'heading'
    */