macOS + Cassini compile fixes

maparoni · Sep 20, 2024 · 26c1b4f · 26c1b4f
1 parent fcdc6f1
commit 26c1b4f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Examples/Cassini/CassiniApp.swift b/Examples/Cassini/CassiniApp.swift
@@ -31,7 +31,7 @@ struct CassiniApp: App {
         name: "Continents",
         contents: try! GeoDrawer.Content.content(
           for: GeoDrawer.Content.countries(),
-          color: CassiniApp.Colors.continents.cgColor
+          style: .init(color: CassiniApp.Colors.continents.cgColor)
         ),
         color: CassiniApp.Colors.continents.cgColor
       )

diff --git a/Examples/Cassini/ContentView+Model.swift b/Examples/Cassini/ContentView+Model.swift
@@ -111,7 +111,7 @@ extension ContentView {
 
       layers.append(.init(
         name: preferredName ?? "New Layer",
-        contents: GeoDrawer.Content.content(for: geoJSON, color: color),
+        contents: GeoDrawer.Content.content(for: geoJSON, style: .init(color: color)),
         color: color
       ))
     }

diff --git a/Examples/Cassini/ContentView.swift b/Examples/Cassini/ContentView.swift
@@ -247,7 +247,7 @@ struct ContentView_Previews: PreviewProvider {
         name: "Continents",
         contents: try! GeoDrawer.Content.content(
           for: GeoDrawer.Content.countries(),
-          color: CassiniApp.Colors.continents.cgColor
+          style: .init(color: CassiniApp.Colors.continents.cgColor)
         ),
         color: CassiniApp.Colors.continents.cgColor
       )

diff --git a/Sources/GeoDrawer/GeoMap+AppKit.swift b/Sources/GeoDrawer/GeoMap+AppKit.swift
@@ -168,7 +168,10 @@ public struct GeoMap: NSViewRepresentable {
 struct GeoMap_Previews: PreviewProvider {
   static var previews: some View {
     GeoMap(
-      contents: try! GeoDrawer.Content.content(for: GeoDrawer.Content.countries(), color: .init(red: 0, green: 1, blue: 0, alpha: 0)),
+      contents: try! GeoDrawer.Content.content(
+        for: GeoDrawer.Content.countries(),
+        style: .init(color: .init(red: 0, green: 1, blue: 0, alpha: 0))
+      ),
       projection: Projections.Cassini()
     )
       .previewLayout(.fixed(width: 300, height: 300))