@rnmapbox/maps 10.0.0-beta.57 → 10.0.0-beta.59

package/android/rctmgl/build.gradle

@@ -130,7 +130,7 @@ dependencies {
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
         }
         else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation 'com.mapbox.maps:android:10.9.0'
+            implementation 'com.mapbox.maps:android:10.9.1'
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.8.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
         }

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.graphics.PointF
 import android.graphics.RectF
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -113,6 +114,9 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     var tintColor: Int? = null
         private set
 
+    val mapView: MapView
+        get() = this
+
     val pointAnnotationManager: PointAnnotationManager?
         get() {
             if (mPointAnnotationManager == null) {
@@ -709,7 +713,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         val density: Float = getDisplayDensity()
         val screenCoordinate = ScreenCoordinate(pixel.x * density, pixel.y * density)
 
-        val coordinate = mMap!!.coordinateForPixel(pixel)
+        val coordinate = mMap!!.coordinateForPixel(screenCoordinate)
 
         sendResponse(callbackID, {
             it.putArray("coordinateFromView", coordinate.toReadableArray())
@@ -902,17 +906,17 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             }
         })
 
-        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, viewAnnotationManager)
+        RCTMGLMarkerViewManager.markerViewContainerSizeFixer(this, this.viewAnnotationManager)
     }
 
     // region Ornaments
 
     private fun toGravity(kind: String, viewPosition: Int): Int {
         return when (viewPosition) {
-            0 -> (Gravity.TOP or Gravity.LEFT)
-            1 -> (Gravity.TOP or Gravity.RIGHT)
-            2 -> (Gravity.BOTTOM or Gravity.LEFT)
-            3 -> (Gravity.BOTTOM or Gravity.RIGHT)
+            0 -> (Gravity.TOP or Gravity.START)
+            1 -> (Gravity.TOP or Gravity.END)
+            2 -> (Gravity.BOTTOM or Gravity.START)
+            3 -> (Gravity.BOTTOM or Gravity.END)
             else -> {
                 Logger.e(
                     "MapView",
@@ -991,6 +995,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             fadeWhenFacingNorth = mCompassFadeWhenNorth
             updateOrnament("compass", mCompassSettings, this.toGenericOrnamentSettings())
         }
+        workaroundToRelayoutChildOfMapView()
     }
 
     var mScaleBarSettings = OrnamentSettings(enabled = false)
@@ -1016,9 +1021,25 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     private fun updateScaleBar() {
-        scalebar.updateSettings {
+        mapView.scalebar.updateSettings {
             updateOrnament("scaleBar", mScaleBarSettings, this.toGenericOrnamentSettings())
         }
+        workaroundToRelayoutChildOfMapView()
+    }
+
+    fun workaroundToRelayoutChildOfMapView() {
+        if (mapView.width == 0 && mapView.height == 0) {
+            return
+        }
+
+        mapView.requestLayout();
+        mapView.forceLayout();
+
+        mapView.measure(
+            MeasureSpec.makeMeasureSpec(mapView.measuredWidth, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(mapView.measuredHeight, MeasureSpec.EXACTLY)
+        );
+        mapView.layout(mapView.left, mapView.top, mapView.right, mapView.bottom)
     }
 
     // endregion
@@ -1048,48 +1069,33 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     // region Attribution
-    private var mAttributionEnabled: Boolean? = null;
-    private var mAttributionGravity: Int? = null
-    private var mAttributionMargin: IntArray? = null
+    var mAttributionSettings = OrnamentSettings(enabled = AttributionSettings().enabled)
 
     fun setReactAttributionEnabled(attributionEnabled: Boolean?) {
-        mAttributionEnabled = attributionEnabled ?: AttributionSettings().enabled
+        mAttributionSettings.enabled = attributionEnabled
         updateAttribution()
     }
 
-    fun setReactAttributionPosition(position: ReadableMap?) {
-        if (position == null) {
-            // reset from explicit to default
-            if (mAttributionGravity != null) {
-                val defaultOptions = AttributionSettings()
-                mAttributionGravity = defaultOptions.position
-                mAttributionMargin = intArrayOf(defaultOptions.marginLeft.toInt(),defaultOptions.marginTop.toInt(),defaultOptions.marginRight.toInt(),defaultOptions.marginBottom.toInt())
-                updateAttribution()
-            }
-            return
-        }
+    fun setReactAttributionViewMargins(margins: ReadableMap) {
+        mAttributionSettings.margins = margins
+        updateAttribution()
+    }
 
-        val (attributionGravity, attributionMargin) = getGravityAndMargin(position)
-        mAttributionGravity = attributionGravity
-        mAttributionMargin = attributionMargin
+    fun setReactAttributionViewPosition(position: Int) {
+        mAttributionSettings.position = position
+        updateAttribution()
+    }
+
+    fun setReactAttributionPosition(position: ReadableMap?) {
+        mAttributionSettings.setPosAndMargins(position)
         updateAttribution()
     }
 
     private fun updateAttribution() {
         attribution.updateSettings {
-            if(mAttributionEnabled!= null){
-                enabled = mAttributionEnabled!!
-            }
-            if(mAttributionGravity != null){
-                position = mAttributionGravity!!
-            }
-            if(mAttributionMargin != null){
-                marginLeft = mAttributionMargin!![0].toFloat()
-                marginTop = mAttributionMargin!![1].toFloat()
-                marginRight = mAttributionMargin!![2].toFloat()
-                marginBottom = mAttributionMargin!![3].toFloat()
-            }
+            updateOrnament("attribution", mAttributionSettings, this.toGenericOrnamentSettings())
         }
+        workaroundToRelayoutChildOfMapView()
     }
     //endregion
 
@@ -1124,57 +1130,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         logo.updateSettings {
             updateOrnament("logo", mLogoSettings, this.toGenericOrnamentSettings())
         }
-
-        logo.updateSettings {
-            println(String.format("logo :: position - before 0x%08x", position))
-            //position = Gravity.BOTTOM or Gravity.RIGHT
-            println(String.format("eq bottom|right %b", position == (Gravity.BOTTOM or Gravity.RIGHT)))
-            if (position == Gravity.BOTTOM or Gravity.RIGHT) {
-                position = Gravity.BOTTOM or Gravity.RIGHT
-            }
-            println(String.format("logo :: position - after 0x%08x", position))
-        }
-    }
-/*
-    fun setReactLogoEnabled(logoEnabled: Boolean?) {
-        mLogoEnabled = logoEnabled ?: LogoSettings().enabled
-        updateLogo()
-    }
-
-    fun setReactLogoPosition(position: ReadableMap?) {
-        if (position == null) {
-            // reset from explicit to default
-            if (mLogoGravity != null) {
-                val defaultOptions = LogoSettings()
-                mLogoGravity = defaultOptions.position
-                mLogoMargin = intArrayOf(defaultOptions.marginLeft.toInt(),defaultOptions.marginTop.toInt(),defaultOptions.marginRight.toInt(),defaultOptions.marginBottom.toInt())
-                updateLogo()
-            }
-            return
-        }
-        val (logoGravity, logoMargin) = getGravityAndMargin(position)
-        mLogoGravity = logoGravity
-        mLogoMargin = logoMargin
-        updateLogo()
-    }
-
-    private fun updateLogo() {
-        logo.updateSettings {
-            if(mLogoEnabled != null){
-                enabled = mLogoEnabled!!
-            }
-            if(mLogoGravity != null){
-                position = mLogoGravity!!
-            }
-            if(mLogoMargin != null){
-                marginLeft = mLogoMargin!![0].toFloat()
-                marginTop = mLogoMargin!![1].toFloat()
-                marginRight = mLogoMargin!![2].toFloat()
-                marginBottom = mLogoMargin!![3].toFloat()
-            }
-        }
+        workaroundToRelayoutChildOfMapView()
     }
- */
     // endregion
 
     // region lifecycle
@@ -1208,7 +1165,11 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
                 }
 
                 override fun handleLifecycleEvent(event: Lifecycle.Event) {
-                    lifecycleRegistry.handleLifecycleEvent(event)
+                    try {
+                        lifecycleRegistry.handleLifecycleEvent(event)
+                    } catch (e: RuntimeException) {
+                        Log.e("RCTMGLMapView", "onAttachedToWindow error: $e")
+                    }
                 }
 
                 override fun getLifecycle(): Lifecycle {
@@ -1228,8 +1189,8 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
 fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
     if (posAndMargins == null) { return }
 
-    val bottom_mask = 1;
-    val right_mask = 2;
+    val bottom_mask = 2;
+    val right_mask = 1;
 
     var margins = WritableNativeMap()
     var position = 0;
@@ -1281,7 +1242,7 @@ fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSetti
 }
 
 fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private val settings = this@toGenericOrnamentSettings
+    private var settings = this@toGenericOrnamentSettings
     override fun setHMargins(left: Float?, right: Float?) {
         left?.let { settings.marginLeft = it }
         right?.let { settings.marginRight = it }
@@ -1295,11 +1256,33 @@ fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettin
         set(value) { settings.enabled = value }
     override var position: Int
         get() = settings.position
-        set(value) { settings.position = value }
+        set(value) {
+            settings.position = value
+        }
 }
 
 fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private val settings = this@toGenericOrnamentSettings
+    private var settings = this@toGenericOrnamentSettings
+    override fun setHMargins(left: Float?, right: Float?) {
+        left?.let { settings.marginLeft = it }
+        right?.let { settings.marginRight = it }
+    }
+    override fun setVMargins(top: Float?, bottom: Float?) {
+        top?.let { settings.marginTop = it }
+        bottom?.let { settings.marginBottom = it }
+    }
+    override var enabled: Boolean
+        get() = settings.enabled
+        set(value) { settings.enabled = value }
+    override var position: Int
+        get() = settings.position
+        set(value) {
+            settings.position = value
+        }
+}
+
+fun AttributionSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
+    private var settings = this@toGenericOrnamentSettings;
     override fun setHMargins(left: Float?, right: Float?) {
         left?.let { settings.marginLeft = it }
         right?.let { settings.marginRight = it }
@@ -1314,7 +1297,6 @@ fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings
     override var position: Int
         get() = settings.position
         set(value) {
-            println(String.format("logo :: position: 0x%08x", value))
             settings.position = value
         }
 }

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

@@ -132,6 +132,16 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext?) :
         mapView!!.setReactAttributionPosition(attributionPosition);
     }
 
