@rnmapbox/maps 10.1.32-rc.2 → 10.1.33-rc.0

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -20,7 +20,7 @@ typealias ViewRefTag = Double
 // see https://github.com/rnmapbox/maps/pull/3074
 open class ViewTagResolver(val context: ReactApplicationContext) {
     private val createdViews: HashSet<Int> = hashSetOf<Int>()
-    private val viewWaiters: HashMap<Int, MutableList<ViewTagWaiter<View>>> = hashMapOf()
+    private val viewWaiters: HashMap<Int, MutableList<ViewTagWaiter<View?>>> = hashMapOf()
 
     // to be called from view.setId
     fun tagAssigned(viewTag: Int) {
@@ -68,7 +68,14 @@ open class ViewTagResolver(val context: ReactApplicationContext) {
                 }
             } catch (err: IllegalViewOperationException) {
                 if (!createdViews.contains(viewTag)) {
-                    viewWaiters.getOrPut(viewTag) { mutableListOf<ViewTagWaiter<View>>() }.add(ViewTagWaiter<View>({ view -> fn(view as V) }, reject))
+                    viewWaiters.getOrPut(viewTag) { mutableListOf<ViewTagWaiter<View?>>() }.add(ViewTagWaiter<View?>({ view ->
+                        if (view != null) {
+                            fn(view as V)
+                        } else {
+                            Logger.e(LOG_TAG, "view: $viewTag but is null")
+                            reject?.reject(Throwable("view: $viewTag but is null"))
+                        }
+                    }, reject))
                 } else {
                     reject?.reject(err)
                 }

package/ios/RNMBX/RNMBXMapViewManager.swift

@@ -111,8 +111,11 @@ extension RNMBXMapViewManager {
 
     @objc public static func getVisibleBounds(
         _ view: RNMBXMapView,
-        resolver: @escaping RCTPromiseResolveBlock) {
-            resolver(["visibleBounds":  view.mapboxMap.coordinateBounds(for: view.bounds).toArray()])
+        resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock) {
+          view.withMapboxMap { map in
+            resolver(["visibleBounds": map.coordinateBounds(for: view.bounds).toArray()])
+          }
     }
 
 }

package/ios/RNMBX/RNMBXMapViewModule.mm

@@ -87,7 +87,7 @@ RCT_EXPORT_METHOD(getPointInView:(nonnull NSNumber*)viewRef atCoordinate:(NSArra
 
 RCT_EXPORT_METHOD(getVisibleBounds:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [self withMapView:viewRef block:^(RNMBXMapView *view) {
-        [RNMBXMapViewManager getVisibleBounds:view resolver:resolve];
+        [RNMBXMapViewManager getVisibleBounds:view resolver:resolve rejecter:reject];
     } reject:reject methodName:@"getVisibleBounds"];
 }
 

package/ios/RNMBX/RNMBXRasterDemSource.swift

@@ -30,8 +30,8 @@ public class RNMBXRasterDemSource : RNMBXSource {
 
   override func makeSource() -> Source
   {
-    #if RNMBX_11 // RNMBX_11_TODO
-    var result = SourceType(id: "raster-dem-source-id-todo")
+    #if RNMBX_11
+    var result = SourceType(id: self.id)
     #else
     var result = SourceType()
     #endif

package/package.json

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