renamed to unsafeViewModifier, added example, added test for ShapeSource

Sources/MapLibreSwiftUI/Examples/Layers.swift

@@ -58,6 +58,19 @@ struct Layer_Previews: PreviewProvider {
         }
             .ignoresSafeArea(.all)
             .previewDisplayName("Rotated Symbols (Dynamic)")
+
+        MapView(styleURL: demoTilesURL) {
+            // Demonstrates how to use the unsafeMapModifier to set MLNMapView properties that have not been exposed as modifiers yet.
+            SymbolStyleLayer(identifier: "simple-symbols", source: pointSource)
+                .iconImage(constant: UIImage(systemName: "mappin")!)
+        }
+        .unsafeMapViewModifier({ mapView in
+            // Not all properties have modifiers yet. Until they do, you can use this 'escape hatch' to the underlying MLNMapView. Be careful: if you modify properties that the DSL controls already, they may be overridden. This modifier is a "hack", not a final function.
+            mapView.logoView.isHidden = false
+            mapView.compassViewPosition = .topLeft
+        })
+        .ignoresSafeArea(.all)
+        .previewDisplayName("Unsafe MapView Modifier")
 
         // FIXME: This appears to be broken upstream; waiting for a new release
 //        MapView(styleURL: demoTilesURL) {

Sources/MapLibreSwiftUI/MapView.swift

@@ -9,7 +9,10 @@ public struct MapView: UIViewRepresentable {
 
     let styleSource: MapStyleSource
     let userLayers: [StyleLayerDefinition]
-    var mapViewModifier: ((MLNMapView) -> Void)?
+
+    /// 'Escape hatch' to MLNMapView until we have more modifiers.
+    /// See ``unsafeMapViewModifier(_:)``
+    private var unsafeMapViewModifier: ((MLNMapView) -> Void)?
 
     public init(
         styleURL: URL,
@@ -30,10 +33,17 @@ public struct MapView: UIViewRepresentable {
         self.init(styleURL: styleURL, camera: .constant(initialCamera), makeMapContent)
     }
 
-    /// Allows you to set properties of the underlying MLNMapView directly.
+    /// Allows you to set properties of the underlying MLNMapView directly
+    /// in cases where these have not been ported to DSL yet.
     /// 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.
     ///
+    /// This is an 'escape hatch' back to the non-DSL world
+    /// of MapLibre for features that have not been ported to DSL yet.
+    /// Be careful not to use this to modify properties that are
+    /// already ported to the DSL, like the camera for example, as your
+    /// modifications here may break updates that occur with modifiers.
+    ///
     /// - Parameter modifier: A closure that provides you with an MLNMapView so you can set properties.
     /// - Returns: A MapView with the modifications applied.
     ///
@@ -45,9 +55,9 @@ public struct MapView: UIViewRepresentable {
     ///     }
     /// ```
     ///
-    public func mapViewModifier(_ modifier: @escaping (MLNMapView) -> Void) -> MapView {
+    public func unsafeMapViewModifier(_ modifier: @escaping (MLNMapView) -> Void) -> MapView {
         var newMapView = self
-        newMapView.mapViewModifier = modifier
+        newMapView.unsafeMapViewModifier = modifier
         return newMapView
     }
 
@@ -214,9 +224,9 @@ public struct MapView: UIViewRepresentable {
 
     public func updateUIView(_ mapView: MLNMapView, context: Context) {
         context.coordinator.parent = self
-        if let mapViewModifier {
-            mapViewModifier(mapView)
-        }
+
+        unsafeMapViewModifier?(mapView)
+
         // FIXME: This should be a more selective update
         context.coordinator.updateStyleSource(styleSource, mapView: mapView)
         context.coordinator.updateLayers(mapView: mapView)

Tests/MapLibreSwiftDSLTests/ShapeSourceTests.swift

@@ -35,4 +35,24 @@ final class ShapeSourceTests: XCTestCase {
             XCTFail("Expected a feature source")
         }
     }
+
+    func testForInAndCombinationFeatureBuilder() throws {
+        // ShapeSource now accepts 'for in' building, arrays, and combinations of them
+        let shapeSource = ShapeSource(identifier: "foo") {
+            for coordinates in samplePedestrianWaypoints {
+                MLNPointFeature(coordinate: coordinates)
+            }
+            MLNPointFeature(coordinate: CLLocationCoordinate2D(latitude: 48.2082, longitude: 16.3719))
+        }
+
+        XCTAssertEqual(shapeSource.identifier, "foo")
+
+        switch shapeSource.data {
+        case .features(let features):
+            XCTAssertEqual(features.count, 48)
+        default:
+            XCTFail("Expected a feature source")
+        }
+    }
+
 }