@rnmapbox/maps 10.0.0-beta.54 → 10.0.0-beta.56

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.kt

@@ -1,6 +1,7 @@
 package com.mapbox.rctmgl.components.annotation
 
 import android.view.View
+import android.widget.FrameLayout
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
 import com.facebook.react.bridge.ReactApplicationContext
 import com.mapbox.rctmgl.components.AbstractEventEmitter
@@ -8,6 +9,10 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.mapbox.maps.ScreenCoordinate
+import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
+import com.mapbox.maps.viewannotation.ViewAnnotationManager
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
 class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext?) :
     AbstractEventEmitter<RCTMGLMarkerView?>(reactApplicationContext) {
@@ -46,5 +51,28 @@ class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext?)
 
     companion object {
         const val REACT_CLASS = "RCTMGLMarkerView"
+
+        fun markerViewContainerSizeFixer(mapView: RCTMGLMapView, viewAnnotationManager: ViewAnnotationManager) {
+            // see https://github.com/rnmapbox/maps/issues/2376
+            viewAnnotationManager.addOnViewAnnotationUpdatedListener(object :
+                OnViewAnnotationUpdatedListener {
+                override fun onViewAnnotationVisibilityUpdated(view: View, visible: Boolean) {
+                    val parent = view.parent
+                    if (parent is FrameLayout) {
+                        if ((parent.width == 0 && parent.height == 0) && (mapView.width != 0 || mapView.height != 0)) {
+                            parent.layout(0,0,mapView.width, mapView.height)
+                        }
+                    }
+                }
+
+                override fun onViewAnnotationPositionUpdated(
+                    view: View,
+                    leftTopCoordinate: ScreenCoordinate,
+                    width: Int,
+                    height: Int
+                ) {
+                }
+            })
+        }
     }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -43,6 +43,7 @@ import com.mapbox.maps.plugin.scalebar.scalebar
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerView
+import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager
 import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation
 import com.mapbox.rctmgl.components.camera.RCTMGLCamera
 import com.mapbox.rctmgl.components.images.RCTMGLImages
@@ -900,6 +901,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 images.sendImageMissingEvent(id, mMap)
             }
         })
+
+        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, viewAnnotationManager)
     }
 
     // region Ornaments

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt

