@rnmapbox/maps 10.1.0-rc.1 → 10.1.0-rc.2

package/README.md

@@ -220,7 +220,7 @@ const styles = StyleSheet.create({
 
 ### Misc
 
-- [Mapbox](/docs/MapboxGL.md)
+- [Mapbox](/docs/Mapbox.md)
 - [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
 - [Logger](/docs/Logger.md)
 

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

@@ -14,12 +14,15 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.common.MapBuilder
 import com.mapbox.common.*
 import com.mapbox.maps.MapView
+import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
 import com.mapbox.maps.plugin.attribution.attribution
 import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
+import com.rnmapbox.rnmbx.utils.Logger
 import java.util.HashMap
 
 import com.rnmapbox.rnmbx.v11compat.resourceoption.*
+import com.rnmapbox.rnmbx.v11compat.mapboxmap.*
 
 @ReactModule(name = RNMBXModule.REACT_CLASS)
 class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
@@ -128,6 +131,19 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
         }
     }
 
+    @ReactMethod
+    fun clearData(promise: Promise) {
+        mReactContext.runOnUiQueueThread {
+            MapboxMap.clearData(mReactContext) {
+                if (it.isValue) {
+                    promise.resolve(it.value)
+                } else {
+                    promise.reject("error", "RNMBXModule.clearError ${it.error}")
+                }
+            }
+        }
+    }
+
     @ReactMethod
     fun setAccessToken(accessToken: String?, promise: Promise) {
         mReactContext.runOnUiQueueThread(Runnable {
@@ -138,7 +154,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     @ReactMethod
     fun setWellKnownTileServer(tileServer: String?) {
-        // NO-OP
+        Logger.e(LOG_TAG, "setWellKnownTileServer is deprecated and will be removed")
     }
 
     @ReactMethod
@@ -153,6 +169,7 @@ class RNMBXModule(private val mReactContext: ReactApplicationContext) : ReactCon
 
     companion object {
         const val REACT_CLASS = "RNMBXModule"
+        const val LOG_TAG = "RNMBXModule"
         private val customHeaderInterceptorAdded = false
         @JvmStatic
         fun getAccessToken(reactContext: ReactApplicationContext?): String {

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

@@ -1,7 +1,14 @@
 package com.rnmapbox.rnmbx.v11compat.mapboxmap;
 
 import android.animation.Animator
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+import androidx.activity.result.contract.ActivityResultContracts
+import com.mapbox.bindgen.Expected
+import com.mapbox.bindgen.None
 import com.mapbox.maps.CameraOptions
+import com.mapbox.maps.MapView
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.plugin.animation.easeTo
@@ -29,3 +36,7 @@ fun MapboxMap.easeToV11(
 
     )
 }
+
+fun MapboxMap.Companion.clearData(context: Context, callback: (result: Expected<String, None>) -> Unit) {
+    MapView(context).getMapboxMap().clearData(callback)
+}

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

@@ -1,6 +1,7 @@
 package com.rnmapbox.rnmbx.v11compat.mapboxmap
 
 import android.animation.Animator
+import android.content.Context
 import com.mapbox.maps.AsyncOperationResultCallback
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapboxMap
@@ -34,4 +35,8 @@ fun MapboxMap.easeToV11(
 
 fun MapboxMap.clearData(callback: AsyncOperationResultCallback) {
     return MapboxMap.clearData(callback)
+}
+
+fun MapboxMap.Companion.clearData(context: Context, callback: AsyncOperationResultCallback) {
+    this.clearData(callback)
 }

package/ios/RNMBX/RNMBXModule.m

@@ -9,6 +9,6 @@ RCT_EXTERN_METHOD(removeCustomHeader:(NSString *)headerName)
 
 RCT_EXTERN_METHOD(setTelemetryEnabled:(BOOL)telemetryEnabled)
 RCT_EXTERN_METHOD(setWellKnownTileServer:(NSString *)tileServer)
-
+RCT_EXTERN_METHOD(clearData:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 @end

package/ios/RNMBX/RNMBXModule.swift

@@ -113,4 +113,28 @@ class RNMBXModule : NSObject {
       Logger.error("setWellKnownTileServer: \(tileServer) should be mapbox")
     }
   }
+
+  @objc func clearData(_ resolver: @escaping RCTPromiseResolveBlock,
+    rejecter: @escaping RCTPromiseRejectBlock) {
+    
+    DispatchQueue.main.async {
+      #if RNMBX_11
+      MapboxMap.clearData { error in
+        if let error = error {
+          rejecter("error", error.localizedDescription, error)
+        } else {
+          resolver(nil)
+        }
+      }
+      #else
+      MapboxMap.clearData(for: ResourceOptions(accessToken: RNMBXModule.accessToken ?? "")) { error in
+        if let error = error {
+          rejecter("error", error.localizedDescription, error)
+        } else {
+          resolver(nil)
+        }
+      }
+      #endif
+    }
+  }
 }

package/lib/commonjs/RNMBXModule.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
+exports.setWellKnownTileServer = exports.setTelemetryEnabled = exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.clearData = exports.addCustomHeader = exports.TileServers = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = void 0;
 var _reactNative = require("react-native");
 const RNMBXModule = {
   ..._reactNative.NativeModules.RNMBXModule
@@ -18,6 +18,7 @@ const {
   addCustomHeader,
   setAccessToken,
   setWellKnownTileServer,
+  clearData,
   getAccessToken,
   setTelemetryEnabled,
   setConnected
@@ -25,6 +26,7 @@ const {
 exports.setConnected = setConnected;
 exports.setTelemetryEnabled = setTelemetryEnabled;
 exports.getAccessToken = getAccessToken;
+exports.clearData = clearData;
 exports.setWellKnownTileServer = setWellKnownTileServer;
 exports.setAccessToken = setAccessToken;
 exports.addCustomHeader = addCustomHeader;

package/lib/commonjs/RNMBXModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAsCA,MAAMC,WAAwB,GAAG;EAAE,GAAGC,0BAAa,CAACD;AAAY,CAAC;AAE1D,MAAM;EACXE,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGb,WAAW;AAACc,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,sBAAA,GAAAA,sBAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,eAAA,GAAAA,eAAA;AAAAM,OAAA,CAAAP,kBAAA,GAAAA,kBAAA;AAAAO,OAAA,CAAAR,WAAA,GAAAA,WAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA;AAAAS,OAAA,CAAAV,QAAA,GAAAA,QAAA;AAAAU,OAAA,CAAAX,wBAAA,GAAAA,wBAAA;AAAAW,OAAA,CAAAZ,QAAA,GAAAA,QAAA"}
+{"version":3,"names":["_reactNative","require","RNMBXModule","NativeModules","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected","exports"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAuCA,MAAMC,WAAwB,GAAG;EAAE,GAAGC,0BAAa,CAACD;AAAY,CAAC;AAE1D,MAAM;EACXE,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGd,WAAW;AAACe,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,SAAA,GAAAA,SAAA;AAAAI,OAAA,CAAAL,sBAAA,GAAAA,sBAAA;AAAAK,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAAAM,OAAA,CAAAP,eAAA,GAAAA,eAAA;AAAAO,OAAA,CAAAR,kBAAA,GAAAA,kBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA;AAAAS,OAAA,CAAAV,WAAA,GAAAA,WAAA;AAAAU,OAAA,CAAAX,QAAA,GAAAA,QAAA;AAAAW,OAAA,CAAAZ,wBAAA,GAAAA,wBAAA;AAAAY,OAAA,CAAAb,QAAA,GAAAA,QAAA"}

package/lib/module/RNMBXModule.js

@@ -12,6 +12,7 @@ export const {
   addCustomHeader,
   setAccessToken,
   setWellKnownTileServer,
+  clearData,
   getAccessToken,
   setTelemetryEnabled,
   setConnected

package/lib/module/RNMBXModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAsC5C,MAAMC,WAAwB,GAAG;EAAE,GAAGD,aAAa,CAACC;AAAY,CAAC;AAEjE,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGZ,WAAW"}
+{"version":3,"names":["NativeModules","RNMBXModule","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","TileServers","removeCustomHeader","addCustomHeader","setAccessToken","setWellKnownTileServer","clearData","getAccessToken","setTelemetryEnabled","setConnected"],"sourceRoot":"../../src","sources":["RNMBXModule.ts"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAuC5C,MAAMC,WAAwB,GAAG;EAAE,GAAGD,aAAa,CAACC;AAAY,CAAC;AAEjE,OAAO,MAAM;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClBC,eAAe;EACfC,cAAc;EACdC,sBAAsB;EACtBC,SAAS;EACTC,cAAc;EACdC,mBAAmB;EACnBC;AACF,CAAC,GAAGb,WAAW"}

package/lib/typescript/src/RNMBXModule.d.ts

@@ -18,5 +18,5 @@ export declare const StyleURL: {
     DefaultSourceID: string;
 }, TileServers: {
     Mapbox: string;
-}, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
+}, removeCustomHeader: (headerName: string) => void, addCustomHeader: (headerName: string, headerValue: string) => void, setAccessToken: (accessToken: string | null) => Promise<string | null>, setWellKnownTileServer: (tileServer: string) => void, clearData: () => Promise<void>, getAccessToken: () => Promise<string>, setTelemetryEnabled: (telemetryEnabled: boolean) => void, setConnected: (connected: boolean) => void;
 //# sourceMappingURL=RNMBXModule.d.ts.map

package/lib/typescript/src/RNMBXModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAwCA,eAAO,MACL,QAAQ;YArCE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAiCtB,wBAAwB;cA9BZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;;GA6B3B,QAAQ;WAzBC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAwBxB,WAAW;qBArBQ,MAAM;GAsBzB,WAAW;YAnBD,MAAM;GAoBhB,kBAAkB,eAjBa,MAAM,KAAG,IAAI,EAkB5C,eAAe,eAjBa,MAAM,eAAe,MAAM,KAAG,IAAI,EAkB9D,cAAc,gBAjBc,MAAM,GAAG,IAAI,KAAG,QAAQ,MAAM,GAAG,IAAI,CAAC,EAkBlE,sBAAsB,eAjBa,MAAM,KAAG,IAAI,EAkBhD,cAAc,QAjBI,QAAQ,MAAM,CAAC,EAkBjC,mBAAmB,qBAjBmB,OAAO,KAAG,IAAI,EAkBpD,YAAY,cAjBY,OAAO,KAAG,IAkBrB,CAAC"}
+{"version":3,"file":"RNMBXModule.d.ts","sourceRoot":"","sources":["../../../src/RNMBXModule.ts"],"names":[],"mappings":"AAyCA,eAAO,MACL,QAAQ;YAtCE,GAAG;cACD,GAAG;WACN,GAAG;UACJ,GAAG;eACE,GAAG;qBACG,GAAG;GAkCtB,wBAAwB;cA/BZ,MAAM,GAAG,MAAM;YACjB,MAAM,GAAG,MAAM;cACb,MAAM,GAAG,MAAM;;GA8B3B,QAAQ;WA1BC,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;WACf,MAAM,GAAG,MAAM;GAyBxB,WAAW;qBAtBQ,MAAM;GAuBzB,WAAW;YApBD,MAAM;GAqBhB,kBAAkB,eAlBa,MAAM,KAAG,IAAI,EAmB5C,eAAe,eAlBa,MAAM,eAAe,MAAM,KAAG,IAAI,EAmB9D,cAAc,gBAlBc,MAAM,GAAG,IAAI,KAAG,QAAQ,MAAM,GAAG,IAAI,CAAC,EAmBlE,sBAAsB,eAlBa,MAAM,KAAG,IAAI,EAmBhD,SAAS,QAlBI,QAAQ,IAAI,CAAC,EAmB1B,cAAc,QAlBI,QAAQ,MAAM,CAAC,EAmBjC,mBAAmB,qBAlBmB,OAAO,KAAG,IAAI,EAmBpD,YAAY,cAlBY,OAAO,KAAG,IAmBrB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.0-rc.1",
+  "version": "10.1.0-rc.2",
   "publishConfig": {
     "access": "public"
   },

package/setup-jest.js

@@ -98,6 +98,7 @@ NativeModules.RNMBXModule = {
   getAccessToken: () => Promise.resolve('test-token'),
   setTelemetryEnabled: jest.fn(),
   setConnected: jest.fn(),
+  clearData: jest.fn(),
 
   MapboxV10: true,
 };

package/src/RNMBXModule.ts

@@ -31,6 +31,7 @@ interface RNMBXModule {
   addCustomHeader(headerName: string, headerValue: string): void;
   setAccessToken(accessToken: string | null): Promise<string | null>;
   setWellKnownTileServer(tileServer: string): void;
+  clearData(): Promise<void>;
   getAccessToken(): Promise<string>;
   setTelemetryEnabled(telemetryEnabled: boolean): void;
   setConnected(connected: boolean): void;
@@ -48,6 +49,7 @@ export const {
   addCustomHeader,
   setAccessToken,
   setWellKnownTileServer,
+  clearData,
   getAccessToken,
   setTelemetryEnabled,
   setConnected,