@rnmapbox/maps 10.1.0 → 10.1.1

package/ios/RNMBX/RNMBXFabricPropConvert.mm

@@ -0,0 +1,136 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTBridge+Private.h>
+
+#import "rnmapbox_maps-Swift.pre.h"
+#import "RNMBXFabricPropConvert.h"
+
+BOOL RNMBXPropConvert_BOOL(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+    case folly::dynamic::BOOL:
+      return dyn.getBool();
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean but was: $d",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return NULL;
+  }
+}
+
+NSNumber* RNMBXPropConvert_Optional_BOOL_NSNumber(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+    case folly::dynamic::NULLT:
+      return NULL;
+    case folly::dynamic::BOOL:
+      return [NSNumber numberWithBool:dyn.getBool()];
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean or nil but was: $d",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return NULL;
+  }
+}
+
+BOOL RNMBXPropConvert_Optional_BOOL(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+    case folly::dynamic::BOOL:
+      return dyn.getBool();
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a boolean or nil but was: $d",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return NO;
+  }
+}
+
+NSString* RNMBXPropConvert_Optional_NSString(const folly::dynamic &dyn, NSString* propertyName) {
+    switch (dyn.type()) {
+    case folly::dynamic::STRING:
+      return [NSString stringWithCString:dyn.getString().c_str() encoding:NSUTF8StringEncoding];
+    case folly::dynamic::NULLT:
+      return nil;
+    default:
+      std::stringstream ss;
+      ss << dyn;
+      [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be a string or nil but was: %s",
+                          propertyName,
+                          ss.str().c_str()
+                         ]];
+      return nil;
+  }
+}
+
+
+id RNMBXPropConvert_ID(const folly::dynamic &dyn)
+{
+  switch (dyn.type()) {
+    case folly::dynamic::NULLT:
+      return nil;
+    case folly::dynamic::BOOL:
+      return dyn.getBool() ? @YES : @NO;
+    case folly::dynamic::INT64:
+      return @(dyn.getInt());
+    case folly::dynamic::DOUBLE:
+      return @(dyn.getDouble());
+    case folly::dynamic::STRING:
+      return [NSString stringWithCString:dyn.c_str() encoding:NSUTF8StringEncoding];
+    case folly::dynamic::ARRAY: {
+      NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:dyn.size()];
+      for (const auto &elem : dyn) {
+        id value = RNMBXPropConvert_ID(elem);
+        if (value) {
+          [array addObject:value];
+        }
+      }
+      return array;
+    }
+    case folly::dynamic::OBJECT: {
+      NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:dyn.size()];
+      for (const auto &elem : dyn.items()) {
+        id key = RNMBXPropConvert_ID(elem.first);
+        id value = RNMBXPropConvert_ID(elem.second);
+        if (key && value) {
+          dict[key] = value;
+        }
+      }
+      return dict;
+    }
+  }
+}
+
+id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSString* propertyName) {
+  switch (dyn.type()) {
+  case folly::dynamic::ARRAY:
+    return RNMBXPropConvert_ID(dyn);
+  case folly::dynamic::DOUBLE:
+    return [NSNumber numberWithDouble:dyn.getDouble()];
+  case folly::dynamic::INT64:
+    return [NSNumber numberWithInt:dyn.getInt()];
+  default:
+    std::stringstream ss;
+    ss << dyn;
+    [RNMBXLogger error:[NSString stringWithFormat:@"Property %@ expected to be an array or a number: %s",
+                        propertyName,
+                        ss.str().c_str()
+                       ]];
+    return nil;
+  }
+}
+
+NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn, NSString* propertyName)
+{
+  return RNMBXPropConvert_ID(dyn);
+}
+
+#endif

