@rnmapbox/maps 10.1.18 → 10.1.19

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotation.kt

@@ -46,6 +46,8 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
     private var mCalloutSymbol: PointAnnotation? = null
     private var mCalloutBitmap: Bitmap? = null
     private var mCalloutBitmapId: String? = null
+
+    private val childViews = mutableListOf<View>();
     override fun addView(childView: View, childPosition: Int) {
         if (childView is RNMBXCallout) {
             calloutView = childView
@@ -55,6 +57,20 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         childView.addOnLayoutChangeListener(this)
 
         mMapView?.offscreenAnnotationViewContainer?.addView(childView)
+        childViews.add(childPosition, childView)
+    }
+
+    override fun getChildAt(childPosition: Int): View {
+        return childViews.get(childPosition)
+    }
+
+    override fun getChildCount(): Int {
+        return childViews.size
+    }
+
+    override fun removeViewAt(index: Int) {
+        val view = childViews.removeAt(index)
+        removeView(view)
     }
 
     override fun removeView(childView: View) {

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotationManager.kt

@@ -42,7 +42,6 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
         )
     }
 
-    // TODO: check why it does not work correctly
     override fun createViewInstance(reactContext: ThemedReactContext): RNMBXPointAnnotation {
         return RNMBXPointAnnotation(reactContext!!, this)
     }

package/ios/RNMBX/RNMBXCamera.swift

@@ -459,6 +459,15 @@ open class RNMBXCamera : RNMBXMapComponentBase {
           pitch: pitch ?? map.mapboxMap.cameraState.pitch
         )
       }
+    } else {
+      camera = CameraOptions(
+        center: nil,
+        padding: padding,
+        anchor: nil,
+        zoom: zoom,
+        bearing: heading,
+        pitch: pitch
+      )
     }
 
     guard let camera = camera else {

package/ios/RNMBX/RNMBXCustomLocationProvider.swift

@@ -1,5 +1,7 @@
 import MapboxMaps
 
+let TAG = "RNMBXCustomLocationProvider"
+
 @objc
 public class RNMBXCustomLocationProvider: UIView, RNMBXMapComponent {
   var map: RNMBXMapView? = nil
@@ -118,16 +120,21 @@ extension RNMBXCustomLocationProvider {
       let customLocationProvider = CustomLocationProvider()
       self.customLocationProvider = customLocationProvider
       if let locationModule = RNMBXLocationModule.shared {
-        locationModule.override(for: mapView.location)
         locationModule.locationProvider = customLocationProvider
-        // mapView.location.overrideLocationProvider(with: customLocationProvider!)
+        locationModule.override(for: mapView.location)
+      } else {
+        Logger.error(TAG, "RNMBXLocationModule.shared is nil")
+        mapView.location.overrideLocationProvider(with: customLocationProvider)
       }
       
     }
   }
   
   func removeCustomLocationProvider(mapView: MapView) {
-    if let provider = defaultLocationProvider {
+    if let locationModule = RNMBXLocationModule.shared {
+      locationModule.resetLocationProvider()
+      locationModule.override(for: mapView.location)
+    } else if let provider = defaultLocationProvider {
       mapView.location.overrideLocationProvider(with: provider)
     }
     customLocationProvider = nil

package/ios/RNMBX/RNMBXLocationModule.swift

@@ -460,6 +460,7 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   var hasListener = false
   
   var locationProvider : LocationProvider
+  var defaultLocationProvider : LocationProvider? = nil
   
   var locationEventThrottle : (
     waitBetweenEvents: Double?,
@@ -471,6 +472,7 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
 
   override init() {
     locationProvider = LocationProviderRNMBX()
+    defaultLocationProvider = locationProvider
     super.init()
     if let locationProvider = locationProvider as? LocationProviderRNMBX {
       locationProvider.delegate = self
@@ -568,6 +570,12 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
     }
   }
   
+  func resetLocationProvider() {
+    if let defaultLocationProvider = defaultLocationProvider {
+      self.locationProvider = defaultLocationProvider
+    }
+  }
+
   // MARK: - location event throttle
   @objc
   func setLocationEventThrottle(_ throttleValue:NSNumber) {

package/ios/RNMBX/RNMBXLogging.swift

@@ -78,6 +78,10 @@ public class Logger {
     }
   }
   
+  public static func error(_ tag: String, _ message: String) {
+    log(level: .error, tag: tag, message: message)
+  }
+
   public static func error(_ message: String) {
     log(level: .error, message: message)
   }

package/ios/RNMBX/RNMBXModels.swift

@@ -22,8 +22,7 @@ open class RNMBXModels : UIView, RNMBXMapComponent {
       self.modelIdToUrl = newModels
     }
     get {
-      Logger.error("RNMBXModels.models.getter not implemented")
-      return NSDictionary()
+      return modelIdToUrl as NSDictionary
     }
   }
   

package/package.json

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