Update standard & Standard Satellite config properties

Author: persidskiy

Sources/Examples/SwiftUI Examples/StandardStyleLocationsExample.swift

@@ -25,7 +25,8 @@ struct StandardStyleLocationsExample: View {
                 showTransitLabels: model.transitLabels,
                 showPlaceLabels: model.placeLabels,
                 showRoadLabels: model.roadLabels,
-                show3dObjects: model.show3DObjects)
+                show3dObjects: model.show3DObjects,
+                colorRoads: StyleColor(UIColor(cgColor: model.roadsColor.cgColor!)))
         case .standardSatellite:
             .standardSatellite(
                     lightPreset: model.lightPreset,
@@ -35,7 +36,8 @@ struct StandardStyleLocationsExample: View {
                     showPlaceLabels: model.placeLabels,
                     showRoadLabels: model.roadLabels,
                     showRoadsAndTransit: model.showRoadsAndTransit,
-                    showPedestrianRoads: model.showPedestrianRoads)
+                    showPedestrianRoads: model.showPedestrianRoads,
+                    colorRoads: StyleColor(UIColor(cgColor: model.roadsColor.cgColor!)))
         }
     }
 
@@ -83,6 +85,7 @@ class StandardStyleLocationsModel: ObservableObject {
     @Published var style: Style = .standard
     @Published var theme: StandardTheme = .default
     @Published var font: StandardFont = .dinPro
+    @Published var roadsColor = Color(hue: 224, saturation: 0.25, brightness: 0.8)
 
     enum Style {
         case standard
@@ -175,6 +178,8 @@ struct StandardStyleLocationsSettings: View {
                 }.pickerStyle(.menu)
             }
 
+            ColorPicker("Roads Color", selection: $model.roadsColor)
+
             ScrollView(.horizontal, showsIndicators: false) {
                 HStack {
                     Text("Labels")

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

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

Sources/MapboxMaps/Style/Generated/MapStyle+Standard.swift

@@ -2050,3 +2050,7 @@ Var BackgroundPitchAlignment.rawValue is now with @_documentation
 Var BackgroundPitchAlignment.rawValue is now with @_spi
 Var BackgroundPitchAlignment.viewport is now with @_documentation
 Var BackgroundPitchAlignment.viewport is now with @_spi
+
+#Update Standard and Standard Satellite config properties
+Func MapStyle.standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:show3dObjects:) has been renamed to Func standard(theme:lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showPedestrianRoads:show3dObjects:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabelSelect:colorRoads:colorTrunks:themeData:)
+Func MapStyle.standardSatellite(lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showRoadsAndTransit:showPedestrianRoads:) has been renamed to Func standardSatellite(lightPreset:font:showPointOfInterestLabels:showTransitLabels:showPlaceLabels:showRoadLabels:showRoadsAndTransit:showPedestrianRoads:colorMotorways:colorPlaceLabelHighlight:colorPlaceLabelSelect:colorRoads:colorTrunks:)