npm - @rnmapbox/maps - Versions diffs - 10.2.10 → 10.3.0-beta.1 - Mend

@rnmapbox/maps 10.2.10 → 10.3.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (353) hide show

package/ios/RNMBX/RNMBXImageSourceComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXImageSourceComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -103,4 +102,3 @@ Class<RCTComponentViewProtocol> RNMBXImageSourceCls(void)
   return RNMBXImageSourceComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXImages.swift CHANGED Viewed

@@ -5,16 +5,10 @@ protocol RNMBXImageSetter : AnyObject {
 }
 func hasImage(style: Style, name: String) -> Bool {
-  #if RNMBX_11
   return style.imageExists(withId: name)
-  #else
-  return (style.styleManager.getStyleImage(forImageId: name) != nil)
-  #endif
 }
-#if RNMBX_11
 typealias StyleImageMissingPayload = StyleImageMissing
-#endif
 open class RNMBXImages : UIView, RNMBXMapComponent {

package/ios/RNMBX/RNMBXImagesComponentView.h CHANGED Viewed

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import <UIKit/UIKit.h>
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 NS_ASSUME_NONNULL_END
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXImagesComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXImagesComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -112,4 +111,3 @@ Class<RCTComponentViewProtocol> RNMBXImagesCls(void)
   return RNMBXImagesComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXLayer.swift CHANGED Viewed

@@ -6,11 +6,7 @@ protocol RNMBXSourceConsumer : class {
 }
 func styleLayerExists(_ style: Style, id: String) -> Bool {
-  #if RNMBX_11
   return style.layerExists(withId: id)
-  #else
-  return style.styleManager.styleLayerExists(forLayerId: id)
-  #endif
 }
 @objc(RNMBXLayer)
@@ -258,7 +254,6 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     removeFromMap(style)
   }
-  #if RNMBX_11
   func _toSlot(_ slot: String) -> Slot? {
     switch slot {
     case "top":
@@ -271,7 +266,6 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       return Slot(rawValue: slot);
     }
   }
-  #endif
   func setBaseOptions<T: Layer>(_ layer: inout T) {
     if let minZoom = minZoomLevel {
@@ -282,36 +276,13 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
       layer.maxZoom = maxZoom.doubleValue
     }
-    #if RNMBX_11
     if let slot = slot {
       layer.slot = _toSlot(slot)
     }
-    #endif
   }
   func setOptions(_ layer: inout Layer) {
     setBaseOptions(&layer)
-    #if !RNMBX_11
-    if let sourceLayerID = sourceLayerID {
-      layer.sourceLayer = sourceLayerID
-    }
-    if let sourceID = sourceID {
-      if !(existingLayer && sourceID == DEFAULT_SOURCE_ID) && hasSource() {
-        layer.source = sourceID
-      }
-    }
-    if let filter = filter, filter.count > 0 {
-      do {
-        let data = try JSONSerialization.data(withJSONObject: filter, options: .prettyPrinted)
-        let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-        layer.filter = decodedExpression
-      } catch {
-        Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
-      }
-    }
-    #endif
   }
   private func optionsChanged() {
@@ -381,14 +352,8 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
   }
 }
-#if RNMBX_11
 protocol LayerWithSource : Layer {
   var source: String? { get set }
   var sourceLayer: String? { get set }
   var filter: MapboxMaps.Expression? { get set}
 }
-#else
-protocol LayerWithSource : Layer {
-}
-#endif

package/ios/RNMBX/RNMBXLight.swift CHANGED Viewed

@@ -1,8 +1,6 @@
 import MapboxMaps
-#if RNMBX_11
 typealias Light = FlatLight
-#endif
 @objc(RNMBXLight)
 public class RNMBXLight: UIView, RNMBXMapComponent {
@@ -21,14 +19,8 @@ public class RNMBXLight: UIView, RNMBXMapComponent {
   }
   func apply(light: Light) {
-    let lightData = try! JSONEncoder().encode(light)
-    let lightDictionary = try! JSONSerialization.jsonObject(with: lightData)
     logged("RNMBXLight.apply") {
-#if RNMBX_11
       try self.map.setLights(light)
-#else
-      try! self.map.style.setLight(properties: lightDictionary as! [String:Any])
-#endif
     }
   }

package/ios/RNMBX/RNMBXLightComponentView.h CHANGED Viewed

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import <UIKit/UIKit.h>
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 NS_ASSUME_NONNULL_END
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXLightComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXLightComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -71,4 +70,3 @@ Class<RCTComponentViewProtocol> RNMBXLightCls(void)
   return RNMBXLightComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXLineLayer.swift CHANGED Viewed

@@ -6,11 +6,7 @@ public class RNMBXLineLayer: RNMBXVectorLayer {
   override func makeLayer(style: Style) throws -> Layer {
     let vectorSource : VectorSource = try self.layerWithSourceID(in: style)
-    #if RNMBX_11
     var layer = LayerType(id: self.id!, source: sourceID!)
-    #else
-    var layer = LayerType(id: self.id!)
-    #endif
     layer.sourceLayer = self.sourceLayerID
     layer.source = sourceID
     return layer
@@ -24,7 +20,6 @@ public class RNMBXLineLayer: RNMBXVectorLayer {
   func setCommonOptions(_ layer: inout LineLayer) -> Bool {
     var changed = false
-    #if RNMBX_11
     if let sourceLayerID = sourceLayerID {
       layer.sourceLayer = sourceLayerID
       changed = true
@@ -47,7 +42,6 @@ public class RNMBXLineLayer: RNMBXVectorLayer {
         Logger.log(level: .error, message: "parsing filters failed for layer \(optional: id): \(error.localizedDescription)")
       }
     }
-    #endif
     return changed
   }

package/ios/RNMBX/RNMBXLineLayerComponentView.h CHANGED Viewed

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 #import <UIKit/UIKit.h>
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 NS_ASSUME_NONNULL_END
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXLineLayerComponentView.mm CHANGED Viewed

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNMBXLineLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -73,4 +72,3 @@ Class<RCTComponentViewProtocol> RNMBXLineLayerCls(void)
   return RNMBXLineLayerComponentView.class;
 }
-#endif // RCT_NEW_ARCH_ENABLED