@rnmapbox/maps 10.0.0-beta.58 → 10.0.0-beta.60

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

@@ -0,0 +1,75 @@
+package com.mapbox.rctmgl.events
+
+import android.location.Location
+import com.facebook.react.bridge.Arguments
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.mapbox.rctmgl.events.IEvent
+import com.mapbox.rctmgl.events.constants.EventKeys
+import com.mapbox.rctmgl.events.constants.EventTypes
+import com.mapbox.rctmgl.events.LocationEvent
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.WritableNativeMap
+import java.util.*
+
+class LocationEvent(private val location: Location, private val mapView: RCTMGLMapView?) : IEvent {
+    val uUID: UUID
+
+    init {
+        uUID = UUID.randomUUID()
+    }
+
+    constructor(location: Location) : this(location, null) {}
+
+    override fun getID(): Int {
+        return mapView?.id ?: -1
+    }
+
+    override fun getKey(): String {
+        return EventKeys.USER_LOCATION_UPDATE
+    }
+
+    override fun getType(): String {
+        return EventTypes.USER_LOCATION_UPDATED
+    }
+
+    override fun getTimestamp(): Long {
+        return System.currentTimeMillis()
+    }
+
+    override fun equals(event: IEvent): Boolean {
+        val other = event as LocationEvent
+        return uUID == other.uUID
+    }
+
+    fun equals(event: LocationEvent): Boolean {
+        return uUID == event.uUID
+    }
+
+    override fun getPayload(): WritableMap {
+        val positionProperties: WritableMap = WritableNativeMap()
+        val coords: WritableMap = WritableNativeMap()
+        coords.putDouble("longitude", location.longitude)
+        coords.putDouble("latitude", location.latitude)
+        coords.putDouble("altitude", location.altitude)
+        coords.putDouble("accuracy", location.accuracy.toDouble())
+        // A better solution will be to pull the heading from the compass engine, 
+        // unfortunately the api is not publicly available in the mapbox sdk
+        coords.putDouble("heading", location.bearing.toDouble())
+        coords.putDouble("course", location.bearing.toDouble())
+        coords.putDouble("speed", location.speed.toDouble())
+        positionProperties.putMap("coords", coords)
+        positionProperties.putDouble("timestamp", location.time.toDouble())
+        return positionProperties
+    }
+
+    override fun toJSON(): WritableMap {
+        val map = Arguments.createMap()
+        map.putString("type", type)
+        map.putMap("payload", payload)
+        return map
+    }
+
+    override fun canCoalesce(): Boolean {
+        return true
+    }
+}

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

@@ -10,16 +10,15 @@ import com.mapbox.android.core.location.LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.maps.plugin.locationcomponent.LocationConsumer
 import com.mapbox.android.core.location.LocationEngineRequest
-import com.mapbox.rctmgl.location.LocationProviderForEngine
 import com.mapbox.android.core.location.LocationEngineProvider
 import com.mapbox.android.core.permissions.PermissionsManager
 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 +50,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) }
     }
 
@@ -68,6 +67,11 @@ class LocationManager private constructor(private val context: Context) : Locati
     private var lastLocation: Location? = null
     private var locationEngineRequest: LocationEngineRequest? = null
     private var locationProvider: LocationProviderForEngine? = null