@@ -269,11 +269,12 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
                 );
             }
             METHOD_QUERY_FEATURES_RECT -> {
+                val layerIds = ConvertUtils.toStringList(args!!.getArray(3))
                 mapView.queryRenderedFeaturesInRect(
                         args!!.getString(0),
                         ConvertUtils.toRectF(args.getArray(1)),
                         ExpressionParser.from(args!!.getArray(2)),
-                        ConvertUtils.toStringList(args!!.getArray(3))
+                        if (layerIds.size == 0) null else layerIds
                 );
             }
             METHOD_VISIBLE_BOUNDS -> {

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -65,10 +65,10 @@ class CameraUpdateQueue {
 }
 
 open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
-  private var _map: RCTMGLMapView! = nil
+  private weak var _map: RCTMGLMapView! = nil
   private var _mapCallbacks: [(RCTMGLMapView) -> Void] = []
   
-  var map : RCTMGLMapView? {
+  weak var map : RCTMGLMapView? {
     return _map;
   }
 

package/ios/RCTMGL-v10/RCTMGLCircleLayer.swift

@@ -6,7 +6,7 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
   typealias LayerType = CircleLayer
 
   override func makeLayer(style: Style) throws -> Layer {
-    let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
+    let _ : VectorSource = try self.layerWithSourceID(in: style)
     var layer = LayerType(id: self.id!)
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
@@ -44,23 +44,4 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
   func isAddedToMap() -> Bool {
     return true
   }
-/*
-- (MGLCircleStyleLayer*)makeLayer:(MGLStyle*)style
-{
-    MGLSource *source = [self layerWithSourceIDInStyle:style];
-    if (source == nil) { return nil; }
-    MGLCircleStyleLayer *layer = [[MGLCircleStyleLayer alloc] initWithIdentifier:self.id source:source];
-    layer.sourceLayerIdentifier = self.sourceLayerID;
-    return layer;
-}
-
-- (void)addStyles
-{
-    RCTMGLStyle *style = [[RCTMGLStyle alloc] initWithMGLStyle:self.style];
-    style.bridge = self.bridge;
-    [style circleLayer:(MGLCircleStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
-}*/
-
 }

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -2,7 +2,7 @@ import MapboxMaps
 
 class RCTMGLImages : UIView, RCTMGLMapComponent {
   
-  var bridge : RCTBridge! = nil
+  weak var bridge : RCTBridge! = nil
   var remoteImages : [String:String] = [:]
   
   @objc

package/ios/RCTMGL-v10/RCTMGLInteractiveElement.swift

@@ -1,12 +1,10 @@
-@_spi(Experimental) import MapboxMaps
+import MapboxMaps
 
 @objc
 class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
 
-  var map : RCTMGLMapView? = nil
-  
-  var layers: [RCTMGLSourceConsumer] = []
-  
+  weak var map : RCTMGLMapView? = nil
+
   static let hitboxDefault = 44.0
 
   @objc var draggable: Bool = false
@@ -25,13 +23,7 @@ class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
   @objc var onPress: RCTBubblingEventBlock? = nil
   
   func getLayerIDs() -> [String] {
-    layers.compactMap {
-      if let layer = $0 as? RCTMGLLayer {
-        return layer.id
-      } else {
-        return nil
-      }
-    }
+    return []
   }
 
   func isDraggable() -> Bool {

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -7,11 +7,12 @@ protocol RCTMGLSourceConsumer {
 
 @objc(RCTMGLLayer)
 class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
-  var bridge : RCTBridge? = nil
+  weak var bridge : RCTBridge? = nil
 
   @objc var sourceLayerID : String? = nil {
     didSet { self.optionsChanged() }
   }
+
   @objc var reactStyle : Dictionary<String, Any>? = nil {
     didSet {
       DispatchQueue.main.async {

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -27,8 +27,16 @@ typealias RCTMGLLocationBlock = (RCTMGLLocation?) -> Void
 
 let RCT_MAPBOX_USER_LOCATION_UPDATE = "MapboxUserLocationUpdate";
 
+/// This implementation of LocationProviderDelegate is used by `LocationManager` to work around
+/// the fact that the `LocationProvider` API does not allow the delegate to be set to `nil`.
+internal class EmptyLocationProviderDelegate: LocationProviderDelegate {
+    func locationProvider(_ provider: LocationProvider, didFailWithError error: Error) {}
+    func locationProvider(_ provider: LocationProvider, didUpdateHeading newHeading: CLHeading) {}
+    func locationProvider(_ provider: LocationProvider, didUpdateLocations locations: [CLLocation]) {}
+    func locationProviderDidChangeAuthorization(_ provider: LocationProvider) {}
+}
 
-protocol RCTMGLLocationManagerDelegate {
+protocol RCTMGLLocationManagerDelegate : AnyObject {
   func locationManager(_ locationManager: RCTMGLLocationManager, didUpdateLocation: RCTMGLLocation)
 }
 
@@ -38,8 +46,8 @@ class RCTMGLLocationManager : LocationProviderDelegate {
   var lastKnownLocation : CLLocation?
   var lastKnownHeading : CLHeading?
   
-  var delegate: RCTMGLLocationManagerDelegate?
-  var locationProviderDelage: LocationProviderDelegate?
+  weak var delegate: RCTMGLLocationManagerDelegate?
+  weak var locationProviderDelage: LocationProviderDelegate?
   
   var listeners: [RCTMGLLocationBlock] = []
   
@@ -60,6 +68,12 @@ class RCTMGLLocationManager : LocationProviderDelegate {
     provider.startUpdatingLocation()
   }
   
+  func stop() {
+    provider.stopUpdatingHeading()
+    provider.stopUpdatingLocation()
+    provider.setDelegate(EmptyLocationProviderDelegate())
+  }
+  
   func _convertToMapboxLocation(_ location: CLLocation?) -> RCTMGLLocation {
     guard let location = location else {
       return RCTMGLLocation()
@@ -192,7 +206,7 @@ extension RCTMGLLocationManager: LocationProvider {
 @objc(RCTMGLLocationModule)
 class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
 
-  static var shared : RCTMGLLocationModule? = nil
+  static weak var shared : RCTMGLLocationModule? = nil
   
   var locationManager : RCTMGLLocationManager
   var hasListener = false
@@ -233,7 +247,7 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   }
   
   @objc func stop() {
-    print("TODO implement RCTMGLLocationModule.stop!")
+    locationManager.stop()
   }
   
   @objc func getLastKnownLocation() -> RCTMGLLocation? {

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -15,7 +15,7 @@ open class RCTMGLMapView : MapView {
   var styleLoaded: Bool = false
   var styleLoadWaiters : [(MapboxMap)->Void] = []
 
-  var reactCamera : RCTMGLCamera?
+  weak var reactCamera : RCTMGLCamera?
   var images : [RCTMGLImages] = []
   var sources : [RCTMGLInteractiveElement] = []
   
@@ -282,10 +282,26 @@ open class RCTMGLMapView : MapView {
 // MARK: - event handlers
 
 extension RCTMGLMapView {
+  private func onEvery<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
+    self.mapView.mapboxMap.onEvery(event: event) { [weak self](mapEvent) in
+      guard let self = self else { return }
+
+      handler(self, mapEvent)
+    }
+  }
+
+  private func onNext<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
+    self.mapView.mapboxMap.onNext(event: event) { [weak self](mapEvent) in
+      guard let self = self else { return }
+
+      handler(self, mapEvent)
+    }
+  }
+
   @objc func setReactOnMapChange(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnMapChange = value
 
-    self.mapView.mapboxMap.onEvery(event: .cameraChanged, handler: { cameraEvent in
+    self.onEvery(event: .cameraChanged, handler: { (self, cameraEvent) in
       self.wasGestureActive = self.isGestureActive
       if self.handleMapChangedEvents.contains(.regionIsChanging) {
         let event = RCTMGLEvent(type:.regionIsChanging, payload: self.buildRegionObject());
@@ -296,7 +312,7 @@ extension RCTMGLMapView {
       }
     })
 
-    self.mapView.mapboxMap.onEvery(event: .mapIdle, handler: { cameraEvent in
+    self.onEvery(event: .mapIdle, handler: { (self, cameraEvent) in
       if self.handleMapChangedEvents.contains(.regionDidChange) {
         let event = RCTMGLEvent(type:.regionDidChange, payload: self.buildRegionObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
@@ -367,7 +383,7 @@ extension RCTMGLMapView {
   }
   
   public func setupEvents() {
-    self.mapboxMap.onEvery(event: .mapLoadingError, handler: {(event) in
+    self.onEvery(event: .mapLoadingError, handler: {(self, event) in
       if let message = event.payload.error.errorDescription {
         Logger.log(level: .error, message: "MapLoad error \(message)")
       } else {
@@ -375,7 +391,7 @@ extension RCTMGLMapView {
       }
     })
     
-    self.mapboxMap.onEvery(event: .styleImageMissing) { (event) in
+    self.onEvery(event: .styleImageMissing) { (self, event) in
       let imageName = event.payload.id
       
       self.images.forEach {
@@ -389,7 +405,7 @@ extension RCTMGLMapView {
       }
     }
 
-    self.mapboxMap.onEvery(event: .renderFrameFinished, handler: { (event) in
+    self.onEvery(event: .renderFrameFinished, handler: { (self, event) in
       var type = RCTMGLEvent.EventType.didFinishRendering
       if event.payload.renderMode == .full {
         type = .didFinishRenderingFully
@@ -403,12 +419,12 @@ extension RCTMGLMapView {
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
 
-    self.mapboxMap.onNext(event: .mapLoaded, handler: { (event) in
+    self.onNext(event: .mapLoaded, handler: { (self, event) in
       let event = RCTMGLEvent(type:.didFinishLoadingMap, payload: nil);
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
     
-    self.mapboxMap.onEvery(event: .styleLoaded, handler: { (event) in
+    self.onEvery(event: .styleLoaded, handler: { (self, event) in
       self.onStyleLoadedComponents.forEach { (component) in
         component.addToMap(self, style: self.mapboxMap.style)
       }

package/ios/RCTMGL-v10/RCTMGLMapViewManager.swift

@@ -215,13 +215,13 @@ extension RCTMGLMapViewManager {
     resolver: @escaping RCTPromiseResolveBlock,
     rejecter: @escaping RCTPromiseRejectBlock) -> Void {
       withMapView(reactTag, name:"queryRenderedFeaturesInRect", rejecter: rejecter) { mapView in
-        let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue)
-        let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue)
-        let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue)
-        let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue)
+        let top = bbox.isEmpty ? 0.0 : CGFloat(bbox[0].floatValue)
+        let right = bbox.isEmpty ? 0.0 : CGFloat(bbox[1].floatValue)
+        let bottom = bbox.isEmpty ? 0.0 : CGFloat(bbox[2].floatValue)
+        let left = bbox.isEmpty ? 0.0 : CGFloat(bbox[3].floatValue)
         let rect = bbox.isEmpty ? CGRect(x: 0.0, y: 0.0, width: mapView.bounds.size.width, height: mapView.bounds.size.height) : CGRect(x: [left,right].min()!, y: [top,bottom].min()!, width: abs(right-left), height: abs(bottom-top))
         logged("queryRenderedFeaturesInRect.option", rejecter: rejecter) {
-          let options = try RenderedQueryOptions(layerIds: layerIDs, filter: filter?.asExpression())
+          let options = try RenderedQueryOptions(layerIds: layerIDs?.isEmpty ?? true ? nil : layerIDs, filter: filter?.asExpression())
           mapView.mapboxMap.queryRenderedFeatures(with: rect, options: options) { result in
             switch result {
             case .success(let features):

package/ios/RCTMGL-v10/RCTMGLMarkerView.swift

@@ -7,7 +7,7 @@ class RCTMGLMarkerView: UIView, RCTMGLMapComponent {
   static let key = "RCTMGLMarkerView"
   let id: String = "marker-\(UUID().uuidString)"
   
-  var map: RCTMGLMapView?
+  weak var map: RCTMGLMapView?
   
   var didAddToMap = false
   

package/ios/RCTMGL-v10/RCTMGLPointAnnotation.swift

@@ -14,7 +14,7 @@ class RCTMGLPointAnnotation : RCTMGLInteractiveElement {
   static var gid = 0;
   
   var annotation : PointAnnotation! = nil
-  var callout: RCTMGLCallout? = nil
+  weak var callout: RCTMGLCallout? = nil
   var calloutId : String?
   var image : UIImage? = nil
   var reactSubviews : [UIView] = []

package/ios/RCTMGL-v10/RCTMGLSingletonLayer.swift

@@ -3,8 +3,8 @@ import MapboxMaps
 /// RCTMGLSingletonLayer is absract superclass for Light, Atmosphere, Terrain
 @objc
 class RCTMGLSingletonLayer : UIView {
-  var bridge : RCTBridge? = nil
-  var map : RCTMGLMapView? = nil
+  weak var bridge : RCTBridge? = nil
+  weak var map : RCTMGLMapView? = nil
   var style: Style? = nil
   
   @objc var reactStyle : Dictionary<String, Any>? = nil {

package/ios/RCTMGL-v10/RCTMGLSource.swift

@@ -2,11 +2,22 @@
 
 @objc
 class RCTMGLSource : RCTMGLInteractiveElement {
-  
+  var layers: [RCTMGLSourceConsumer] = []
+
   var source : Source? = nil
 
   var ownsSource : Bool = false
   
+  override func getLayerIDs() -> [String] {
+    layers.compactMap {
+      if let layer = $0 as? RCTMGLLayer {
+        return layer.id
+      } else {
+        return nil
+      }
+    }
+  }
+
   func makeSource() -> Source {
     fatalError("Subclasses should override makeSource")
   }
@@ -15,6 +26,8 @@ class RCTMGLSource : RCTMGLInteractiveElement {
     fatalError("Subclasses should override makeSource")
   }
   
+  // MARK: - UIView+React
+
   @objc override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
     if let layer : RCTMGLSourceConsumer = subview as? RCTMGLSourceConsumer {
       if let map = map {
@@ -22,6 +35,15 @@ class RCTMGLSource : RCTMGLInteractiveElement {
       }
       layers.append(layer)
     }
+    super.insertReactSubview(subview, at: atIndex)
+  }
+  
+  @objc override func removeReactSubview(_ subview: UIView!) {
+    super.removeReactSubview(subview)
+  }
+  
+  @objc override func didUpdateReactSubviews() {
+    // do nothing to prevent inserting layers to UIView hierarchy
   }
   
   // MARK: - RCTMGLInteractiveElement

package/ios/RCTMGL-v10/RCTMGLStyleValue.swift

@@ -225,7 +225,7 @@ class RCTMGLStyleValue {
           red: CGFloat((Float((rgbValue & 0xff0000) >> 16)) / 255.0),
           green: CGFloat((Float((rgbValue & 0x00ff00) >> 8)) / 255.0),
           blue: CGFloat((Float((rgbValue & 0x0000ff) >> 0)) / 255.0),
-          alpha: 1.0)
+          alpha: CGFloat((rgbValue & 0xFF000000) >> 24) / 0xFF)
   }
 
   func mglStyleValueColor() -> Value<StyleColor> {

package/ios/RCTMGL-v10/RCTMGLVectorLayer.swift

@@ -2,48 +2,4 @@ import MapboxMaps
 
 @objc(RCTMGLVectorLayer)
 class RCTMGLVectorLayer: RCTMGLLayer {
-  //@property (nonatomic, copy) NSString *sourceLayerID;
-/*
-- (NSPredicate*)buildFilters
-{
-    return self.filter ? [FilterParser parse:self.filter] : nil;
-}
-
-- (void)updateFilter:(NSPredicate *)predicate
-{
-    @try {
-        ((MGLVectorStyleLayer *) self.styleLayer).predicate = predicate;
-    }
-    @catch (NSException* exception) {
-        RCTMGLLogError(@"Invalid predicate: %@ on layer %@ - %@ reason: %@", predicate, self, exception.name, exception.reason);
-    }
-}
-
-- (void)setSourceLayerID:(NSString *)sourceLayerID
-{
-    _sourceLayerID = sourceLayerID;
-    
-    if (self.styleLayer != nil) {
-        ((MGLVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
-    }
-}
-
-- (void)addedToMap
-{
-    NSPredicate *filter = [self buildFilters];
-    if (filter != nil) {
-        [self updateFilter:filter];
-    }
-}
-
-- (void)setFilter:(NSArray*)filter
-{
-    [super setFilter: filter];
-
-    if (self.styleLayer != nil) {
-        NSPredicate *predicate = [self buildFilters];
-        [self updateFilter:predicate];
-    }
-}
-*/
 }

package/lib/commonjs/web/utils/Logger.js.map

@@ -1 +1 @@
-{"version":3,"names":["Logger","sharedInstance","instance","constructor","logCallback","setLogCallback","setLogLevel","level","start","stop","subscribe","unsubscribe","effectiveLevel","log","message","tag","startsWith","onLog","console","error","warn"],"sourceRoot":"../../javascript","sources":["Logger.ts"],"mappings":";;;;;;;AAAA;;AASA,MAAMA,MAAM,CAAC;EAOX,OAAOC,cAAc,GAAG;IACtB,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1B,IAAI,CAACA,QAAQ,GAAG,IAAIF,MAAM,EAAE;IAC9B;IACA,OAAO,IAAI,CAACE,QAAQ;EACtB;EAEAC,WAAW,GAAG;IAAA,+BAXI,MAAM;IAAA;IAAA,sCAET,CAAC;IAUd,IAAI,CAACC,WAAW,GAAG,IAAI;EACzB;;EAEA;AACF;AACA;AACA;AACA;EACE,OAAOC,cAAc,CAACD,WAAwB,EAAE;IAC9C,IAAI,CAACH,cAAc,EAAE,CAACI,cAAc,CAACD,WAAW,CAAC;EACnD;;EAEA;AACF;AACA;AACA;AACA;EACEC,cAAc,CAACD,WAAwB,EAAE;IACvC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE;AACF;AACA;AACA;EACE,OAAOE,WAAW,CAACC,KAAe,EAAE;IAClC,IAAI,CAACN,cAAc,EAAE,CAACM,KAAK,GAAGA,KAAK;EACrC;EAEAC,KAAK,GAAG,CAAC;EAETC,IAAI,GAAG,CAAC;EAERC,SAAS,GAAG;IACV;EACF;EAEAC,WAAW,GAAG;IACZ;EACF;EAEAC,cAAc,CAACC,GAAe,EAAY;IACxC,MAAM;MAAEN,KAAK;MAAEO,OAAO;MAAEC;IAAI,CAAC,GAAGF,GAAG;IAEnC,IAAIN,KAAK,KAAK,SAAS,EAAE;MACvB,IACEQ,GAAG,KAAK,kBAAkB,IAC1BD,OAAO,CAACE,UAAU,CAAC,mDAAmD,CAAC,EACvE;QACA;QACA,OAAO,MAAM;MACf;IACF;IACA,OAAOT,KAAK;EACd;EAEAU,KAAK,CAACJ,GAAe,EAAE;IACrB,IAAI,CAAC,IAAI,CAACT,WAAW,IAAI,CAAC,IAAI,CAACA,WAAW,CAACS,GAAG,CAAC,EAAE;MAC/C,MAAM;QAAEC;MAAQ,CAAC,GAAGD,GAAG;MACvB,MAAMN,KAAK,GAAG,IAAI,CAACK,cAAc,CAACC,GAAG,CAAC;MACtC,IAAIN,KAAK,KAAK,OAAO,EAAE;QACrBW,OAAO,CAACC,KAAK,CAAC,cAAc,EAAEL,OAAO,EAAED,GAAG,CAAC;MAC7C,CAAC,MAAM,IAAIN,KAAK,KAAK,SAAS,EAAE;QAC9BW,OAAO,CAACE,IAAI,CAAC,gBAAgB,EAAEN,OAAO,EAAED,GAAG,CAAC;MAC9C,CAAC,MAAM;QACLK,OAAO,CAACL,GAAG,CAAE,WAAUN,KAAM,GAAE,EAAEO,OAAO,EAAED,GAAG,CAAC;MAChD;IACF;EACF;AACF;AAAC,gBA7FKb,MAAM,cACuB,IAAI;AA8FvCA,MAAM,CAACC,cAAc,EAAE,CAACO,KAAK,EAAE;AAAC,eAEjBR,MAAM;AAAA"}
+{"version":3,"names":["Logger","sharedInstance","instance","constructor","logCallback","setLogCallback","setLogLevel","level","start","stop","subscribe","unsubscribe","effectiveLevel","log","message","tag","startsWith","onLog","console","error","warn"],"sourceRoot":"../../javascript","sources":["Logger.ts"],"mappings":";;;;;;;AAAA;;AASA,MAAMA,MAAM,CAAC;EAOX,OAAOC,cAAc,GAAG;IACtB,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1B,IAAI,CAACA,QAAQ,GAAG,IAAIF,MAAM,EAAE;IAC9B;IACA,OAAO,IAAI,CAACE,QAAQ;EACtB;EAEAC,WAAW,GAAG;IAAA,+BAXI,MAAM;IAAA;IAAA,sCAET,CAAC;IAUd,IAAI,CAACC,WAAW,GAAG,IAAI;EACzB;;EAEA;AACF;AACA;AACA;AACA;EACE,OAAOC,cAAc,CAACD,WAAwB,EAAE;IAC9C,IAAI,CAACH,cAAc,EAAE,CAACI,cAAc,CAACD,WAAW,CAAC;EACnD;;EAEA;AACF;AACA;AACA;AACA;EACEC,cAAc,CAACD,WAAwB,EAAE;IACvC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE;AACF;AACA;AACA;EACE,OAAOE,WAAW,CAACC,KAAe,EAAE;IAClC,IAAI,CAACN,cAAc,EAAE,CAACM,KAAK,GAAGA,KAAK;EACrC;EAEAC,KAAK,GAAG,CAAC;EAETC,IAAI,GAAG,CAAC;EAERC,SAAS,GAAG;IACV;EAAA;EAGFC,WAAW,GAAG;IACZ;EAAA;EAGFC,cAAc,CAACC,GAAe,EAAY;IACxC,MAAM;MAAEN,KAAK;MAAEO,OAAO;MAAEC;IAAI,CAAC,GAAGF,GAAG;IAEnC,IAAIN,KAAK,KAAK,SAAS,EAAE;MACvB,IACEQ,GAAG,KAAK,kBAAkB,IAC1BD,OAAO,CAACE,UAAU,CAAC,mDAAmD,CAAC,EACvE;QACA;QACA,OAAO,MAAM;MACf;IACF;IACA,OAAOT,KAAK;EACd;EAEAU,KAAK,CAACJ,GAAe,EAAE;IACrB,IAAI,CAAC,IAAI,CAACT,WAAW,IAAI,CAAC,IAAI,CAACA,WAAW,CAACS,GAAG,CAAC,EAAE;MAC/C,MAAM;QAAEC;MAAQ,CAAC,GAAGD,GAAG;MACvB,MAAMN,KAAK,GAAG,IAAI,CAACK,cAAc,CAACC,GAAG,CAAC;MACtC,IAAIN,KAAK,KAAK,OAAO,EAAE;QACrBW,OAAO,CAACC,KAAK,CAAC,cAAc,EAAEL,OAAO,EAAED,GAAG,CAAC;MAC7C,CAAC,MAAM,IAAIN,KAAK,KAAK,SAAS,EAAE;QAC9BW,OAAO,CAACE,IAAI,CAAC,gBAAgB,EAAEN,OAAO,EAAED,GAAG,CAAC;MAC9C,CAAC,MAAM;QACLK,OAAO,CAACL,GAAG,CAAE,WAAUN,KAAM,GAAE,EAAEO,OAAO,EAAED,GAAG,CAAC;MAChD;IACF;EACF;AACF;AAAC,gBA7FKb,MAAM,cACuB,IAAI;AA8FvCA,MAAM,CAACC,cAAc,EAAE,CAACO,KAAK,EAAE;AAAC,eAEjBR,MAAM;AAAA"}

package/lib/module/web/utils/Logger.js.map

@@ -1 +1 @@
-{"version":3,"names":["Logger","sharedInstance","instance","constructor","logCallback","setLogCallback","setLogLevel","level","start","stop","subscribe","unsubscribe","effectiveLevel","log","message","tag","startsWith","onLog","console","error","warn"],"sourceRoot":"../../javascript","sources":["Logger.ts"],"mappings":";AAAA;;AASA,MAAMA,MAAM,CAAC;EAOX,OAAOC,cAAc,GAAG;IACtB,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1B,IAAI,CAACA,QAAQ,GAAG,IAAIF,MAAM,EAAE;IAC9B;IACA,OAAO,IAAI,CAACE,QAAQ;EACtB;EAEAC,WAAW,GAAG;IAAA,+BAXI,MAAM;IAAA;IAAA,sCAET,CAAC;IAUd,IAAI,CAACC,WAAW,GAAG,IAAI;EACzB;;EAEA;AACF;AACA;AACA;AACA;EACE,OAAOC,cAAc,CAACD,WAAwB,EAAE;IAC9C,IAAI,CAACH,cAAc,EAAE,CAACI,cAAc,CAACD,WAAW,CAAC;EACnD;;EAEA;AACF;AACA;AACA;AACA;EACEC,cAAc,CAACD,WAAwB,EAAE;IACvC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE;AACF;AACA;AACA;EACE,OAAOE,WAAW,CAACC,KAAe,EAAE;IAClC,IAAI,CAACN,cAAc,EAAE,CAACM,KAAK,GAAGA,KAAK;EACrC;EAEAC,KAAK,GAAG,CAAC;EAETC,IAAI,GAAG,CAAC;EAERC,SAAS,GAAG;IACV;EACF;EAEAC,WAAW,GAAG;IACZ;EACF;EAEAC,cAAc,CAACC,GAAe,EAAY;IACxC,MAAM;MAAEN,KAAK;MAAEO,OAAO;MAAEC;IAAI,CAAC,GAAGF,GAAG;IAEnC,IAAIN,KAAK,KAAK,SAAS,EAAE;MACvB,IACEQ,GAAG,KAAK,kBAAkB,IAC1BD,OAAO,CAACE,UAAU,CAAC,mDAAmD,CAAC,EACvE;QACA;QACA,OAAO,MAAM;MACf;IACF;IACA,OAAOT,KAAK;EACd;EAEAU,KAAK,CAACJ,GAAe,EAAE;IACrB,IAAI,CAAC,IAAI,CAACT,WAAW,IAAI,CAAC,IAAI,CAACA,WAAW,CAACS,GAAG,CAAC,EAAE;MAC/C,MAAM;QAAEC;MAAQ,CAAC,GAAGD,GAAG;MACvB,MAAMN,KAAK,GAAG,IAAI,CAACK,cAAc,CAACC,GAAG,CAAC;MACtC,IAAIN,KAAK,KAAK,OAAO,EAAE;QACrBW,OAAO,CAACC,KAAK,CAAC,cAAc,EAAEL,OAAO,EAAED,GAAG,CAAC;MAC7C,CAAC,MAAM,IAAIN,KAAK,KAAK,SAAS,EAAE;QAC9BW,OAAO,CAACE,IAAI,CAAC,gBAAgB,EAAEN,OAAO,EAAED,GAAG,CAAC;MAC9C,CAAC,MAAM;QACLK,OAAO,CAACL,GAAG,CAAE,WAAUN,KAAM,GAAE,EAAEO,OAAO,EAAED,GAAG,CAAC;MAChD;IACF;EACF;AACF;AAAC,gBA7FKb,MAAM,cACuB,IAAI;AA8FvCA,MAAM,CAACC,cAAc,EAAE,CAACO,KAAK,EAAE;AAE/B,eAAeR,MAAM"}
+{"version":3,"names":["Logger","sharedInstance","instance","constructor","logCallback","setLogCallback","setLogLevel","level","start","stop","subscribe","unsubscribe","effectiveLevel","log","message","tag","startsWith","onLog","console","error","warn"],"sourceRoot":"../../javascript","sources":["Logger.ts"],"mappings":";AAAA;;AASA,MAAMA,MAAM,CAAC;EAOX,OAAOC,cAAc,GAAG;IACtB,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1B,IAAI,CAACA,QAAQ,GAAG,IAAIF,MAAM,EAAE;IAC9B;IACA,OAAO,IAAI,CAACE,QAAQ;EACtB;EAEAC,WAAW,GAAG;IAAA,+BAXI,MAAM;IAAA;IAAA,sCAET,CAAC;IAUd,IAAI,CAACC,WAAW,GAAG,IAAI;EACzB;;EAEA;AACF;AACA;AACA;AACA;EACE,OAAOC,cAAc,CAACD,WAAwB,EAAE;IAC9C,IAAI,CAACH,cAAc,EAAE,CAACI,cAAc,CAACD,WAAW,CAAC;EACnD;;EAEA;AACF;AACA;AACA;AACA;EACEC,cAAc,CAACD,WAAwB,EAAE;IACvC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;;EAEE;AACF;AACA;AACA;EACE,OAAOE,WAAW,CAACC,KAAe,EAAE;IAClC,IAAI,CAACN,cAAc,EAAE,CAACM,KAAK,GAAGA,KAAK;EACrC;EAEAC,KAAK,GAAG,CAAC;EAETC,IAAI,GAAG,CAAC;EAERC,SAAS,GAAG;IACV;EAAA;EAGFC,WAAW,GAAG;IACZ;EAAA;EAGFC,cAAc,CAACC,GAAe,EAAY;IACxC,MAAM;MAAEN,KAAK;MAAEO,OAAO;MAAEC;IAAI,CAAC,GAAGF,GAAG;IAEnC,IAAIN,KAAK,KAAK,SAAS,EAAE;MACvB,IACEQ,GAAG,KAAK,kBAAkB,IAC1BD,OAAO,CAACE,UAAU,CAAC,mDAAmD,CAAC,EACvE;QACA;QACA,OAAO,MAAM;MACf;IACF;IACA,OAAOT,KAAK;EACd;EAEAU,KAAK,CAACJ,GAAe,EAAE;IACrB,IAAI,CAAC,IAAI,CAACT,WAAW,IAAI,CAAC,IAAI,CAACA,WAAW,CAACS,GAAG,CAAC,EAAE;MAC/C,MAAM;QAAEC;MAAQ,CAAC,GAAGD,GAAG;MACvB,MAAMN,KAAK,GAAG,IAAI,CAACK,cAAc,CAACC,GAAG,CAAC;MACtC,IAAIN,KAAK,KAAK,OAAO,EAAE;QACrBW,OAAO,CAACC,KAAK,CAAC,cAAc,EAAEL,OAAO,EAAED,GAAG,CAAC;MAC7C,CAAC,MAAM,IAAIN,KAAK,KAAK,SAAS,EAAE;QAC9BW,OAAO,CAACE,IAAI,CAAC,gBAAgB,EAAEN,OAAO,EAAED,GAAG,CAAC;MAC9C,CAAC,MAAM;QACLK,OAAO,CAACL,GAAG,CAAE,WAAUN,KAAM,GAAE,EAAEO,OAAO,EAAED,GAAG,CAAC;MAChD;IACF;EACF;AACF;AAAC,gBA7FKb,MAAM,cACuB,IAAI;AA8FvCA,MAAM,CAACC,cAAc,EAAE,CAACO,KAAK,EAAE;AAE/B,eAAeR,MAAM"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.54",
+  "version": "10.0.0-beta.56",
   "publishConfig": {
     "access": "public"
   },
@@ -97,7 +97,7 @@
     "react-native": "0.67.0",
     "react-native-builder-bob": "^0.20.0",
     "react-test-renderer": "17.0.2",
-    "typescript": "4.8.3"
+    "typescript": "4.8.4"
   },
   "jest": {
     "preset": "react-native",

package/plugin/build/withMapbox.js

@@ -212,32 +212,40 @@ const addMapboxMavenRepo = (projectBuildGradle) => {
     if (projectBuildGradle.includes('api.mapbox.com/downloads/v2/releases/maven'))
         return projectBuildGradle;
     /*
-    return projectBuildGradle.replace(
-      /repositories \s?{/,
-      `repositories {
-         maven {
-          url 'https://api.mapbox.com/downloads/v2/releases/maven'
-          authentication { basic(BasicAuthentication) }
-          credentials {
-            username = 'mapbox'
-            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+    Should look like this:
+      allprojects {
+        // ...
+        repositories {
+          maven {
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication { basic(BasicAuthentication) }
+            credentials {
+              username = 'mapbox'
+              password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+            }
           }
-         }
-    `,
-    );*/
+        // ...
+    */
+    /*
+      Since mergeContents checks the anchor for each line, we can't do a "correct"
+      RegExp for allprojects...repositories and have to insert a second repositories
+      for now
+    */
     return (0, generateCode_1.mergeContents)({
         tag: `@rnmapbox/maps-v2-maven`,
         src: projectBuildGradle,
-        newSrc: `maven {
-      url 'https://api.mapbox.com/downloads/v2/releases/maven'
-      authentication { basic(BasicAuthentication) }
-      credentials {
-        username = 'mapbox'
-        password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-      }
-    }`,
+        newSrc: `repositories {
+    maven {
+  url 'https://api.mapbox.com/downloads/v2/releases/maven'
+  authentication { basic(BasicAuthentication) }
+  credentials {
+    username = 'mapbox'
+    password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+  }
+}
+}`,
         anchor: new RegExp(`^\\s*allprojects\\s*{`),
-        offset: 2,
+        offset: 1,
         comment: '//',
     }).contents;
 };

package/plugin/src/withMapbox.ts

@@ -273,33 +273,42 @@ const addMapboxMavenRepo = (projectBuildGradle: string): string => {
     return projectBuildGradle;
 
   /*
-  return projectBuildGradle.replace(
-    /repositories \s?{/,
-    `repositories {
-       maven {
-        url 'https://api.mapbox.com/downloads/v2/releases/maven'
-        authentication { basic(BasicAuthentication) }
-        credentials { 
-          username = 'mapbox'
-          password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+  Should look like this:
+    allprojects {
+      // ...
+      repositories {
+        maven {
+          url 'https://api.mapbox.com/downloads/v2/releases/maven'
+          authentication { basic(BasicAuthentication) }
+          credentials { 
+            username = 'mapbox'
+            password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+          }
         }
-       }
-  `,
-  );*/
+      // ...
+  */
+
+  /*
+    Since mergeContents checks the anchor for each line, we can't do a "correct"
+    RegExp for allprojects...repositories and have to insert a second repositories
+    for now
+  */
 
   return mergeContents({
     tag: `@rnmapbox/maps-v2-maven`,
     src: projectBuildGradle,
-    newSrc: `maven {
-      url 'https://api.mapbox.com/downloads/v2/releases/maven'
-      authentication { basic(BasicAuthentication) }
-      credentials {
-        username = 'mapbox'
-        password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-      }
-    }`,
-    anchor: new RegExp(`^\\s*allprojects\\s*{`), // TODO repositories { is needed as well
-    offset: 2,
+    newSrc: `repositories {
+    maven {
+  url 'https://api.mapbox.com/downloads/v2/releases/maven'
+  authentication { basic(BasicAuthentication) }
+  credentials {
+    username = 'mapbox'
+    password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
+  }
+}
+}`,
+    anchor: new RegExp(`^\\s*allprojects\\s*{`),
+    offset: 1,
     comment: '//',
   }).contents;
 };