Improve internal Logger (#2361)

Author: OdNairy

Sources/MapboxMaps/Annotations/Annotation.swift

@@ -87,7 +87,7 @@ extension Array where Element: Annotation {
         let duplicates = self.removeDuplicates(by: \.id)
         if !duplicates.isEmpty {
             let ids = duplicates.lazy.map(\.id).joined(separator: ", ")
-            Log.error(forMessage: "Duplicated annotations: \(ids)", category: "Annotations")
+            Log.error("Duplicated annotations: \(ids)", category: "Annotations")
         }
     }
 }

Sources/MapboxMaps/Annotations/AnnotationImagesManager.swift

@@ -60,7 +60,7 @@ internal final class AnnotationImagesManager: AnnotationImagesManagerProtocol {
             addedAnnotationImages.insert(id)
         } catch {
             Log.warning(
-                forMessage: "Could not add image to style due to error: \(error)",
+                "Could not add image to style due to error: \(error)",
                 category: "Annnotations")
         }
     }
@@ -75,7 +75,7 @@ internal final class AnnotationImagesManager: AnnotationImagesManagerProtocol {
             addedAnnotationImages.remove(imageName)
         } catch {
             Log.warning(
-                forMessage: "Could not remove image from style due to error: \(error)",
+                "Could not remove image from style due to error: \(error)",
                 category: "Annnotations")
         }
     }

Sources/MapboxMaps/Annotations/AnnotationManagerImpl.swift

@@ -96,7 +96,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
             do {
                 try style.moveLayer(withId: id, to: layerPosition ?? .default)
             } catch {
-                Log.error(forMessage: "Failed to mover layer to a new position. Error: \(error)", category: "Annotations")
+                Log.error("Failed to mover layer to a new position. Error: \(error)", category: "Annotations")
             }
         }
     }
@@ -135,7 +135,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
             try style.addPersistentLayer(layer, layerPosition: layerPosition)
         } catch {
             Log.error(
-                forMessage: "Failed to create source / layer in \(implementationName). Error: \(error)",
+                "Failed to create source / layer in \(implementationName). Error: \(error)",
                 category: "Annotations")
         }
 
@@ -160,7 +160,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
             )
         } catch {
             Log.error(
-                forMessage: "Failed to add cluster layer in \(implementationName). Error: \(error)",
+                "Failed to add cluster layer in \(implementationName). Error: \(error)",
                 category: "Annotations")
         }
     }
@@ -197,7 +197,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
             try style.removeLayer(withId: "mapbox-iOS-cluster-text-layer-manager-" + id)
         } catch {
             Log.error(
-                forMessage: "Failed to remove cluster layer in \(implementationName). Error: \(error)",
+                "Failed to remove cluster layer in \(implementationName). Error: \(error)",
                 category: "Annotations")
         }
     }
@@ -232,7 +232,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
                 try body()
             } catch {
                 Log.warning(
-                    forMessage: "Failed to remove \(what) for \(implementationName) with id \(id) due to error: \(error)",
+                    "Failed to remove \(what) for \(implementationName) with id \(id) due to error: \(error)",
                     category: "Annotations")
             }
         }
@@ -326,7 +326,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
             }
         } catch {
             Log.error(
-                forMessage: "Could not set layer properties in PointAnnotationManager due to error \(error)",
+                "Could not set layer properties in PointAnnotationManager due to error \(error)",
                 category: "Annotations")
         }
     }
@@ -500,7 +500,7 @@ final class AnnotationManagerImpl<AnnotationType: Annotation & AnnotationInterna
                 try style.addSource(GeoJSONSource(id: dragId))
                 try style.addPersistentLayer(AnnotationType.makeLayer(id: dragId), layerPosition: .above(id))
             } catch {
-                Log.error(forMessage: "Add drag source/layer \(error)", category: "Annotations")
+                Log.error("Add drag source/layer \(error)", category: "Annotations")
             }
         }
     }

Sources/MapboxMaps/Annotations/AnnotationOrchestrator.swift

@@ -170,7 +170,7 @@ public final class AnnotationOrchestrator {
 
         if let manager, warnIfRemoved {
             Log.warning(
-                forMessage: "\(type(of: manager)) with id \(id) was removed implicitly when invoking \(function) with the same id.",
+                "\(type(of: manager)) with id \(id) was removed implicitly when invoking \(function) with the same id.",
                 category: "Annotations")
         }
     }

Sources/MapboxMaps/Annotations/ViewAnnotation.swift

