@rnmapbox/maps 10.0.0-beta.75 → 10.0.0-beta.77

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTSource.kt

@@ -23,6 +23,9 @@ import java.lang.ClassCastException
 import java.util.ArrayList
 import java.util.HashMap
 
+data class FeatureInfo(val feature: AbstractMapFeature?, var added: Boolean) {
+}
+
 abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
     @JvmField
     protected var mMap: MapboxMap? = null
@@ -31,19 +34,40 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
     protected var mSource: T? = null
     protected var mHasPressListener = false
     protected var mTouchHitbox: Map<String, Double>? = null
-    protected var mLayers: MutableList<AbstractSourceConsumer>
-    private var mQueuedLayers: MutableList<AbstractSourceConsumer>?
+    private var mSubFeatures = mutableListOf<FeatureInfo>()
+
     val layerIDs: List<String>
         get() {
-            val layerIDs: MutableList<String> = ArrayList()
-            for (i in mLayers.indices) {
-                val layer = mLayers[i]
-                val id = layer.iD
-                if (id != null) {
-                    layerIDs.add(id)
+           return mSubFeatures.mapIndexed { index, featureInfo ->
+                if (featureInfo.added && featureInfo.feature is AbstractSourceConsumer)  {
+                    featureInfo.feature.iD
+                } else {
+                    null
+                }
+            }.filterNotNull()
+        }
+
+    abstract fun hasNoDataSoRefersToExisting(): Boolean;
+
+    public var mExisting: Boolean? = null
+
+    val existing: Boolean
+        get() {
+            var result: Boolean = false
+            mExisting?.also {
+                result = it
+            } ?: run {
+                if (hasNoDataSoRefersToExisting()) {
+                    Logger.w(
+                        LOG_TAG,
+                        "RCTSource: soure with id: $id seems to refer to existing value but existing flag is not set. This is deprecated."
+                    )
+                    result = true
+                } else {
+                    result = false
                 }
             }
-            return layerIDs
+            return result
         }
 
     private fun getSourceAs(style: Style, id: String?): T? {
@@ -55,18 +79,6 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
         }
     }
 
-    protected fun addLayerToMap(layer: AbstractSourceConsumer?, childPosition: Int) {
-        mMapView?.let {
-            val mapView = it
-            layer?.let {
-                it.addToMap(mapView)
-                if (!mLayers.contains(it)) {
-                    mLayers.add(childPosition, it)
-                }
-            }
-        }
-    }
-
     open fun hasPressListener(): Boolean {
         return mHasPressListener
     }
@@ -94,51 +106,56 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
                         .build()
             } else mTouchHitbox
         }