package/ios/RNMBX/RNMBXImageModule.mm

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withImage:(NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withImage:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
 #ifdef RCT_NEW_ARCH_ENABLED
     [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE();
 }
 
 
-RCT_EXPORT_METHOD(refresh:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(refresh:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withImage:viewRef block:^(RNMBXImage *view) {
         // TODO: implement refresh on iOS

package/ios/RNMBX/RNMBXImages.swift

@@ -22,6 +22,8 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   weak var style: Style? = nil
 
+  var imageManager: ImageManager? = nil
+
   @objc
   public var onImageMissing: RCTBubblingEventBlock? = nil
   
@@ -46,9 +48,18 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   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 public func addImageView(_ image: RNMBXImage) {
+    imageViews.append(image)
+  }
+
+  @objc public func removeImageView(_ image: RNMBXImage) {
+    imageViews.removeAll { $0 == image }
+    image.images = nil
+  }
+
   @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
     if let image = subview as? RNMBXImage {
-      imageViews.insert(image, at: atIndex)
+      addImageView(image)
     } else {
       Logger.log(level:.warn, message: "RNMBXImages children can only be RNMBXImage, got \(optional: subview)")
     }
@@ -57,8 +68,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   @objc open override func removeReactSubview(_ subview: UIView!) {
     if let image = subview as? RNMBXImage {
-      imageViews.removeAll { $0 == image }
-      image.images = nil
+      removeImageView(image)
     }
     super.removeReactSubview(subview)
   }
@@ -71,6 +81,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   func addToMap(_ map: RNMBXMapView, style: Style) {
     self.style = style
+    imageManager = map.imageManager
     map.images.append(self)
     
     self.addNativeImages(style: style, nativeImages: nativeImageInfos)
@@ -80,6 +91,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     self.style = nil
+    imageManager = nil
     // v10todo
     return true
   }
@@ -116,7 +128,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
         if !sameImage(oldValue: oldImages[name], newValue: images[name]) {
           missingImages[name] = images[name]
         } else {
-          if hasImage(style: style, name: name) {
+          if !hasImage(style: style, name: name) {
             logged("RNMBXImages.addImagePlaceholder") {
               try style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
@@ -127,7 +139,10 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
     }
     
     if missingImages.count > 0 {
-      RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, loaded: { name in self.loadedImages.insert(name) } ,callback: { })
+      RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true) { name, image in
+        self.loadedImages.insert(name)
+        self.imageManager?.resolve(name: name, image: image)
+      }
     }
   }
   
@@ -243,7 +258,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
     for imageInfo in nativeImages {
       let imageName = imageInfo.name
-      if  hasImage(style: style, name:imageName) {
+      if  !hasImage(style: style, name: imageName) {
         if let image = UIImage(named: imageName) {
           logged("RNMBXImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
@@ -252,6 +267,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
                                content: RNMBXImages.convert(content: imageInfo.content, scale: image.scale)
             )
           }
+          imageManager?.resolve(name: imageName, image: image)
         } else {
           Logger.log(level:.error, message: "Cannot find nativeImage named \(imageName)")
         }

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -3,6 +3,8 @@
 #import "RNMBXImagesComponentView.h"
 #import "RNMBXFabricHelpers.h"
 
+#include "RNMBXImageComponentView.h"
+
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -68,7 +70,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
+    const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
     id images = RNMBXConvertFollyDynamicToId(newProps.images);
     if (images != nil) {
         _view.images = images;
@@ -81,6 +83,22 @@ using namespace facebook::react;
   [super updateProps:props oldProps:oldProps];
 }
 
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RNMBXImageComponentView class]] && ((RNMBXImageComponentView *)childComponentView).contentView) {
+        [_view addImageView:((RNMBXImageComponentView *)childComponentView).contentView];
+    }
+    [super mountChildComponentView:childComponentView index:index];
+}
+
+- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    if ([childComponentView isKindOfClass:[RCTViewComponentView class]] && ((RCTViewComponentView *)childComponentView).contentView) {
+        [_view removeImageView:((RCTViewComponentView *)childComponentView).contentView];
+    }
+    [super unmountChildComponentView:childComponentView index:index];
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RNMBXImagesCls(void)

package/ios/RNMBX/RNMBXInteractiveElement.swift

@@ -18,7 +18,7 @@ public class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
   @objc public 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")
+        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is not supported")
         if let map = map { removeFromMap(map, reason: .ComponentChange) }
       }
     }

package/ios/RNMBX/RNMBXLayer.swift

@@ -96,6 +96,12 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     }
   }
   
+  @objc public var slot: String? = nil {
+    didSet {
+      optionsChanged()
+    }
+  }
+  
   @objc weak var map: RNMBXMapView? = nil
 
   deinit {
@@ -252,6 +258,21 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     removeFromMap(style)
   }
   
