@rnmapbox/maps 10.0.0-beta.69 → 10.0.0-beta.70

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

@@ -3,8 +3,6 @@ package com.mapbox.rctmgl.location
 import android.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
-//import com.mapbox.maps.plugin.locationcomponent.LocationConsumer.onLocationUpdated
-//import com.mapbox.maps.plugin.locationcomponent.LocationConsumer.onBearingUpdated
 import com.mapbox.android.core.location.LocationEngine
 import com.mapbox.android.core.location.LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineResult
@@ -20,9 +18,52 @@ import java.lang.ref.WeakReference
 import java.util.ArrayList
 import kotlin.Exception
 
-internal class LocationProviderForEngine(var mEngine: LocationEngine?) : LocationProvider, LocationEngineCallback<LocationEngineResult> {
+
+open class SingletonHolder<out T, in A>(creator: (A) -> T) {
+    private var creator: ((A) -> T)? = creator
+    @Volatile private var instance: T? = null
+
+    fun getInstance(arg: A): T {
+        val i = instance
+        if (i != null) {
+            return i
+        }
+
+        return synchronized(this) {
+            val i2 = instance
+            if (i2 != null) {
+                i2
+            } else {
+                val created = creator!!(arg)
+                instance = created
+                creator = null
+                created
+            }
+        }
+    }
+}
+
+internal class LocationProviderForEngine(var mEngine: LocationEngine?, val context: Context) : LocationProvider, LocationEngineCallback<LocationEngineResult> {
     var mConsumers = ArrayList<LocationConsumer>()
-    fun beforeAddingFirstConsumer() {}
+    @SuppressLint("MissingPermission")
+    fun beforeAddingFirstConsumer() {
+        val request = LocationEngineRequest.Builder(LocationManager.DEFAULT_INTERVAL_MILLIS
+        )
+            .setFastestInterval(LocationManager.DEFAULT_FASTEST_INTERVAL_MILLIS)
+            .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
+            .build();
+
+        if (!PermissionsManager.areLocationPermissionsGranted(context)) {
+            return
+        }
+
+        mEngine?.requestLocationUpdates(
+          request,
+          this,
+          Looper.getMainLooper()
+        )
+
+    }
     fun afterRemovedLastConsumer() {}
     @SuppressLint("MissingPermission")
     override fun registerLocationConsumer(locationConsumer: LocationConsumer) {
@@ -66,25 +107,29 @@ class LocationManager private constructor(private val context: Context) : Locati
     private var isActive = false
     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;
-
+    private var locationProvider: LocationProvider? = null
+    private var nStarts : Int = 0
+    private var isPaused : Boolean = false
 
-
-    val provider: LocationProvider
+    var provider: LocationProvider
         get() {
-            if (locationProvider == null) {
-                locationProvider = LocationProviderForEngine(engine)
+            var ret = locationProvider
+            if (ret == null) {
+                val engine = LocationProviderForEngine(engine, context)
+                locationProvider = engine
+                return engine
+            } else {
+                return ret
             }
-            return locationProvider!!
+        }
+        set(value) {
+            locationProvider = value
         }
 
     interface OnUserLocationChange {
         fun onLocationChange(location: Location?)
     }
 
-
     /// public interface
 
     fun startCounted() {
@@ -228,23 +273,17 @@ class LocationManager private constructor(private val context: Context) : Locati
 
     override fun onSuccess(result: LocationEngineResult?) {
         onLocationChanged(result?.lastLocation)
-        if (locationProvider != null) {
-            locationProvider!!.onSuccess(result)
+        val provider = locationProvider
+        if (provider != null && provider is LocationProviderForEngine) {
+            provider.onSuccess(result)
         }
     }
 
-    companion object {
+    companion object : SingletonHolder<LocationManager, Context>(::LocationManager) {
         const val DEFAULT_FASTEST_INTERVAL_MILLIS: Long = 1000
         const val DEFAULT_INTERVAL_MILLIS: Long = 1000
         const val LOG_TAG = "LocationManager"
-        private var INSTANCE: WeakReference<LocationManager>? = null
-        @JvmStatic
-        fun getInstance(context: Context): LocationManager? {
-            if (INSTANCE == null) {
-                INSTANCE = WeakReference(LocationManager(context))
-            }
-            return INSTANCE!!.get()
-        }
+
     }
 
     init {

package/ios/RCTMGL-v10/MGLModule.swift

@@ -55,6 +55,7 @@ class MGLModule : NSObject {
           "WillStartLoadingMap": RCTMGLEvent.EventType.willStartLoadingMap.rawValue,
           "DidFinishLoadingStyle": RCTMGLEvent.EventType.didFinishLoadingStyle.rawValue,
           "DidFinishLoadingMap": RCTMGLEvent.EventType.didFinishLoadingMap.rawValue,
+          "MapLoadingError": RCTMGLEvent.EventType.mapLoadingError.rawValue,
           "DidFinishRenderingFrameFully":  RCTMGLEvent.EventType.didFinishRenderingFully.rawValue,
           "DidFinishRenderingFrame": RCTMGLEvent.EventType.didFinishRendering.rawValue,
         ],

package/ios/RCTMGL-v10/RCTMGLAtmosphere.swift

@@ -56,6 +56,7 @@ class RCTMGLAtmosphere : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceC
         styler.atmosphereLayer(
           layer: &atmosphere,
           reactStyle: reactStyle,
+          oldReactStyle: oldReactStyle,
           applyUpdater: { (updater) in fatalError("Atmosphere: TODO - implement apply updater")},
           isValid: { fatalError("Atmosphere: TODO - no isValid") }
         )

package/ios/RCTMGL-v10/RCTMGLBackgroundLayer.swift

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

package/ios/RCTMGL-v10/RCTMGLCircleLayer.swift

@@ -34,6 +34,7 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
           applyUpdater: { (updater) in logged("RCTMGLCircleLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLEvent.swift

@@ -28,6 +28,7 @@ class RCTMGLEvent : NSObject, RCTMGLEventProtocol {
       case mapIdle
       case imageMissing
       case didFinishLoadingMap
+      case mapLoadingError
       case didFinishRenderingFully
       case didFinishRendering
       case didFinishLoadingStyle

package/ios/RCTMGL-v10/RCTMGLFillExtrustionLayer.swift

@@ -33,6 +33,7 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
           applyUpdater: { (updater) in logged("RCTMGLFillExtrusionLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLFillLayer.swift

@@ -35,6 +35,7 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
         styler.fillLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
           applyUpdater: { (updater) in logged("RCTMGLFillLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLHeatmapLayer.swift

@@ -35,6 +35,7 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
         styler.heatmapLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
           applyUpdater: { (updater) in logged("RCTMGLHeatmapLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLLayer.swift

@@ -13,7 +13,11 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     didSet { self.optionsChanged() }
   }
 
+  var oldReatStyle: Dictionary<String, Any>? = nil
   @objc var reactStyle : Dictionary<String, Any>? = nil {
+    willSet {
+      oldReatStyle = reactStyle
+    }
     didSet {
       DispatchQueue.main.async {
         self.addStylesAndUpdate()

package/ios/RCTMGL-v10/RCTMGLLight.swift

@@ -4,7 +4,11 @@ import MapboxMaps
 class RCTMGLLight: UIView, RCTMGLMapComponent {
   weak var bridge : RCTBridge! = nil
   weak var map: MapboxMap! = nil
+  var oldReactStyle: [String:Any]?
   @objc var reactStyle : [String:Any]! = nil {
+    willSet {
+      oldReactStyle = reactStyle
+    }
     didSet {
       if map != nil {
         addStyles()
@@ -13,17 +17,15 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
   }
   
   func apply(light: Light) {
-    self.map.style
     let lightData = try! JSONEncoder().encode(light)
     let lightDictionary = try! JSONSerialization.jsonObject(with: lightData)
-    print("=> lightDictionary \(lightDictionary)")
     try! self.map.style.setLight(properties: lightDictionary as! [String:Any])
   }
 
   func addStyles() {
     var light = Light()
     let style = RCTMGLStyle(style: map.style)
-    style.lightLayer(layer: &light, reactStyle: reactStyle, applyUpdater: { (updater) in
+    style.lightLayer(layer: &light, reactStyle: reactStyle, oldReactStyle: oldReactStyle, applyUpdater: { (updater) in
       updater(&light)
       self.apply(light: light)
     }, isValid: {

package/ios/RCTMGL-v10/RCTMGLLineLayer.swift

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

package/ios/RCTMGL-v10/RCTMGLLocationModule.m

@@ -12,5 +12,9 @@ RCT_EXTERN_METHOD(getLastKnownLocation)
 RCT_EXTERN_METHOD(setMinDisplacement:(CLLocationDistance)minDisplacement)
 RCT_EXTERN_METHOD(setRequestsAlwaysUse:(BOOL)requestsAlwaysUse)
 
+RCT_EXTERN_METHOD(setLocationEventThrottle:(NSNumber *)throttleValue)
+
+RCT_EXTERN_METHOD(simulateHeading:(nonnull NSNumber)changesPerSecond increment:(nonnull NSNumber))
+
 
 @end

package/ios/RCTMGL-v10/RCTMGLLocationModule.swift

@@ -57,6 +57,10 @@ class RCTMGLLocationManager : LocationProviderDelegate {
   weak var delegate: RCTMGLLocationManagerDelegate?
   weak var locationProviderDelage: LocationProviderDelegate?
   
+  var headingSimulator: Timer? = nil
+  var simulatedHeading: Double = 0.0
+  var simulatedHeadingIncrement: Double = 1.0
+
   init() {
     provider = AppleLocationProvider()
     provider.setDelegate(self)
@@ -219,6 +223,54 @@ extension RCTMGLLocationManager: LocationProvider {
   }
 }
 
+// MARK: heading simulation
+
+final public class SimulatedHeading: CLHeading {
+  init(trueHeading: CLLocationDirection, timestamp: Date) {
+    _trueHeading = trueHeading
+    _timestamp = timestamp
+    super.init()
+  }
+  
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+  
+    private var _trueHeading: CLLocationDirection = 0
+    private var _timestamp: Date
+
+    public override var trueHeading: CLLocationDirection {
+        get {  _trueHeading }
+        set { _trueHeading = newValue }
+    }
+
+    public override var timestamp: Date{
+      get {  _timestamp }
+      set { _timestamp = newValue }
+    }
+}
+
+extension RCTMGLLocationManager {
+  func simulateHeading(changesPerSecond: Int, increment: Double) {
+    self.simulatedHeadingIncrement = increment
+    DispatchQueue.main.async {
+      if let headingSimulator = self.headingSimulator {
+        headingSimulator.invalidate()
+      }
+      self.headingSimulator = nil
+
+      if (changesPerSecond > 0) {
+        self.headingSimulator = Timer.scheduledTimer(withTimeInterval: 1.0/Double(changesPerSecond), repeats: true) { [weak self] (_) in
+          guard let self = self else { return }
+
+          self.simulatedHeading = (self.simulatedHeading + self.simulatedHeadingIncrement).truncatingRemainder(dividingBy: 360.0)
+          self.locationProvider(self.provider, didUpdateHeading: SimulatedHeading(trueHeading: self.simulatedHeading, timestamp: Date()) )
+        }
+      }
+    }
+  }
+}
+
 
 @objc(RCTMGLLocationModule)
 class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
@@ -234,6 +286,14 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
     }
   }
   
+  var locationEventThrottle : (
+    waitBetweenEvents: Double?,
+    lastSentTimestamp: Double?
+  ) = (
+    nil,
+    nil
+  )
+
   override init() {
     locationManager = RCTMGLLocationManager()
     super.init()
@@ -277,6 +337,10 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
     locationManager.setRequestsAlwaysUse(requestsAlwaysUse);
   }
 
+  @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
+    locationManager.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+  }
+
   @objc
   override func startObserving() {
     super.startObserving()
@@ -290,14 +354,46 @@ class RCTMGLLocationModule: RCTEventEmitter, RCTMGLLocationManagerDelegate {
   }
   
   func locationManager(_ locationManager: RCTMGLLocationManager, didUpdateLocation location: RCTMGLLocation) {
-    guard hasListener else {
+    guard hasListener, let _ = bridge else {
       return
     }
-    
-    guard let _ = bridge else {
-      return
+
+    if shouldSendLocationEvent() {
+      self.sendEvent(withName: RCT_MAPBOX_USER_LOCATION_UPDATE, body: location.toJSON())
+    }
+  }
+  
+  // MARK: - location event throttle
+  @objc
+  func setLocationEventThrottle(_ throttleValue:NSNumber) {
+    let throttleValue = throttleValue.doubleValue
+    if throttleValue > 0.0 {
+      locationEventThrottle.waitBetweenEvents = throttleValue
+    } else {
+      locationEventThrottle.waitBetweenEvents = nil
     }
+  }
 
-    self.sendEvent(withName: RCT_MAPBOX_USER_LOCATION_UPDATE, body: location.toJSON())
+  func shouldSendLocationEvent() -> Bool {
+    guard let waitBetweenEvents = locationEventThrottle.waitBetweenEvents, waitBetweenEvents > 0 else {
+      return true
+    }
+  
+    let currentTimestamp: Double = CACurrentMediaTime() * 1000.0
+    
+    guard let lastSentTimestamp = locationEventThrottle.lastSentTimestamp else {
+      locationEventThrottle.lastSentTimestamp = currentTimestamp
+      return true;
+    }
+    
+    if (currentTimestamp - lastSentTimestamp > waitBetweenEvents) {
+      locationEventThrottle.lastSentTimestamp = currentTimestamp
+      return true;
+    }
+     
+    return false;
   }
+
 }
+
+

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -445,8 +445,21 @@ extension RCTMGLMapView {
   }
   
   public func setupEvents() {
-    self.onEvery(event: .mapLoadingError, handler: {(self, event) in
-      if let message = event.payload.error.errorDescription {
+    self.onEvery(event: .mapLoadingError, handler: { (self, event) in
+      let eventPayload : MapLoadingErrorPayload = event.payload
+      var payload : [String:String] = [
+        "error": eventPayload.error.errorDescription ?? eventPayload.error.localizedDescription
+      ]
+      if let tileId = eventPayload.tileId {
+        payload["tileId"] = "x:\(tileId.x) y:\(tileId.y) z:\(tileId.z)"
+      }
+      if let sourceId = eventPayload.sourceId {
+        payload["sourceId"] = sourceId
+      }
+      let rctmglEvent = RCTMGLEvent(type: .mapLoadingError, payload: payload);
+      self.fireEvent(event: rctmglEvent, callback: self.reactOnMapChange)
+
+      if let message = eventPayload.error.errorDescription {
         Logger.log(level: .error, message: "MapLoad error \(message)")
       } else {
         Logger.log(level: .error, message: "MapLoad error \(event)")

package/ios/RCTMGL-v10/RCTMGLRasterLayer.swift

@@ -29,6 +29,7 @@ class RCTMGLRasterLayer: RCTMGLLayer {
         styler.rasterLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
+          oldReactStyle: oldReatStyle,
           applyUpdater:{ (updater) in logged("RCTMGLRasterLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},

package/ios/RCTMGL-v10/RCTMGLSingletonLayer.swift

@@ -7,7 +7,11 @@ class RCTMGLSingletonLayer : UIView {
   weak var map : RCTMGLMapView? = nil
   var style: Style? = nil
   
+  var oldReactStyle: [String:Any]?
   @objc var reactStyle : Dictionary<String, Any>? = nil {
+    willSet {
+      oldReactStyle = reactStyle
+    }
     didSet {
       DispatchQueue.main.async {
         self.addStylesAndUpdate()

package/ios/RCTMGL-v10/RCTMGLSkyLayer.swift

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