+    @ReactProp(name = "attributionViewMargins")
+    fun setAttributionViewMargins(mapView: RCTMGLMapView?, scaleBarMargins: ReadableMap?) {
+        mapView!!.setReactAttributionViewMargins(scaleBarMargins!!);
+    }
+
+    @ReactProp(name = "attributionViewPosition")
+    fun setAttributionViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: Int) {
+        mapView!!.setReactAttributionViewPosition(scaleBarPosition!!)
+    }
+
     @ReactProp(name = "logoEnabled")
     fun setLogoEnabled(mapView: RCTMGLMapView?, logoEnabled: Boolean?) {
         mapView!!.setReactLogoEnabled(logoEnabled);

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/RCTMGLStyleFactory.java

@@ -24,6 +24,7 @@ import com.mapbox.maps.extension.style.types.StyleTransition;
 import com.mapbox.maps.extension.style.light.generated.Light;
 import com.mapbox.maps.extension.style.light.LightPosition;
 import com.mapbox.rctmgl.utils.DownloadMapImageTask;
+import com.mapbox.rctmgl.utils.Logger;
 
 import java.util.List;
 
@@ -82,7 +83,11 @@ public class RCTMGLStyleFactory {
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
                   public void onAllImagesLoaded() {
-                      RCTMGLStyleFactory.setFillPattern(layer, styleValue);
+                      try {
+                          RCTMGLStyleFactory.setFillPattern(layer, styleValue);
+                      } catch (RuntimeException exception) {
+                          Logger.INSTANCE.e("RCTMGLFill",String.format("Exception failed during setFillPattern: %s", exception.getMessage()));
+                      }
                   }
               });
               break;