+  #if RNMBX_11
+  func _toSlot(_ slot: String) -> Slot? {
+    switch slot {
+    case "top":
+      return Slot.top;
+    case "bottom":
+      return Slot.bottom;
+    case "middle":
+      return Slot.middle;
+    default:
+      return Slot(rawValue: slot);
+    }
+  }
+  #endif
+  
   func setBaseOptions<T: Layer>(_ layer: inout T) {
     if let minZoom = minZoomLevel {
       layer.minZoom = minZoom.doubleValue
@@ -260,6 +281,12 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     if let maxZoom = maxZoomLevel {
       layer.maxZoom = maxZoom.doubleValue
     }
+    
+    #if RNMBX_11
+    if let slot = slot {
+      layer.slot = _toSlot(slot)
+    }
+    #endif
   }
   
   func setOptions(_ layer: inout Layer) {

package/ios/RNMBX/RNMBXLocationModule.swift

@@ -457,14 +457,9 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
 
   static weak var shared : RNMBXLocationModule? = nil
 
-  var locationProviderRNMBX : LocationProviderRNMBX
   var hasListener = false
   
-  var locationProvider : LocationProvider {
-    get {
-      return locationProviderRNMBX
-    }
-  }
+  var locationProvider : LocationProvider
   
   var locationEventThrottle : (
     waitBetweenEvents: Double?,
@@ -475,9 +470,11 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   )
 
   override init() {
-    locationProviderRNMBX = LocationProviderRNMBX()
+    locationProvider = LocationProviderRNMBX()
     super.init()
-    locationProviderRNMBX.delegate = self
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.delegate = self
+    }
     RNMBXLocationModule.shared = self
   }
   
@@ -497,12 +494,20 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    if minDisplacement >= 0.0 { locationProviderRNMBX.setDistanceFilter(minDisplacement) }
-    locationProviderRNMBX.start()
+    if minDisplacement >= 0.0 {
+      if let locationProvider = locationProvider as? LocationProviderRNMBX {
+        locationProvider.setDistanceFilter(minDisplacement)
+      }
+    }
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.start()
+    }
   }
   
   @objc func stop() {
-    locationProviderRNMBX.stop()
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.stop()
+    }
   }
   
   @objc func getLastKnownLocation() -> RNMBXLocation? {
@@ -510,15 +515,21 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    locationProviderRNMBX.setDistanceFilter(minDisplacement)
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.setDistanceFilter(minDisplacement)
+    }
   }
   
   @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
-    locationProviderRNMBX.setRequestsAlwaysUse(requestsAlwaysUse);
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.setRequestsAlwaysUse(requestsAlwaysUse)
+    }
   }
 
   @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
-    locationProviderRNMBX.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    if let locationProvider = locationProvider as? LocationProviderRNMBX {
+      locationProvider.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
+    }
   }
 
   @objc

package/ios/RNMBX/RNMBXLocationModuleV11.swift

