🔖 1.1.0 [ci skip]

Author: fonok3

Sources/GMMapUtility/Camera/CameraConfiguration.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+public struct CameraConfiguration {
+    public enum Perspective: Int, CaseIterable, Codable {
+        case threeDimensional
+        case twoDimensional
+        case twoDimensionalNorth
+    }
+
+    // MARK: Lifecycle
+
+    public init(zoomLevelOffset: Double = 0, perspective: Perspective = .threeDimensional) {
+        self.zoomLevelOffset = zoomLevelOffset
+        self.perspective = perspective
+    }
+
+    // MARK: Public
+
+    public let zoomLevelOffset: Double
+    public let perspective: Perspective
+}

Sources/GMMapUtility/Camera/CameraConfigurationProvider.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+public protocol CameraConfigurationProvider {
+    var cameraConfiguration: CameraConfiguration { get }
+}

Sources/GMMapUtility/Camera/StaticCameraConfigurationProvider.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+public final class StaticCameraConfigurationProvider: CameraConfigurationProvider {
+    // MARK: Lifecycle
+
+    public init(cameraConfiguration: CameraConfiguration = CameraConfiguration()) {
+        self.cameraConfiguration = cameraConfiguration
+    }
+
+    // MARK: Public
+
+    public let cameraConfiguration: CameraConfiguration
+}

Sources/GMMapUtility/Layers/Handler/AggregatingMGLStyleLayersHandler.swift

@@ -6,10 +6,11 @@ open class AggregatingMGLStyleLayersHandler: MGLStyleLayersHandler {
 
     public init(
         mapLayerManager: MapboxMapLayerManager?,
+        mapTheme: MapTheme,
         layerHandlers: [MGLStyleLayersHandler]
     ) {
         self.layerHandlers = layerHandlers
-        super.init(mapLayerManager: mapLayerManager)
+        super.init(mapLayerManager: mapLayerManager, mapTheme: mapTheme)
     }
 
     override open func setup() {

Sources/GMMapUtility/Layers/Handler/MapLayerHandler.swift

@@ -4,6 +4,8 @@ import Foundation
 ///
 /// - note: A `MapLayerHandler` may be self updating to model changes or receive udpates from outside. Often these two purposes are split up.
 public protocol MapLayerHandler {
+    var mapTheme: MapTheme { get }
+
     /// One time setup for all needed resources for handling the layer, e.g. images, sources.
     func setup()
 

Sources/GMMapUtility/MapLibre/Layers/MGLMapViewLifeCycleHandler.swift

@@ -18,6 +18,15 @@ public final class MGLMapViewLifeCycleHandler: NSObject {
     public weak var mapView: MGLMapView?
 
     private var currentLayersController: MGLStyleLayersHandler?
+    private var layerUpdatesPaused = true {
+        didSet {
+            if layerUpdatesPaused {
+                currentLayersController?.stopLayerUpdates()
+            } else {
+                currentLayersController?.startLayerUpdates()
+            }
+        }
+    }
 
     private lazy var mapTapGestureRecognizer: UITapGestureRecognizer = {
         let recognizer = UITapGestureRecognizer(target: self, action: #selector(didTapMapView(sender:)))
@@ -53,16 +62,16 @@ public final class MGLMapViewLifeCycleHandler: NSObject {
 extension MGLMapViewLifeCycleHandler {
     /// This methods pauses all layer updates.
     ///
-    /// - note: This may be called if the map is not visible.
+    /// - note: This shoud be called if the map is not visible.
     public func pauseLayerUpdates() {
-        currentLayersController?.startLayerUpdates()
+        layerUpdatesPaused = true
     }
 
     /// This methods resumes all layer updates.
     ///
-    /// - note: This may be called if the map becomes visible.
+    /// - note: This should be called if the map becomes visible.
     public func resumeLayerUpdates() {
-        currentLayersController?.stopLayerUpdates()
+        layerUpdatesPaused = false
     }
 }
 
@@ -78,7 +87,10 @@ extension MGLMapViewLifeCycleHandler {
         )
 
         currentLayersController?.setup()
-        currentLayersController?.startLayerUpdates()
+
+        if !layerUpdatesPaused {
+            currentLayersController?.startLayerUpdates()
+        }
     }
 
     private func localize(style: MGLStyle) {

Sources/GMMapUtility/MapLibre/Layers/MGLStyleLayersHandler.swift

@@ -2,12 +2,15 @@ import Foundation
 import Mapbox
 
 open class MGLStyleLayersHandler: MapLayerHandler {
+    public private(set) var mapTheme: MapTheme
+
     public private(set) var mapLayerManager: MapboxMapLayerManager?
 
     open var interactionLayerIdentifiers: Set<String> { Set<String>([]) }
 
-    public init(mapLayerManager: MapboxMapLayerManager?) {
+    public init(mapLayerManager: MapboxMapLayerManager?, mapTheme: MapTheme) {
         self.mapLayerManager = mapLayerManager
+        self.mapTheme = mapTheme
     }
 
     // MARK: - User Interaction