@rnmapbox/maps 10.1.0-beta.15 → 10.1.0-beta.18

package/ios/RNMBX/RNMBXMarkerView.swift

@@ -70,7 +70,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
   // MARK: - Derived variables
   
   var annotationManager: ViewAnnotationManager? {
-    self.map?.viewAnnotations
+    self.map?.mapView?.viewAnnotations
   }
 
   var point: Point? {

package/ios/RNMBX/RNMBXMarkerViewComponentView.mm

@@ -70,7 +70,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXMarkerViewProps>(props);
+  const auto &newProps = static_cast<const RNMBXMarkerViewProps &>(*props);
     
     id coordinate = RNMBXConvertFollyDynamicToId(newProps.coordinate);
     if (coordinate != nil) {

package/ios/RNMBX/RNMBXNativeUserLocation.swift

@@ -16,16 +16,17 @@ public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
   }
   
   func _applySettings(_ map: RNMBXMapView) {
-    map.location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
+    let location = map.mapView.location!
+    location.options.puckType = .puck2D(.makeDefault(showBearing: iosShowsUserHeadingIndicator))
     if (iosShowsUserHeadingIndicator) {
        #if RNMBX_11
-      map.location.options.puckBearing = .heading
+      location.options.puckBearing = .heading
       #else
-      map.location.options.puckBearingSource = .heading
+      location.options.puckBearingSource = .heading
       #endif
-      map.location.options.puckBearingEnabled = true
+      location.options.puckBearingEnabled = true
     } else {
-      map.location.options.puckBearingEnabled = false
+      location.options.puckBearingEnabled = false
     }
   }
 
@@ -35,12 +36,13 @@ public class RNMBXNativeUserLocation : UIView, RNMBXMapComponent {
   }
 
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
-    map.location.options.puckType = nil
+    let location = map.mapView.location!
+    location.options.puckType = nil
     guard let mapboxMap = map.mapboxMap else {
       return true
     }
     let style = mapboxMap.style
-    map.location.options.puckType = .none
+    location.options.puckType = .none
     self.map = nil
 
     return true

package/ios/RNMBX/RNMBXNativeUserLocationComponentView.mm

@@ -53,7 +53,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXNativeUserLocationProps>(props);
+  const auto &newProps = static_cast<const RNMBXNativeUserLocationProps &>(*props);
     id iosShowsUserHeadingIndicator = RNMBXConvertFollyDynamicToId(newProps.iosShowsUserHeadingIndicator);
     if (iosShowsUserHeadingIndicator != nil) {
         _view.iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;

package/ios/RNMBX/RNMBXPointAnnotationComponentView.mm

@@ -116,7 +116,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXPointAnnotationProps>(props);
+  const auto &newProps = static_cast<const RNMBXPointAnnotationProps &>(*props);
     id coordinate = RNMBXConvertFollyDynamicToId(newProps.coordinate);
     if (coordinate != nil) {
         _view.coordinate = coordinate;

package/ios/RNMBX/RNMBXRasterDemSourceComponentView.mm

@@ -71,7 +71,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterDemSourceProps>(props);
+  const auto &newProps = static_cast<const RNMBXRasterDemSourceProps &>(*props);
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/RNMBXRasterLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXRasterLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXRasterSourceComponentView.mm

@@ -71,7 +71,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXRasterSourceProps>(props);    
+  const auto &newProps = static_cast<const RNMBXRasterSourceProps &>(*props);    
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/RNMBXShapeSourceComponentView.mm

@@ -85,7 +85,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXShapeSourceProps>(props);
+  const auto &newProps = static_cast<const RNMBXShapeSourceProps &>(*props);
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/RNMBXSkyLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXSkyLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXSkyLayerProps &>(*props);
   RNMBXSetCommonLayerPropsWithoutSourceID(newProps, _view);
     
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXSymbolLayerComponentView.mm

@@ -48,7 +48,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXSymbolLayerProps>(props);
+  const auto &newProps = static_cast<const RNMBXSymbolLayerProps &>(*props);
   RNMBXSetCommonLayerProps(newProps, _view);
 
   [super updateProps:props oldProps:oldProps];

package/ios/RNMBX/RNMBXTerrainComponentView.mm

@@ -54,7 +54,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXTerrainProps>(props);
+  const auto &newProps = static_cast<const RNMBXTerrainProps &>(*props);
 
     id sourceID = RNMBXConvertFollyDynamicToId(newProps.sourceID);
     if (sourceID != nil) {

package/ios/RNMBX/RNMBXVectorSourceComponentView.mm

@@ -84,7 +84,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const RNMBXVectorSourceProps>(props);
+  const auto &newProps = static_cast<const RNMBXVectorSourceProps &>(*props);
     id idx = RNMBXConvertFollyDynamicToId(newProps.id);
     if (idx != nil) {
         _view.id = idx;

package/ios/RNMBX/Uitls/PropertyChanges.swift

@@ -0,0 +1,58 @@
+
+/**
+ * This mechanism allows to separate property updates from application of property updates. Usefull for delaying the propery updates
+ * because the object is not yet created for example. Or to apply multiple propery changes at once, as properties are not atomic.
+ *
+ * @sample
+ *
+ * class MapView {
+ *   enum Property: String {
+ *     case logo
+ *     case compass
+ *
+ *     var name string { return rawValue }
+ *     fun apply(mapView: MapView) {
+ *       switch self {
+ *         case .logo: mapView.applyLogo()
+ *        case .compass: mapView.applyCompass() 
+ *     }
+ *   }
+ *   val changes = PropertyChanges()
+ *
+ *   var logoPosition: LogoPosition;
+ *
+ * . func changed(_ property: Property) {
+ *     changes.add(property)
+ * . }
+ *
+ *   func changed(name: String, apply: @escaping (MapView) -> Void) {
+ *     changes.add(name: name, apply: apply)
+ * . }
+ *
+ * @objc override public func didSetProps(_ props: [String]) {
+ *    changes.apply(self)
+ *  }
+ * }
+ */
+
+ class PropertyChanges<T> {
+  var changes: [String: (T)->Void] = [:]
+  var uniqKey: Int = 0
+  
+  func add(name: String, update: @escaping (T) -> Void) {
+    changes[name] = update
+  }
+   
+  func add(update: @escaping (T) -> Void) {
+    let name = "#\(uniqKey)"
+    uniqKey += 1
+    changes[name] = update
+  }
+  
+  func apply(_ target: T) {
+    changes.forEach { name, updater in
+      updater(target)
+    }
+    changes.removeAll()
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.0-beta.15",
+  "version": "10.1.0-beta.18",
   "publishConfig": {
     "access": "public"
   },
@@ -50,6 +50,7 @@
     "type:check": "yarn tsc --noEmit",
     "test:plugin": "yarn expo-module test plugin",
     "build:plugin": "yarn tsc --build plugin",
+    "build:examples.json": "cd example; jest __tests__/dumpExamplesJson.ts",
     "lint:plugin": "yarn eslint plugin/src/*",
     "build": "yarn bob build",
     "prepare": "yarn bob build && yarn husky install"