Upgrade to MapLibre SwiftUI 0.0.6

stadiamaps · Mar 10, 2024 · 032b702 · 032b702
1 parent 0b0362c
commit 032b702
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stadiamaps/maplibre-swift-macros.git",
       "state" : {
-        "revision" : "507939d324a6296554894e1a534bb3f9c91a82d8",
-        "version" : "0.0.1"
+        "revision" : "9f15cbb11d2b5248ead47aecae5be8a1d4d5f463",
+        "version" : "0.0.2"
       }
     },
     {
       "identity" : "maplibre-swiftui-dsl-playground",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stadiamaps/maplibre-swiftui-dsl-playground",
       "state" : {
-        "revision" : "8a9320d3d14a884405d427f1f89aa3617a48610e",
-        "version" : "0.0.3"
+        "revision" : "6b5950426cfdebd53821b8ea36cf08bb628a0466",
+        "version" : "0.0.6"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -30,7 +30,7 @@ if useLocalMapLibreSwiftUIDSL {
 } else {
     maplibreSwiftUIDSLPackage = .package(
         url: "https://github.com/stadiamaps/maplibre-swiftui-dsl-playground",
-        from: "0.0.2"
+        from: "0.0.6"
     )
 }
 

diff --git a/apple/Sources/FerrostarMapLibreUI/Layers/RouteStyleLayer.swift b/apple/Sources/FerrostarMapLibreUI/Layers/RouteStyleLayer.swift
@@ -56,19 +56,19 @@ public struct RouteStyleLayer: StyleLayerCollection {
 
         if let casingColor = style.casingColor {
             LineStyleLayer(identifier: "\(identifier)-casing", source: source)
-                .lineCap(constant: style.lineCap)
-                .lineJoin(constant: style.lineJoin)
-                .lineColor(constant: casingColor)
+                .lineCap(style.lineCap)
+                .lineJoin(style.lineJoin)
+                .lineColor(casingColor)
                 .lineWidth(interpolatedBy: .zoomLevel,
                            curveType: .exponential,
                            parameters: NSExpression(forConstantValue: 1.5),
                            stops: NSExpression(forConstantValue: [14: 6, 18: 24]))
         }
 
         LineStyleLayer(identifier: "\(identifier)-polyline", source: source)
-            .lineCap(constant: style.lineCap)
-            .lineJoin(constant: style.lineJoin)
-            .lineColor(constant: style.color)
+            .lineCap(style.lineCap)
+            .lineJoin(style.lineJoin)
+            .lineColor(style.color)
             .lineWidth(interpolatedBy: .zoomLevel,
                        curveType: .exponential,
                        parameters: NSExpression(forConstantValue: 1.5),

diff --git a/apple/Sources/FerrostarMapLibreUI/NavigationMapView.swift b/apple/Sources/FerrostarMapLibreUI/NavigationMapView.swift
@@ -64,8 +64,8 @@ public struct NavigationMapView: View {
                 }
 
                 SymbolStyleLayer(identifier: "user-location", source: userLocationSource)
-                    .iconImage(constant: UIImage(systemName: "location.north.circle.fill")!)
-                    .iconRotation(constant: Double(navigationState?.snappedLocation.courseOverGround?.degrees ?? 0))
+                    .iconImage(UIImage(systemName: "location.north.circle.fill")!)
+                    .iconRotation(Double(navigationState?.snappedLocation.courseOverGround?.degrees ?? 0))
             }
         }
         .edgesIgnoringSafeArea(.all)