@@ -176,7 +181,11 @@ public class RCTMGLStyleFactory {
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
                   public void onAllImagesLoaded() {
-                      RCTMGLStyleFactory.setLinePattern(layer, styleValue);
+                      try {
+                          RCTMGLStyleFactory.setLinePattern(layer, styleValue);
+                      } catch (RuntimeException exception) {
+                          Logger.INSTANCE.e("RCTMGLLine",String.format("Exception failed during setLinePattern: %s", exception.getMessage()));
+                      }
                   }
               });
               break;
@@ -243,7 +252,11 @@ public class RCTMGLStyleFactory {
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
                   public void onAllImagesLoaded() {
-                      RCTMGLStyleFactory.setIconImage(layer, styleValue);
+                      try {
+                          RCTMGLStyleFactory.setIconImage(layer, styleValue);
+                      } catch (RuntimeException exception) {
+                          Logger.INSTANCE.e("RCTMGLSymbol",String.format("Exception failed during setIconImage: %s", exception.getMessage()));
+                      }
                   }
               });
               break;
@@ -572,7 +585,11 @@ public class RCTMGLStyleFactory {
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
                   public void onAllImagesLoaded() {
-                      RCTMGLStyleFactory.setFillExtrusionPattern(layer, styleValue);
+                      try {
+                          RCTMGLStyleFactory.setFillExtrusionPattern(layer, styleValue);
+                      } catch (RuntimeException exception) {
+                          Logger.INSTANCE.e("RCTMGLFillExtrusion",String.format("Exception failed during setFillExtrusionPattern: %s", exception.getMessage()));
+                      }
                   }
               });
               break;
