Add mapViewModifier + Improve ShapeDataBuilder

Sources/MapLibreSwiftDSL/Data Sources.swift

@@ -46,9 +46,33 @@ public struct ShapeSource: Source {
 
 @resultBuilder
 public enum ShapeDataBuilder {
-    public static func buildBlock(_ components: MLNShape...) -> ShapeData {
-        let features = components.compactMap({ $0 as? MLNShape & MLNFeature })
-
+    // Handle a single MLNShape element
+    public static func buildExpression(_ expression: MLNShape) -> [MLNShape] {
+        return [expression]
+    }
+
+    public static func buildExpression(_ expression: [MLNShape]) -> [MLNShape] {
+        return expression
+    }
+
+    // Combine elements into an array
+    public static func buildBlock(_ components: [MLNShape]...) -> [MLNShape] {
+        return components.flatMap { $0 }
+    }
+
+    // Handle an array of MLNShape (if you want to directly pass arrays)
+    public static func buildArray(_ components: [MLNShape]) -> [MLNShape] {
+        return components
+    }
+
+    // Handle for in of MLNShape
+    public static func buildArray(_ components: [[MLNShape]]) -> [MLNShape] {
+        return components.flatMap { $0 }
+    }
+
+    // Convert the collected MLNShape array to ShapeData
+    public static func buildFinalResult(_ components: [MLNShape]) -> ShapeData {
+        let features = components.compactMap { $0 as? MLNShape & MLNFeature }
         if features.count == components.count {
             return .features(features)
         } else {

Sources/MapLibreSwiftUI/MapView.swift

@@ -9,6 +9,7 @@ public struct MapView: UIViewRepresentable {
 
     let styleSource: MapStyleSource
     let userLayers: [StyleLayerDefinition]
+    var mapViewModifier: ((MLNMapView) -> Void)?
 
     public init(
         styleURL: URL,
@@ -28,6 +29,27 @@ public struct MapView: UIViewRepresentable {
     ) {
         self.init(styleURL: styleURL, camera: .constant(initialCamera), makeMapContent)
     }
+
+    /// Allows you to set properties of the underlying MLNMapView directly.
+    /// Use this function to modify various properties of the MLNMapView instance.
+    /// For example, you can enable the display of the user's location on the map by setting `showUserLocation` to true.
+    ///
+    /// - Parameter modifier: A closure that provides you with an MLNMapView so you can set properties.
+    /// - Returns: A MapView with the modifications applied.
+    ///
+    /// Example:
+    /// ```swift
+    ///  MapView()
+    ///     .mapViewModifier { mapView in
+    ///         mapView.showUserLocation = true
+    ///     }
+    /// ```
+    ///
+    public func mapViewModifier(_ modifier: @escaping (MLNMapView) -> Void) -> MapView {
+        var newMapView = self
+        newMapView.mapViewModifier = modifier
+        return newMapView
+    }
 
     public class Coordinator: NSObject, MLNMapViewDelegate {
         var parent:  MapView
@@ -192,11 +214,14 @@ public struct MapView: UIViewRepresentable {
 
     public func updateUIView(_ mapView: MLNMapView, context: Context) {
         context.coordinator.parent = self
+        if let mapViewModifier {
+            mapViewModifier(mapView)
+        }
         // FIXME: This should be a more selective update
         context.coordinator.updateStyleSource(styleSource, mapView: mapView)
         context.coordinator.updateLayers(mapView: mapView)
 
-        // FIXME: This isn't exactly telling us if the *map* is loaded, and the docs for setCenter say it needs t obe.
+        // FIXME: This isn't exactly telling us if the *map* is loaded, and the docs for setCenter say it needs to be.
         let isStyleLoaded = mapView.style != nil
 
         context.coordinator.updateCamera(mapView: mapView,