Generate Standard Style types

.pre-commit-config.yaml

@@ -7,6 +7,7 @@ repos:
     - id: trailing-whitespace
       exclude: LICENSE.md
     - id: end-of-file-fixer
+      exclude: ".*.list"
     - id: check-yaml
     - id: check-json
       exclude: .vscode/.*.json

Apps/Examples/Examples/SwiftUI Examples/StandardStyleLocationsExample.swift

@@ -21,6 +21,7 @@ struct StandardStyleLocationsExample: View {
             .standard(
                 theme: model.theme,
                 lightPreset: model.lightPreset,
+                font: model.font,
                 showPointOfInterestLabels: model.poi,
                 showTransitLabels: model.transitLabels,
                 showPlaceLabels: model.placeLabels,
@@ -29,6 +30,7 @@ struct StandardStyleLocationsExample: View {
         case .standardSatellite:
             .standardSatellite(
                     lightPreset: model.lightPreset,
+                    font: model.font,
                     showPointOfInterestLabels: model.poi,
                     showTransitLabels: model.transitLabels,
                     showPlaceLabels: model.placeLabels,
@@ -82,6 +84,7 @@ class StandardStyleLocationsModel: ObservableObject {
     @Published var viewport: Viewport = Location.all.first!.viewport
     @Published var style: Style = .standard
     @Published var theme: StandardTheme = .default
+    @Published var font: StandardFont = .dinPro
 
     enum Style {
         case standard
@@ -143,6 +146,38 @@ struct StandardStyleLocationsSettings: View {
                 }
             }
 
+            HStack {
+                Text("Font")
+                Spacer()
+                Picker("Font", selection: $model.font) {
+                    Text("Alegreya").tag(StandardFont.alegreya)
+                    Text("Alegreya SC").tag(StandardFont.alegreyaSc)
+                    Text("Asap").tag(StandardFont.asap)
+                    Text("Barlow").tag(StandardFont.barlow)
+                    Text("DIN Pro").tag(StandardFont.dinPro)
+                    Text("EB Garamond").tag(StandardFont.ebGaramond)
+                    Text("Faustina").tag(StandardFont.faustina)
+                    Text("Frank Ruhl Libre").tag(StandardFont.frankRuhlLibre)
+                    Text("Heebo").tag(StandardFont.heebo)
+                    Text("Inter").tag(StandardFont.inter)
+                    Text("Lato").tag(StandardFont.lato)
+                    Text("League Mono").tag(StandardFont.leagueMono)
+                    Text("Montserrat").tag(StandardFont.montserrat)
+                    Text("Manrope").tag(StandardFont.manrope)
+                    Text("Noto Sans CJK JP").tag(StandardFont.notoSansCjkJp)
+                    Text("Open Sans").tag(StandardFont.openSans)
+                    Text("Poppins").tag(StandardFont.poppins)
+                    Text("Raleway").tag(StandardFont.raleway)
+                    Text("Roboto").tag(StandardFont.roboto)
+                    Text("Roboto Mono").tag(StandardFont.robotoMono)
+                    Text("Rubik").tag(StandardFont.rubik)
+                    Text("Source Code Pro").tag(StandardFont.sourceCodePro)
+                    Text("Source Sans Pro").tag(StandardFont.sourceSansPro)
+                    Text("Spectral").tag(StandardFont.spectral)
+                    Text("Ubuntu").tag(StandardFont.ubuntu)
+                }.pickerStyle(.menu)
+            }
+
             ScrollView(.horizontal, showsIndicators: false) {
                 HStack {
                     Text("Labels")

CHANGELOG.md

@@ -4,6 +4,16 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## main
 
+* Generate `MapStyle.standard` and `MapStyle.standardSatellite` from the style specification. Added the new `StandardFont` type to represent the font family in these configurations. If you used a string variable, update your code:
+```swift
+// Old:
+Map().mapStyle(.standard(font: fontValue))
+/// New:
+Map().mapStyle(.standard(font: StandardFont(rawValue: fontValue)))
+Map().mapStyle(.standard(font: .lato))
+```
+
+
 ## 11.7.0 - 26 September, 2024
 
 * Fix the bug where displaying ViewAnnotation and setting a feature state simultaneously could result in an unapplied feature state.

Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md

@@ -20,6 +20,7 @@
 - ``LightType``
 - ``StandardLightPreset``
 - ``StandardTheme``
+- ``StandardFont``
 - ``StyleProjection``
 - ``StyleProjectionName``
 - ``CancelError``

Sources/MapboxMaps/Foundation/Extensions/JSONObject+Extensions.swift

@@ -0,0 +1,13 @@
+extension JSONObject {
+    mutating func encode(key: String, value: Bool?) {
+        if let value {
+            self[key] = .boolean(value)
+        }
+    }
+
+    mutating func encode<T>(key: String, value: T?) where T: RawRepresentable, T.RawValue == String {
+        if let value {
+            self[key] = .string(value.rawValue)
+        }
+    }
+}