@@ -727,7 +744,11 @@ public class RCTMGLStyleFactory {
               style.addImage(styleValue, new DownloadMapImageTask.OnAllImagesLoaded() {
                   @Override
                   public void onAllImagesLoaded() {
-                      RCTMGLStyleFactory.setBackgroundPattern(layer, styleValue);
+                      try {
+                          RCTMGLStyleFactory.setBackgroundPattern(layer, styleValue);
+                      } catch (RuntimeException exception) {
+                          Logger.INSTANCE.e("RCTMGLBackground",String.format("Exception failed during setBackgroundPattern: %s", exception.getMessage()));
+                      }
                   }
               });
               break;

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTLayer.kt

@@ -21,8 +21,6 @@ import com.mapbox.rctmgl.utils.ExpressionParser
 import java.lang.ClassCastException
 import com.mapbox.rctmgl.utils.Logger
 
-
-// import com.mapbox.rctmgl.utils.ExpressionParser;
 abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractSourceConsumer(
     mContext
 ) {
@@ -253,15 +251,12 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
         super.removeFromMap(mapView)
     }
 
-    // v10TOOD: adding anything seems to make getStyle null
-    //        return mMap.getStyle();
     private val style: Style?
-        private get() =// v10TOOD: adding anything seems to make getStyle null
+        private get() =
             if (mMap == null) {
                 null
-            } else mMapView!!.savedStyle
+            } else mMapView?.savedStyle
 