-    val layerCount: Int
-        get() {
-            var totalCount = 0
-            if (mQueuedLayers != null) {
-                totalCount = mQueuedLayers!!.size
+
+    fun addToMap(existings: Boolean, style: Style, mapView: RCTMGLMapView) {
+        mSource = null
+        if (existings) {
+            val existingSource = getSourceAs(style, iD)
+            if (existingSource != null) {
+                mSource = existingSource
+            } else {
+                Logger.w(LOG_TAG, "Source $iD was makred as existing but was not found in style")
             }
-            totalCount += mLayers.size
-            return totalCount
         }
+        if (mSource == null) {
+            mSource = makeSource()
+            style.addSource(mSource as StyleContract.StyleSourceExtension)
+        }
+        mSubFeatures?.forEach {
+            it.feature?.let {
+                it.addToMap(mapView)
+            }
+            it.added = true
+        }
+    }
 
     override fun addToMap(mapView: RCTMGLMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
-        mMap?.getStyle(object : Style.OnStyleLoaded {
-            override fun onStyleLoaded(style: Style) {
-                val existingSource = getSourceAs(style, iD)
-                if (existingSource != null) {
-                    mSource = existingSource
-                } else {
-                    mSource = makeSource()
-                    style.addSource(mSource as StyleContract.StyleSourceExtension)
-                }
-                if (mQueuedLayers != null && mQueuedLayers!!.size > 0) { // first load
-                    for (i in mQueuedLayers!!.indices) {
-                        addLayerToMap(mQueuedLayers!![i], i)
-                    }
-                    mQueuedLayers = null
-                } else if (mLayers.size > 0) { // handles the case of switching style url, but keeping layers on map
-                    for (i in mLayers.indices) {
-                        addLayerToMap(mLayers[i], i)
-                    }
+        val map = mMap
+        if (map == null) {
+            Logger.e("RCTSource", "map is exepted to be valid but was null, $iD")
+            return
+        }
+        val style = map.getStyle()
+        if (existing || style == null) {
+            map.getStyle(object : Style.OnStyleLoaded {
+                override fun onStyleLoaded(style: Style) {
+                    addToMap(existing, style, mapView)
                 }
-            }
-        })
+            })
+        } else {
+            addToMap(existing, style, mapView)
+        }
+
     }
 
     override fun removeFromMap(mapView: RCTMGLMapView) {
-        if (mLayers.size > 0) {
-            for (i in mLayers.indices) {
-                val layer = mLayers[i]
-                layer.removeFromMap(mapView)
+        mSubFeatures.forEach { it
+            it.feature?.let {
+                it.removeFromMap(mapView)
             }
-        }
-        if (mQueuedLayers != null) {
-            mQueuedLayers!!.clear()
+            it.added = false
         }
         if (mMap != null && mSource != null && mMap!!.getStyle() != null) {
             try {
@@ -151,47 +168,48 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
     }
 
     fun addLayer(childView: View?, childPosition: Int) {
-        if (childView !is AbstractSourceConsumer) {
-            return
+        var feature: AbstractMapFeature? = null
+        if (childView !is AbstractMapFeature) {
+            Logger.w(LOG_TAG, "Attempted to insert view: $childView to shape source: $iD, since it's not a MapFeature it will not be added")
+        } else {
+            feature = childView
         }
-        val layer = childView
-        if (mMap == null) {
-            mQueuedLayers?.add(childPosition, layer)
+
+        val mapView = mMapView
+
+        val added = if (mapView != null && feature != null) {
+            feature.addToMap(mapView)
+            true
         } else {
-            addLayerToMap(layer, childPosition)
+            false
         }
+        mSubFeatures.add(childPosition, FeatureInfo(feature, added))
     }
 
     fun removeLayer(childPosition: Int) {
-        val layer: AbstractSourceConsumer
-        layer = if (mQueuedLayers != null && mQueuedLayers!!.size > 0) {
-            mQueuedLayers!![childPosition]
-        } else {
-            mLayers[childPosition]
+        var featureInfo = mSubFeatures[childPosition]
+        if (featureInfo.added) {
+            val mapView = mMapView
+            if (mapView != null) {
+                featureInfo.feature?.let { it.removeFromMap(mapView) }
+            }
+            featureInfo.added = false
         }
-        removeLayerFromMap(layer, childPosition)
+        mSubFeatures.removeAt(childPosition)
     }
 
-    fun getLayerAt(childPosition: Int): AbstractSourceConsumer {
-        return if (mQueuedLayers != null && mQueuedLayers!!.size > 0) {
-            mQueuedLayers!![childPosition]
-        } else mLayers[childPosition]
+    val childViews: List<AbstractMapFeature>
+        get() = mSubFeatures.map { it.feature }.filterNotNull()
+
+    override fun getChildAt(childPosition: Int): View {
+        return childViews[childPosition]
     }
 
-    protected fun removeLayerFromMap(layer: AbstractSourceConsumer?, childPosition: Int) {
-        mMapView?.let {
-            val mapView = it
-            layer?.let {
-                it.removeFromMap(mapView)
-            }
-        }
-        if (mQueuedLayers != null && mQueuedLayers!!.size > 0) {
-            mQueuedLayers?.removeAt(childPosition)
-        } else {
-            mLayers.removeAt(childPosition)
-        }
+    override fun getChildCount(): Int {
+        return childViews.size;
     }
 
+
     abstract fun makeSource(): T
     class OnPressEvent(var features: List<Feature>, var latLng: LatLng, var screenPoint: PointF)
 
@@ -209,7 +227,5 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
     }
 
     init {
-        mLayers = ArrayList()
-        mQueuedLayers = ArrayList()
     }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/events/PointAnnotationDragEvent.java

@@ -43,9 +43,11 @@ public class PointAnnotationDragEvent extends MapClickEvent {
     @Override
     public WritableMap getPayload() {
         WritableMap properties = new WritableNativeMap();
-        properties.putString("id", mView.getID());
         properties.putDouble("screenPointX", mScreenPoint.x);
         properties.putDouble("screenPointY", mScreenPoint.y);
-        return GeoJSONUtils.toPointFeature(mTouchedLatLng, properties);
+        WritableMap feature = GeoJSONUtils.toPointFeature(mTouchedLatLng, properties);
+        feature.putString("id", mView.getID());
+        
+        return feature;
     }
 }

package/ios/RCTMGL-v10/RCMTGLImage.swift

@@ -9,6 +9,7 @@ class RCTMGLImage : UIView {
   var sdf: Bool? = nil
   var stretchX: [[NSNumber]] = []
   var stretchY: [[NSNumber]] = []
+  var content: [NSNumber]? = nil
 
   weak var images: RCTMGLImageSetter? = nil {
     didSet {
@@ -42,7 +43,7 @@ class RCTMGLImage : UIView {
   
   func changeImage(_ image: UIImage, name: String) {
     if let images = images {
-      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, log: "RCTMGLImage.addImage")
+      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, content:content, log: "RCTMGLImage.addImage")
     }
   }
   

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -2,7 +2,7 @@ import Foundation
 import MapboxMaps
 import Turf
 
-protocol RCTMGLMapComponent : AnyObject {
+protocol RCTMGLMapComponent : class {
   func addToMap(_ map: RCTMGLMapView, style: Style)
   func removeFromMap(_ map: RCTMGLMapView)
   
@@ -104,7 +104,7 @@ open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
   }
 }
 
-class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
+class RCTMGLCamera : RCTMGLMapComponentBase {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
   
@@ -219,7 +219,6 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
   
   func _disableUsetTracking(_ map: MapView) {
     map.viewport.idle()
-    map.location.removeLocationConsumer(consumer: self)
   }
   
   func _toCoordinateBounds(_ bounds: FeatureCollection) throws -> CoordinateBounds  {
@@ -274,10 +273,17 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       }
 
       if let locationModule = RCTMGLLocationModule.shared {
-        map.location.overrideLocationProvider(with: locationModule.locationProvider)
+        var isSameProvider = false
+        if let currentProvider = map.location.locationProvider as? AnyObject, let newProvider = locationModule.locationProvider as? AnyObject {
+          if currentProvider === newProvider {
+            isSameProvider = true
+          }
+        }
+        if !isSameProvider {
+          map.location.overrideLocationProvider(with: locationModule.locationProvider)
+        }
       }
       map.location.locationProvider.requestWhenInUseAuthorization()
-      map.location.addLocationConsumer(newConsumer: self)
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
       switch userTrackingMode {
@@ -506,32 +512,6 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     map.viewport.removeStatusObserver(self)
     super.removeFromMap(map)
   }
-
-  // MARK: - LocationConsumer
-  
-  func locationUpdate(newLocation: Location) {
-    // viewport manages following user location
-    if false && followUserLocation {
-      withMapView { map in
-        var animationType = CameraMode.none
-        if let m = self.animationMode as? String, let m = CameraMode(rawValue: m) {
-          animationType = m
-        }
-        let _camera = CameraOptions(center: newLocation.coordinate)
-        let _duration = self.animationDuration as? Double ?? 0.5
-        switch (animationType) {
-          case .flight:
-            map.camera.fly(to: _camera, duration: _duration)
-          case .ease:
-            map.camera.ease(to: _camera, duration: _duration, curve: .easeInOut, completion: nil)
-          case .linear:
-            map.camera.ease(to: _camera, duration: _duration, curve: .linear, completion: nil)
-          default:
-            map.mapboxMap.setCamera(to: CameraOptions(center: newLocation.coordinate))
-        }
-      }
-    }
-  }
 }
 
 // MARK: - ViewportStatusObserver

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 protocol RCTMGLImageSetter : AnyObject {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], log: String) -> Bool
+  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
 }
 
 class RCTMGLImages : UIView, RCTMGLMapComponent {
@@ -26,7 +26,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
   };
 
-  typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)]);
+  typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)], content: (left:Float,top:Float,right:Float,bottom:Float)? );
   var nativeImageInfos: [NativeImageInfo] = []
   
   @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
@@ -80,14 +80,15 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     
     for imageName in remoteImages.keys {
       if style.styleManager.getStyleImage(forImageId: imageName) == nil {
-        try! style.addImage(placeholderImage, id: imageName, stretchX: [], stretchY: [])
-        missingImages[imageName] = remoteImages[imageName]
+        logged("RCTMGLImages.addImagePlaceholder") {
+          try? style.addImage(placeholderImage, id: imageName, stretchX: [], stretchY: [])
+          missingImages[imageName] = remoteImages[imageName]
+        }
       }
     }
     
     if missingImages.count > 0 {
       RCTMGLUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, callback: { })
-      
     }
   }
   
@@ -118,19 +119,51 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
   }
   
-  func convert(stretch: [[NSNumber]]) -> [(from: Float, to: Float)] {
+  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [(from: Float, to: Float)] {
     return stretch.map{ pair in
-      return (from: pair[0].floatValue, to: pair[1].floatValue)
+      return (from: pair[0].floatValue * scale, to: pair[1].floatValue * scale)
     }
   }
   
-  func convert(stretch: [(from: Float, to: Float)]) -> [ImageStretches] {
+  static func convert(stretch: [(from: Float, to: Float)]) -> [ImageStretches] {
     return stretch.map { v in ImageStretches(first: v.from, second: v.to) }
   }
   
+  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [ImageStretches] {
+    return convert(stretch: convert(stretch: stretch, scale: scale))
+  }
+
+  static func convert(content: (left:Float, top:Float, right:Float, bottom:Float)?) -> ImageContent? {
+    guard let content = content else {
+      return nil
+    }
+    
+    return ImageContent(left:content.left, top:content.top, right:content.right, bottom:content.bottom)
+  }
+
+  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> (left:Float,top:Float,right:Float,bottom:Float)? {
+    guard let content = content else {
+      return nil
+    }
+    guard content.count == 4 else {
+      Logger.log(level: .error, message: "Image content should have 4 elements got \(content)")
+      return nil
+    }
+    return (
+      left: content[0].floatValue*scale,
+      top: content[1].floatValue*scale,
+      right: content[2].floatValue*scale,
+      bottom: content[3].floatValue*scale
+    )
+  }
+  
+  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> ImageContent? {
+    return convert(content: convert(content: content, scale: scale))
+  }
+  
   func decodeImage(_ imageNameOrInfo: Any) -> NativeImageInfo? {
     if let imageName = imageNameOrInfo as? String {
-      return (name: imageName, sdf: false, stretchX:[],stretchY:[])
+      return (name: imageName, sdf: false, stretchX:[],stretchY:[],content:nil)
     } else if let imageInfo = imageNameOrInfo as? [String:Any] {
       guard let name = imageInfo["name"] as? String else {
         Logger.log(level: .warn, message: "NativeImage: \(imageInfo) has no name key")
@@ -144,14 +177,19 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
       }
       
       if let stretchXV = imageInfo["stretchX"] as? [[NSNumber]] {
-        stretchX = convert(stretch: stretchXV)
+        stretchX = RCTMGLImages.convert(stretch: stretchXV)
       }
       
       if let stretchYV = imageInfo["stretchY"] as? [[NSNumber]] {
-        stretchY = convert(stretch: stretchYV)
+        stretchY = RCTMGLImages.convert(stretch: stretchYV)
+      }
+      
+      var content : (left:Float, top:Float, right:Float, bottom:Float)? = nil
+      if let contentV = imageInfo["content"] as? [NSNumber] {
+        content = RCTMGLImages.convert(content: contentV)
       }
       
-      return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY)
+      return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY, content: content)
     } else {
       Logger.log(level: .warn, message: "RCTMGLImage.nativeImage, unexpected image: \(imageNameOrInfo)")
       return nil
@@ -165,8 +203,9 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
         if let image = UIImage(named: imageName) {
           logged("RCTMGLImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
-                               stretchX: convert(stretch: imageInfo.stretchX),
-                               stretchY: convert(stretch: imageInfo.stretchY)
+                               stretchX: RCTMGLImages.convert(stretch: imageInfo.stretchX),
+                               stretchY: RCTMGLImages.convert(stretch: imageInfo.stretchY),
+                               content: RCTMGLImages.convert(content: imageInfo.content)
             )
           }
         } else {
@@ -185,15 +224,16 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
 }
 
 extension RCTMGLImages : RCTMGLImageSetter {
-  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], log: String) -> Bool
+  func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
   {
      return logged("\(log).addImage") {
        if let style = style {
          try style.addImage(image,
                             id:name,
                             sdf: sdf ?? false,
-                            stretchX: convert(stretch: convert(stretch: stretchX)),
-                            stretchY: convert(stretch: convert(stretch: stretchY))
+                            stretchX: RCTMGLImages.convert(stretch: stretchX),
+                            stretchY: RCTMGLImages.convert(stretch: stretchY),
+                            content: RCTMGLImages.convert(content: content)
          )
          return true
        } else {

package/ios/RCTMGL-v10/RCTMGLInteractiveElement.swift

@@ -16,7 +16,19 @@ class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
     "height": NSNumber(value: hitboxDefault)
   ]
   
-  @objc var id: String! = nil
+  @objc var id: String! = nil {
+    willSet {
+      if id != nil && newValue != id {
+        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
+        if let map = map { removeFromMap(map) }
+      }
+    }
+    didSet {
+      if oldValue != nil && oldValue != id {
+        if let map = map { addToMap(map, style: map.mapboxMap.style) }
+      }
+    }
+  }
   
   @objc var onDragStart: RCTBubblingEventBlock? = nil
   

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -1,6 +1,6 @@
 @_spi(Experimental) import MapboxMaps
 
-protocol RCTMGLSourceConsumer {
+protocol RCTMGLSourceConsumer : class {
   func addToMap(_ map: RCTMGLMapView, style: Style)
   func removeFromMap(_ map: RCTMGLMapView, style: Style)
 }
@@ -9,6 +9,8 @@ protocol RCTMGLSourceConsumer {
 class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   weak var bridge : RCTBridge? = nil
 
+  var waitingForID: String? = nil
+
   @objc var sourceLayerID : String? = nil {
     didSet { self.optionsChanged() }
   }
@@ -31,7 +33,20 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     didSet { optionsChanged() }
   }
   
-  @objc var id: String! = nil
+  @objc var id: String! = nil {
+    willSet {
+      if id != nil && newValue != id {
+        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
+        if let style = style { self.removeFromMap(style) }
+      }
+    }
+    didSet {
+      if oldValue != nil && oldValue != id {
+        if let map = map, let style = style { self.addToMap(map, style: style) }
+      }
+    }
+  }
+
   @objc var sourceID: String? = nil {
     didSet { optionsChanged() }
   }
@@ -74,6 +89,13 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   }
   
   @objc weak var map: RCTMGLMapView? = nil
+
+  deinit {
+    if let waitingForID = waitingForID {
+      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
+      self.waitingForID = nil
+    }
+  }
   
   var styleLayer: Layer? = nil
   
@@ -86,9 +108,9 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   }
   
   func removeAndReaddLayer() {
-    if let style = style {
+    if let map = map, let style = style {
       self.removeFromMap(style)
-      self.insert(style, layerPosition: position())
+      self.addToMap(map, style:style)
     }
   }
    
@@ -248,7 +270,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   }
   
   private func optionsChanged() {
-    if let style = self.style {
+    if let style = self.style, self.styleLayer != nil {
       self.setOptions(&self.styleLayer!)
       self.loggedApply(style: style)
     }
@@ -259,10 +281,14 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   }
   
   private func removeFromMap(_ style: Style) {
+    if let waitingForID = waitingForID {
+      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
+    }
+
     do {
       try style.removeLayer(withId: self.id)
     } catch {
-      Logger.log(level: .error, message: "removing layer failed for layer \(optional: id): \(error.localizedDescription)")
+      Logger.log(level: .error, message: "RCTMGLLayer.removeFromMap: removing layer failed for layer \(optional: id): \(error.localizedDescription)")
     }
   }
   
@@ -279,8 +305,11 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
       idToWaitFor = nil
     }
     
+    
     if let idToWaitFor = idToWaitFor {
+      self.waitingForID = idToWaitFor
       map!.waitForLayerWithID(idToWaitFor) { _ in
+        self.waitingForID = nil
         self.attemptInsert(style, layerPosition: layerPosition, onInsert: onInsert)
       }
     } else {