@@ -357,7 +357,7 @@ public final class ViewAnnotation {
         do {
             try body()
         } catch {
-            Log.error(forMessage: "Failed to \(action) annotation \(id): \(error)", category: "ViewAnnotation")
+            Log.error("Failed to \(action) annotation \(id): \(error)", category: "ViewAnnotation")
         }
     }
 

Sources/MapboxMaps/Annotations/ViewAnnotationManager.swift

@@ -580,7 +580,7 @@ extension ViewAnnotationManager {
 func validateAnnotationSuperview(_ view: UIView, expected: UIView?) {
     // Re-add the view if the superview of the annotation view is different than the container
     if view.superview != expected {
-        Log.warning(forMessage: "Superview changed for annotation view. Use `ViewAnnotationManager.remove(_ view: UIView)` instead to remove it from the layout calculation.", category: "Annotations")
+        Log.warning("Superview changed for annotation view. Use `ViewAnnotationManager.remove(_ view: UIView)` instead to remove it from the layout calculation.", category: "Annotations")
         view.removeFromSuperview()
         expected?.addSubview(view)
     }
@@ -589,7 +589,7 @@ func validateAnnotationSuperview(_ view: UIView, expected: UIView?) {
 func validateAnnotationHidden(_ view: UIView, expected: Bool) {
     // View is still considered for layout calculation, users should not modify the visibility of view directly
     if view.isHidden != expected {
-        Log.warning(forMessage: "Visibility changed for annotation view. Use `ViewAnnotationManager.update(view: UIView, options: ViewAnnotationOptions)` instead to update visibility and remove the view from layout calculation.", category: "Annotations")
+        Log.warning("Visibility changed for annotation view. Use `ViewAnnotationManager.update(view: UIView, options: ViewAnnotationOptions)` instead to update visibility and remove the view from layout calculation.", category: "Annotations")
         view.isHidden = expected
     }
 }

Sources/MapboxMaps/Camera/SimpleCameraAnimator.swift

@@ -44,7 +44,7 @@ internal final class SimpleCameraAnimator: SimpleCameraAnimatorProtocol {
                 hasNilMismatch(for: \.anchor) ||
                 hasNilMismatch(for: \.bearing) ||
                 hasNilMismatch(for: \.pitch) {
-                Log.warning(forMessage: "Animator updated with differing non-nil to-value properties.", category: "maps-ios")
+                Log.warning("Animator updated with differing non-nil to-value properties.", category: "maps-ios")
             }
         }
     }

Sources/MapboxMaps/ContentBuilders/MapContent/MapContentUniqueProperties.swift

@@ -81,7 +81,7 @@ extension MapContentUniqueProperties {
                 case .flat:
                     lights.flat = try? lightContainer.decode(FlatLight.self)
                 default:
-                    Log.warning(forMessage: "Incorrect light configuration. Specify both directional and ambient lights OR flat light.", category: "StyleDSL")
+                    Log.warning("Incorrect light configuration. Specify both directional and ambient lights OR flat light.", category: "StyleDSL")
                 }
             }
         }
@@ -96,7 +96,7 @@ private extension MapContentUniqueProperties.Lights {
                     os_log(.debug, log: .contentDSL, "set 3d lights")
                     try style.setLights(ambient: ambient, directional: directional)
                 } else if directional != nil || ambient != nil {
-                    Log.warning(forMessage: "Incorrect 3D light configuration. Specify both directional and ambient lights.", category: "StyleDSL")
+                    Log.warning("Incorrect 3D light configuration. Specify both directional and ambient lights.", category: "StyleDSL")
                 } else if let flat = flat {
                     os_log(.debug, log: .contentDSL, "set flat light")
                     try style.setLights(flat)

Sources/MapboxMaps/ContentBuilders/MapContent/MapStyleReconciler.swift

@@ -124,7 +124,7 @@ extension MapStyleReconciler {
                 }
             }
         } catch {
-            Log.error(forMessage: "Failed updating import config properties, \(error)")
+            Log.error("Failed updating import config properties, \(error)")
         }
     }
 }

Sources/MapboxMaps/ContentBuilders/MapContent/MountedViewAnnotation.swift

@@ -70,7 +70,7 @@ final class MountedViewAnnotation: MapContentMountedComponent {
 
     func unmount(with context: MapContentNodeContext) throws {
         guard let remove else {
-            return Log.error(forMessage: "Could not remove the view annotation", category: "Annotations")
+            return Log.error("Could not remove the view annotation", category: "Annotations")
         }
         remove()
     }