-    //        return mMap.getStyle();
     abstract fun makeLayer(): T
     abstract fun addStyles()
     private fun hasInitialized(): Boolean {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/location/LocationManager.kt

@@ -17,9 +17,9 @@ import android.os.Looper
 import android.util.Log
 import com.mapbox.geojson.Point
 import com.mapbox.maps.plugin.locationcomponent.LocationProvider
-import java.lang.Exception
 import java.lang.ref.WeakReference
 import java.util.ArrayList
+import kotlin.Exception
 
 internal class LocationProviderForEngine(var mEngine: LocationEngine?) : LocationProvider, LocationEngineCallback<LocationEngineResult> {
     var mConsumers = ArrayList<LocationConsumer>()
@@ -51,8 +51,8 @@ internal class LocationProviderForEngine(var mEngine: LocationEngine?) : Locatio
     }
 
     // * LocationEngineCallback
-    override fun onSuccess(locationEngineResult: LocationEngineResult) {
-        val location = locationEngineResult.lastLocation
+    override fun onSuccess(locationEngineResult: LocationEngineResult?) {
+        val location = locationEngineResult?.lastLocation
         location?.let { notifyLocationUpdates(it) }
     }
 
@@ -154,7 +154,19 @@ class LocationManager private constructor(private val context: Context) : Locati
             callback.onFailure(Exception("LocationEngine not initialized"))
         }
         try {
-            engine?.getLastLocation(callback)
+            engine?.getLastLocation(object : LocationEngineCallback<LocationEngineResult> {
+                override fun onSuccess(result: LocationEngineResult?) {
+                    if (result == null) {
+                        callback.onFailure( NullPointerException("LocationEngineResult is null"))
+                    } else {
+                        callback.onSuccess(result)
+                    }
+                }
+
+                override fun onFailure(exception: Exception) {
+                    callback.onFailure(exception)
+                }
+            })
         } catch (exception: Exception) {
             Log.w(LOG_TAG, exception)
             callback.onFailure(exception)
@@ -172,8 +184,8 @@ class LocationManager private constructor(private val context: Context) : Locati
         // FMTODO handle this.
     }
 
-    override fun onSuccess(result: LocationEngineResult) {
-        onLocationChanged(result.lastLocation)
+    override fun onSuccess(result: LocationEngineResult?) {
+        onLocationChanged(result?.lastLocation)
         if (locationProvider != null) {
             locationProvider!!.onSuccess(result)
         }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/utils/extensions/CoordinateBounds.kt

@@ -10,14 +10,8 @@ fun CoordinateBounds.toReadableArray() : ReadableArray {
     val array = Arguments.createArray()
     val ne = northeast
     val sw = southwest
-    val latLngs = arrayOf(
-        LatLng(ne.latitude(), ne.longitude()),
-        LatLng(ne.latitude(), sw.longitude()),
-        LatLng(sw.latitude(), sw.longitude()),
-        LatLng(sw.latitude(), ne.longitude())
-    )
-    for (latLng in latLngs) {
-        array.pushArray(GeoJSONUtils.fromLatLng(latLng))
-    }
+
+    array.pushArray(GeoJSONUtils.fromLatLng(LatLng(ne.latitude(), ne.longitude())));
+    array.pushArray(GeoJSONUtils.fromLatLng(LatLng(sw.latitude(), sw.longitude())));
     return array
 }

package/ios/RCTMGL/RCTMGLLocation.m

@@ -24,7 +24,7 @@
     coords[@"speed"] = @(_location.speed);
     
     json[@"coords"] = coords;
-    json[@"timestamp"] = @([_location.timestamp timeIntervalSince1970]);
+    json[@"timestamp"] = @([_location.timestamp timeIntervalSince1970] * 1000);
     
     return json;
 }

package/ios/RCTMGL-v10/MGLModule.swift

@@ -20,7 +20,7 @@ class MGLModule : NSObject {
           "Light": StyleURI.light.rawValue,
           "Dark": StyleURI.dark.rawValue,
           "Satellite": StyleURI.satellite.rawValue,
-          "SatelliteStreets": StyleURI.satelliteStreets.rawValue,
+          "SatelliteStreet": StyleURI.satelliteStreets.rawValue,
         ],
       "OfflinePackDownloadState":
         [

package/ios/RCTMGL-v10/RCTMGLBackgroundLayer.swift

@@ -33,7 +33,9 @@ class RCTMGLBackgroundLayer: RCTMGLLayer {
         styler.backgroundLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLBackgroundLayer.addStyles") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() })
         self.styleLayer = styleLayer
       }

package/ios/RCTMGL-v10/RCTMGLCircleLayer.swift

@@ -34,7 +34,9 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLCircleLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() })
         self.styleLayer = styleLayer
       }