+    private var nStarts : Int = 0;
+    private var isPaused : Boolean = false;
+
+
+
     val provider: LocationProvider
         get() {
             if (locationProvider == null) {
@@ -80,6 +84,41 @@ class LocationManager private constructor(private val context: Context) : Locati
         fun onLocationChange(location: Location?)
     }
 
+
+    /// public interface
+
+    fun startCounted() {
+        nStarts += 1;
+        if (nStarts == 1) {
+            enable(false);
+        }
+    }
+
+    fun stopCounted() {
+        nStarts -= 1;
+        if (nStarts == 0) {
+            dispose();
+        }
+    }
+
+    fun pause() {
+        isPaused = true
+    }
+
+    fun resume() {
+        isPaused = false
+        if (nStarts > 0) {
+            enable(false)
+        }
+    }
+
+    fun destroy() {
+        dispose();
+        nStarts = -1000;
+    }
+
+    ////
+
     private fun buildEngineRequest() {
         engine = LocationEngineProvider.getBestLocationEngine(context.applicationContext)
         locationEngineRequest = LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
@@ -103,10 +142,14 @@ class LocationManager private constructor(private val context: Context) : Locati
 
     fun setMinDisplacement(minDisplacement: Float) {
         mMinDisplacement = minDisplacement
+
+        if (isActive) {
+            enable(true)
+        }
     }
 
     @SuppressLint("MissingPermission")
-    fun enable() {
+    private fun enable(refresh: Boolean) {
         if (!PermissionsManager.areLocationPermissionsGranted(context)) {
             return
         }
@@ -126,17 +169,16 @@ class LocationManager private constructor(private val context: Context) : Locati
         isActive = true
     }
 
-    fun disable() {
+    private fun disable() {
         engine?.removeLocationUpdates(this)
         isActive = false
     }
 
-    fun dispose() {
+    private fun dispose() {
         if (engine == null) {
             return
         }
         disable()
-        engine?.removeLocationUpdates(this)
     }
 
     fun isActive(): Boolean {
@@ -149,12 +191,24 @@ class LocationManager private constructor(private val context: Context) : Locati
         } else lastLocation
 
     @SuppressLint("MissingPermission")
-    fun getLastKnownLocation(callback: LocationEngineCallback<LocationEngineResult?>) {
+    fun getLastKnownLocation(callback: LocationEngineCallback<LocationEngineResult>) {
         if (engine == null) {
             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 +226,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/modules/RCTMGLLocationModule.kt

@@ -0,0 +1,147 @@
+package com.mapbox.rctmgl.modules
+
+import android.location.Location
+import com.facebook.react.bridge.*
+import com.mapbox.rctmgl.location.LocationManager
+import com.facebook.react.module.annotations.ReactModule
+import com.mapbox.rctmgl.location.LocationManager.OnUserLocationChange
+import com.mapbox.rctmgl.events.LocationEvent
+import com.mapbox.android.core.location.LocationEngineCallback
+import com.mapbox.android.core.location.LocationEngineResult
+import com.mapbox.rctmgl.events.EventEmitter
+import com.mapbox.rctmgl.location.LocationManager.Companion.getInstance
+import java.lang.Exception
+
+@ReactModule(name = RCTMGLLocationModule.REACT_CLASS)
+class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+    private var isEnabled = false
+    private var mMinDisplacement = 0f
+    private val locationManager: LocationManager? = getInstance(reactContext)
+    private var mLastLocation: Location? = null
+
+    private val lifecycleEventListener: LifecycleEventListener = object : LifecycleEventListener {
+        override fun onHostResume() {
+            if (isEnabled) {
+                locationManager?.resume()
+            }
+        }
+
+        override fun onHostPause() {
+            locationManager?.pause()
+        }
+
+        override fun onHostDestroy() {
+            locationManager?.destroy()
+        }
+    }
+
+    private val onUserLocationChangeCallback: OnUserLocationChange = object : OnUserLocationChange {
+        override fun onLocationChange(location: Location?) {
+            var changed = (mLastLocation != null) != (location != null)
+            val lastLocation = mLastLocation
+            if (lastLocation != null && location != null) {
+                if (
+                    lastLocation.latitude != location.latitude ||
+                    lastLocation.longitude != location.longitude ||
+                    lastLocation.altitude != location.altitude ||
+                    lastLocation.accuracy != location.accuracy ||
+                    lastLocation.bearing != location.bearing
+                ) {
+                    changed = true
+                }
+            }
+            mLastLocation = location
+            if (changed && (location != null)) {
+                val locationEvent = LocationEvent(location)
+                val emitter = EventEmitter.getModuleEmitter(reactApplicationContext)
+                emitter?.emit(LOCATION_UPDATE, locationEvent.payload)
+            }
+        }
+    }
+
+    init {
+        reactContext.addLifecycleEventListener(lifecycleEventListener)
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    @ReactMethod
+    fun start(minDisplacement: Float) {
+        isEnabled = true
+        mMinDisplacement = minDisplacement
+        locationManager?.startCounted()
+        startLocationManager()
+    }
+
+    @ReactMethod
+    fun setMinDisplacement(minDisplacement: Float) {
+        if (mMinDisplacement == minDisplacement) return
+        mMinDisplacement = minDisplacement
+        if (isEnabled) {
+
+            // set minimal displacement in the manager
+            locationManager!!.setMinDisplacement(mMinDisplacement)
+        }
+    }
+
+    @ReactMethod
+    fun stop() {
+        stopLocationManager()
+    }
+
+    @ReactMethod
+    fun getLastKnownLocation(promise: Promise) {
+        locationManager!!.getLastKnownLocation(
+            object : LocationEngineCallback<LocationEngineResult> {
+                override fun onSuccess(result: LocationEngineResult) {
+                    val location = result.lastLocation
+                    if (location != null) {
+                        val locationEvent = LocationEvent(location)
+                        promise.resolve(locationEvent.payload)
+                    } else {
+                        promise.resolve(null)
+                    }
+                }
+
+                override fun onFailure(exception: Exception) {
+                    promise.reject(exception)
+                }
+            }
+        )
+    }
+
+    @ReactMethod
+    fun addListener(eventName: String?) {
+        // Required for rn built in EventEmitter Calls.
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Int?) {
+        // Required for rn built in EventEmitter Calls.
+    }
+
+    private fun startLocationManager() {
+        mLastLocation = null;
+        locationManager!!.addLocationListener(onUserLocationChangeCallback)
+        locationManager.setMinDisplacement(mMinDisplacement)
+        locationManager.startCounted()
+    }
+
+    private fun stopLocationManager() {
+        if (!isEnabled) {
+            return
+        }
+        locationManager!!.removeLocationListener(onUserLocationChangeCallback)
+        locationManager.stopCounted()
+        isEnabled = false
+        mLastLocation = null
+    }
+
+    companion object {
+        const val REACT_CLASS = "RCTMGLLocationModule"
+        const val LOCATION_UPDATE = "MapboxUserLocationUpdate"
+    }
+}

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/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/RCTMGLLayer.swift

@@ -232,8 +232,6 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
       } catch {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
-    } else {
-      layer.filter = nil
     }
     
     if let minZoom = minZoomLevel {

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/RCTMGLLogging.swift

@@ -73,12 +73,20 @@ class Logger {
   }
 }
 
+func errorMessage(_ error: Error) -> String {
+  if case DecodingError.typeMismatch(let type, let context) = error {
+    return "\(error.localizedDescription) \(context.codingPath) \(context.debugDescription)"
+  } else {
+    return "\(error.localizedDescription)"
+  }
+}
+
 func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {
   do {
     return try fn()
   } catch {
-    Logger.log(level:level, message: "\(msg) \(info?() ?? "") \(error.localizedDescription)")
-    rejecter?(msg, "\(info?() ?? "") \(error.localizedDescription)", error)
+    Logger.log(level:level, message: "\(msg) \(info?() ?? "") \(errorMessage(error))")
+    rejecter?(msg, "\(info?() ?? "") \(errorMessage(error))", error)
     return nil
   }
 }

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/RCTMGLStyle.swift

@@ -61,9 +61,11 @@ func fillLayer(layer: inout FillLayer, reactStyle:Dictionary<String, Any>, apply
           if let image = image {
             DispatchQueue.main.sync {
               if (isValid()) {
-                try! self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
-                applyUpdater { (layer: inout FillLayer) in
-                  self.setFillPattern(&layer, styleValue:styleValue);
+                logged("Fill.FillPattern.addImage") {
+                  try self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
+                  applyUpdater { (layer: inout FillLayer) in
+                    self.setFillPattern(&layer, styleValue:styleValue);
+                  }
                 }
               }
             }
@@ -151,9 +153,11 @@ func lineLayer(layer: inout LineLayer, reactStyle:Dictionary<String, Any>, apply
           if let image = image {
             DispatchQueue.main.sync {
               if (isValid()) {
-                try! self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
-                applyUpdater { (layer: inout LineLayer) in
-                  self.setLinePattern(&layer, styleValue:styleValue);
+                logged("Line.LinePattern.addImage") {
+                  try self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
+                  applyUpdater { (layer: inout LineLayer) in
+                    self.setLinePattern(&layer, styleValue:styleValue);
+                  }
                 }
               }
             }
@@ -223,9 +227,11 @@ func symbolLayer(layer: inout SymbolLayer, reactStyle:Dictionary<String, Any>, a
           if let image = image {
             DispatchQueue.main.sync {
               if (isValid()) {
-                try! self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
-                applyUpdater { (layer: inout SymbolLayer) in
-                  self.setIconImage(&layer, styleValue:styleValue);
+                logged("Symbol.IconImage.addImage") {
+                  try self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
+                  applyUpdater { (layer: inout SymbolLayer) in
+                    self.setIconImage(&layer, styleValue:styleValue);
+                  }
                 }
               }
             }
@@ -493,9 +499,11 @@ func fillExtrusionLayer(layer: inout FillExtrusionLayer, reactStyle:Dictionary<S
           if let image = image {
             DispatchQueue.main.sync {
               if (isValid()) {
-                try! self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
-                applyUpdater { (layer: inout FillExtrusionLayer) in
-                  self.setFillExtrusionPattern(&layer, styleValue:styleValue);
+                logged("FillExtrusion.FillExtrusionPattern.addImage") {
+                  try self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
+                  applyUpdater { (layer: inout FillExtrusionLayer) in
+                    self.setFillExtrusionPattern(&layer, styleValue:styleValue);
+                  }
                 }
               }
             }
@@ -647,9 +655,11 @@ func backgroundLayer(layer: inout BackgroundLayer, reactStyle:Dictionary<String,
           if let image = image {
             DispatchQueue.main.sync {
               if (isValid()) {
-                try! self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
-                applyUpdater { (layer: inout BackgroundLayer) in
-                  self.setBackgroundPattern(&layer, styleValue:styleValue);
+                logged("Background.BackgroundPattern.addImage") {
+                  try self.style.addImage(image, id:imageURI!, stretchX: [], stretchY: []);
+                  applyUpdater { (layer: inout BackgroundLayer) in
+                    self.setBackgroundPattern(&layer, styleValue:styleValue);
+                  }
                 }
               }
             }

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/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',

package/javascript/components/HeadingIndicator.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import headingIcon from '../../assets/heading.png';
+import headingIcon from '../assets/heading.png';
 
 import { SymbolLayer } from './SymbolLayer';