@@ -133,10 +133,9 @@ extension RNMBXAppleLocationProviderProxy {
 class RNMBXLocationModule: RCTEventEmitter {
   static weak var shared : RNMBXLocationModule? = nil
   
-  // var _locationProvider : RNMBXAppleLocationProviderProxy = RNMBXAppleLocationProviderProxy(provider: AppleLocationProvider())
-  var _locationProvider : AppleLocationProvider = AppleLocationProvider()
-  var locationUpdateObserver : AnyCancelable? = nil
-  var locationHeadingObserver : AnyCancelable? = nil
+  var _locationProvider : LocationProvider & HeadingProvider = AppleLocationProvider()
+  var locationUpdateObserver : Cancelable? = nil
+  var locationHeadingObserver : Cancelable? = nil
   
   var actLocation : RNMBXLocation = RNMBXLocation()
   
@@ -164,12 +163,10 @@ class RNMBXLocationModule: RCTEventEmitter {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    var newOptions = _locationProvider.options
-    newOptions.distanceFilter = minDisplacement
-    if minDisplacement >= 0.0 { _locationProvider.options = newOptions }
+    setMinDisplacement(minDisplacement)
     
     locationUpdateObserver?.cancel()
-    locationUpdateObserver = _locationProvider.onLocationUpdate.observe { location in
+    locationUpdateObserver = observeLocationUpdates(_locationProvider) { location in
       guard self.hasListener else { return }
   
       self.actLocation.location = location.last
@@ -178,7 +175,7 @@ class RNMBXLocationModule: RCTEventEmitter {
       }
     }
     locationHeadingObserver?.cancel()
-    locationHeadingObserver = _locationProvider.onHeadingUpdate.observe { heading in
+    locationHeadingObserver = observeHeadingUpdates(_locationProvider) { heading in
       guard self.hasListener else { return }
 
       self.actLocation.heading = heading
@@ -188,6 +185,64 @@ class RNMBXLocationModule: RCTEventEmitter {
     }
   }
   
+  class _LocationObserver : Cancelable, LocationObserver  {
+    weak var locationProvider: LocationProvider?
+    var callback: (([Location]) -> Void)?
+    
+    init(_ locationProvider: LocationProvider) {
+      self.locationProvider = locationProvider
+    }
+
+    func onLocationUpdateReceived(for locations: [Location]) {
+      callback?(locations)
+    }
+  
+    func cancel() {
+      locationProvider?.removeLocationObserver(for: self)
+      locationProvider = nil
+    }
+    
+    deinit {
+      self.cancel()
+    }
+  }
+  
+  class _HeadingObserver: Cancelable, HeadingObserver {
+    var headingProvider: HeadingProvider?
+    var callback: ((Heading) -> Void)?
+
+    init(_ headingProvider: HeadingProvider) {
+      self.headingProvider = headingProvider
+    }
+    
+    func onHeadingUpdate(_ heading: MapboxMaps.Heading) {
+      callback?(heading)
+    }
+    
+    func cancel() {
+      headingProvider?.remove(headingObserver: self)
+      headingProvider = nil
+    }
+    
+    deinit {
+      self.cancel()
+    }
+  }
+  
+  func observeLocationUpdates(_ locationProvider: LocationProvider, callback: @escaping ([Location]) -> Void) -> Cancelable {
+    let observer = _LocationObserver(locationProvider)
+    observer.callback = callback
+    locationProvider.addLocationObserver(for: observer)
+    return observer
+  }
+  
+  func observeHeadingUpdates(_ headingProvider: HeadingProvider, callback: @escaping (Heading) -> Void) -> Cancelable {
+    let observer = _HeadingObserver(headingProvider)
+    observer.callback = callback
+    headingProvider.add(headingObserver: observer)
+    return observer
+  }
+  
   @objc func stop() {
     locationUpdateObserver?.cancel()
     locationUpdateObserver = nil
@@ -199,14 +254,17 @@ class RNMBXLocationModule: RCTEventEmitter {
   @objc func getLastKnownLocation() -> RNMBXLocation? {
     let last = RNMBXLocation()
     last.heading = _locationProvider.latestHeading
-    last.location = _locationProvider.latestLocation
+    last.location = _locationProvider.getLastObservedLocation()
     return last
   }
   
-  @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    var newOptions = _locationProvider.options
-    newOptions.distanceFilter = minDisplacement
-    _locationProvider.options = newOptions
+  @objc
+  func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
+    if let appleLocationProvider = _locationProvider as? AppleLocationProvider {
+      var newOptions = appleLocationProvider.options
+      newOptions.distanceFilter = minDisplacement
+      if minDisplacement >= 0.0 { appleLocationProvider.options = newOptions }
+    }
   }
   
   @objc
@@ -236,7 +294,16 @@ class RNMBXLocationModule: RCTEventEmitter {
     get {
       return _locationProvider
     }
+    set(value) {
+      _locationProvider = value
+    }
   }
+  
+  func overrideLocationProvider(newProvider: LocationProvider & HeadingProvider) {
+    _locationProvider = newProvider
+  }
+  
+  
 }
 
 class EventThrottler {

package/ios/RNMBX/RNMBXLogging.swift

@@ -115,6 +115,14 @@ func logged<T>(_ msg: String, info: (() -> String)? = nil, errorResult: (Error)
   }
 }
 
+@objc(RNMBXLogger)
+public class RNMBXLogger : NSObject {
+  @objc
+  static public func error(_ message: String) {
+    Logger.error(message)
+  }
+}
+
 @objc(RNMBXLogging)
 class RNMBXLogging: RCTEventEmitter {
   static var shared : RNMBXLogging? = nil