package/ios/RCTMGL-v10/RCTMGLFillExtrustionLayer.swift

@@ -33,7 +33,9 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLFillExtrusionLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() })
         self.styleLayer = styleLayer
       }

package/ios/RCTMGL-v10/RCTMGLFillLayer.swift

@@ -34,7 +34,9 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
         styler.fillLayer(
           layer: &styleLayer,
           reactStyle: reactStyle ?? [:],
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLFillLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() }
         )
         self.styleLayer = styleLayer

package/ios/RCTMGL-v10/RCTMGLHeatmapLayer.swift

@@ -34,7 +34,9 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
         styler.heatmapLayer(
           layer: &styleLayer,
           reactStyle: reactStyle!,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLHeatmapLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() }
         )
         self.styleLayer = styleLayer

package/ios/RCTMGL-v10/RCTMGLLineLayer.swift

@@ -37,7 +37,9 @@ class RCTMGLLineLayer: RCTMGLVectorLayer {
         styler.lineLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLLineLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: {
             return self.isAddedToMap()
           })

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -18,7 +18,7 @@ class RCTMGLLocation: NSObject {
         "course": location.course,
         "speed": location.speed,
       ],
-      "timestamp": location.timestamp.timeIntervalSince1970
+      "timestamp": location.timestamp.timeIntervalSince1970 * 1000
     ]
   }
 }

package/ios/RCTMGL-v10/RCTMGLRasterLayer.swift

@@ -28,7 +28,9 @@ class RCTMGLRasterLayer: RCTMGLLayer {
         styler.rasterLayer(
           layer: &styleLayer,
           reactStyle: reactStyle!,
-          applyUpdater:{ (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater:{ (updater) in logged("RCTMGLRasterLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: { return self.isAddedToMap() }
         )
         self.styleLayer = styleLayer

package/ios/RCTMGL-v10/RCTMGLSkyLayer.swift

@@ -32,7 +32,9 @@ class RCTMGLSkyLayer: RCTMGLLayer {
         styler.skyLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLSkyLayer.addStyles") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: {
             return self.isAddedToMap()
           }

package/ios/RCTMGL-v10/RCTMGLSymbolLayer.swift

@@ -35,7 +35,9 @@ class RCTMGLSymbolLayer: RCTMGLVectorLayer {
         styler.symbolLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
-          applyUpdater: { (updater) in try! style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }},
+          applyUpdater: { (updater) in logged("RCTMGLSymbolLayer.updateLayer") {
+            try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
+          }},
           isValid: {
             return self.isAddedToMap()
           }

package/javascript/components/Atmosphere.tsx

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { HostComponent, requireNativeComponent } from 'react-native';
+import { requireNativeComponent } from 'react-native';
 
 import type { AtmosphereLayerStyleProps } from '../utils/MapboxStyles';
 import { StyleValue, transformStyle } from '../utils/StyleValue';
@@ -22,7 +22,10 @@ export const Atmosphere = memo((props: Props) => {
   return <RCTMGLAtmosphere {...baseProps} />;
 });
 
-const RCTMGLAtmosphere: HostComponent<{
+type NativeProps = {
   reactStyle?: { [key: string]: StyleValue };
   style?: undefined;
-}> = requireNativeComponent(NATIVE_MODULE_NAME);
+};
+
+const RCTMGLAtmosphere =
+  requireNativeComponent<NativeProps>(NATIVE_MODULE_NAME);

package/javascript/components/Camera.tsx

@@ -14,7 +14,7 @@ import { makeLatLngBounds, makePoint } from '../utils/geoUtils';
 
 const NativeModule = NativeModules.MGLModule;
 
-export const enum UserTrackingMode {
+export enum UserTrackingMode {
   Follow = 'normal',
   FollowWithHeading = 'compass',
   FollowWithCourse = 'course',