@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/ios/RNMBX/RNMBXPointAnnotationModule.mm

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withPointAnnotation:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXPointAnnotation *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withPointAnnotation:(NSNumber*)viewRef block:(void (^)(RNMBXPointAnnotation *))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:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(refresh:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withPointAnnotation:viewRef block:^(RNMBXPointAnnotation *view) {
         [view refresh];

package/ios/RNMBX/RNMBXShapeSource.swift

@@ -23,30 +23,14 @@ public class RNMBXShapeSource : RNMBXSource {
     }
   }
 
-  var shapeAnimator: ShapeAnimator? = nil
-  var shapeObject: GeoJSONObject? = nil
-
   @objc public var shape : String? {
     didSet {
-      shapeAnimator?.unsubscribe(consumer: self)
-      shapeAnimator = nil
-
-      if let shape = shape, ShapeAnimatorManager.shared.isShapeAnimatorTag(shape: shape), let animatedShape = ShapeAnimatorManager.shared.get(shape: shape) {
-        if let shapeAnimator = ShapeAnimatorManager.shared.get(shape: shape) {
-          self.shapeAnimator = shapeAnimator
-          shapeAnimator.subscribe(consumer: self)
-          
-          shapeUpdated(shape: shapeAnimator.getShape())
-        }
-      } else {
-        logged("RNMBXShapeSource.updateShape") {
-          let obj : GeoJSONObject = try parse(shape)
-          shapeObject = obj
-          
-          doUpdate { (style) in
-            logged("RNMBXShapeSource.setShape") {
-              try style.updateGeoJSONSource(withId: id, geoJSON: obj)
-            }
+      logged("RNMBXShapeSource.updateShape") {
+        let obj : GeoJSONObject = try parse(shape)
+
+        doUpdate { (style) in
+          logged("RNMBXShapeSource.setShape") {
+            try style.updateGeoJSONSource(withId: id, geoJSON: obj)
           }
         }
       }
@@ -87,10 +71,13 @@ public class RNMBXShapeSource : RNMBXSource {
     var result =  GeoJSONSource()
     #endif
 
-    if let shapeObject = shapeObject {
-      result.data = toGeoJSONSourceData(shapeObject)
-    } else {
-      result.data = emptyShape()
+    if let shape = shape {
+      do {
+        result.data = try parse(shape)
+      } catch {
+        Logger.log(level: .error, message: "Unable to read shape: \(shape) \(error) setting it to empty")
+        result.data = emptyShape()
+      }
     }
 
     if let url = url {
@@ -157,27 +144,12 @@ public class RNMBXShapeSource : RNMBXSource {
       try! style.setSourceProperty(for: id, property: property, value: value)
     }
   }
-  
-  deinit {
-    shapeAnimator?.unsubscribe(consumer: self)
-  }
 }
 
 // MARK: - parseJSON(url)
 
 extension RNMBXShapeSource
 {
-  func toGeoJSONSourceData(_ shape: GeoJSONObject) -> GeoJSONSourceData {
-    switch shape {
-    case .geometry(let geometry):
-      return .geometry(geometry)
-    case .feature(let feature):
-      return .feature(feature)
-    case .featureCollection(let features):
-      return .featureCollection(features)
-    }
-  }
-
   func parseJSON(_ url: String?, completion: @escaping (Result<GeoJSONObject, Error>) -> Void) {
     guard let url = url else { return }
 
@@ -327,6 +299,8 @@ extension MapboxMap {
                                    completion: completion)
     return DummyCancellable()
   }
+  
+  
 }
 #endif
 #endif
@@ -413,16 +387,3 @@ extension RNMBXShapeSource
     }
   }
 }
-
-// MARK: shape animation
-
-extension RNMBXShapeSource: ShapeAnimationConsumer {
-  func shapeUpdated(shape: Turf.GeoJSONObject) {
-    shapeObject = shape
-    doUpdate { (style) in
-      logged("RCTMGLShapeSource.setShape") {
-        try style.updateGeoJSONSource(withId: id, geoJSON: shape)
-      }
-    }
-  }
-}