From 511c2b9653e9583233f9e1622af7620ce5490e34 Mon Sep 17 00:00:00 2001
From: Vladimir Makarov <matteocarrera@mail.ru>
Date: Fri, 10 Mar 2023 17:38:35 +0100
Subject: [PATCH] Optional for `placemarkPosition` removed

---
 TIAppleMapUtils/Sources/AppleClusterPlacemarkManager.swift   | 3 ++-
 TIGoogleMapUtils/Sources/GoogleClusterPlacemarkManager.swift | 3 ++-
 TIMapUtils/Sources/Managers/BasePlacemarkManager.swift       | 4 ++--
 TIMapUtils/Sources/Managers/PlacemarkManager.swift           | 2 +-
 TIYandexMapUtils/Sources/YandexClusterPlacemarkManager.swift | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/TIAppleMapUtils/Sources/AppleClusterPlacemarkManager.swift b/TIAppleMapUtils/Sources/AppleClusterPlacemarkManager.swift
index f672f83b..35d4e8c8 100644
--- a/TIAppleMapUtils/Sources/AppleClusterPlacemarkManager.swift
+++ b/TIAppleMapUtils/Sources/AppleClusterPlacemarkManager.swift
@@ -40,7 +40,8 @@ open class AppleClusterPlacemarkManager<Model>: BaseClusterPlacemarkManager<MKAn
 
         self.mapViewDelegate = mapViewDelegate
 
-        super.init(dataModel: placemarkManagers,
+        super.init(placemarkPosition: .from(coordinates: placemarkManagers.map(\.placemarkPosition)),
+                   dataModel: placemarkManagers,
                    iconFactory: iconFactory?.asAnyMarkerIconFactory { $0.map { $0.dataModel } },
                    tapHandler: tapHandler)
     }
diff --git a/TIGoogleMapUtils/Sources/GoogleClusterPlacemarkManager.swift b/TIGoogleMapUtils/Sources/GoogleClusterPlacemarkManager.swift
index c1c715cc..be0180af 100644
--- a/TIGoogleMapUtils/Sources/GoogleClusterPlacemarkManager.swift
+++ b/TIGoogleMapUtils/Sources/GoogleClusterPlacemarkManager.swift
@@ -46,7 +46,8 @@ open class GoogleClusterPlacemarkManager<Model>: BaseClusterPlacemarkManager<GMS
                                        mapDelegate: GMSMapViewDelegate? = nil,
                                        tapHandler: TapHandlerClosure?) where IF.Model == [Model] {
 
-        super.init(dataModel: placemarkManagers,
+        super.init(placemarkPosition: .from(coordinates: placemarkManagers.map(\.placemarkPosition)) ?? .init(),
+                   dataModel: placemarkManagers,
                    iconFactory: iconFactory?.asAnyMarkerIconFactory { $0.map { $0.dataModel } },
                    tapHandler: tapHandler)
 
diff --git a/TIMapUtils/Sources/Managers/BasePlacemarkManager.swift b/TIMapUtils/Sources/Managers/BasePlacemarkManager.swift
index 519d3452..e50c9552 100644
--- a/TIMapUtils/Sources/Managers/BasePlacemarkManager.swift
+++ b/TIMapUtils/Sources/Managers/BasePlacemarkManager.swift
@@ -30,7 +30,7 @@ open class BasePlacemarkManager<Placemark, DataModel, Location>: NSObject, Place
     open var state: MarkerState = .default
     
     /// Point (coordinates) itself of the current placemark manager
-    public let placemarkPosition: Location?
+    public let placemarkPosition: Location
     
     /// Model for the current placemark manager
     public let dataModel: DataModel
@@ -38,7 +38,7 @@ open class BasePlacemarkManager<Placemark, DataModel, Location>: NSObject, Place
     public var tapHandler: TapHandlerClosure?
     public var iconFactory: AnyMarkerIconFactory<DataModel>?
 
-    public init(placemarkPosition: Location? = nil,
+    public init(placemarkPosition: Location,
                 dataModel: DataModel,
                 iconFactory: AnyMarkerIconFactory<DataModel>?,
                 tapHandler: TapHandlerClosure?) {
diff --git a/TIMapUtils/Sources/Managers/PlacemarkManager.swift b/TIMapUtils/Sources/Managers/PlacemarkManager.swift
index 98731ad3..9be97560 100644
--- a/TIMapUtils/Sources/Managers/PlacemarkManager.swift
+++ b/TIMapUtils/Sources/Managers/PlacemarkManager.swift
@@ -26,7 +26,7 @@ public protocol PlacemarkManager: AnyObject {
 
     typealias TapHandlerClosure = (DataModel, Position) -> Bool
 
-    var placemarkPosition: Position? { get }
+    var placemarkPosition: Position { get }
     var dataModel: DataModel { get }
     var state: MarkerState { get set }
     
diff --git a/TIYandexMapUtils/Sources/YandexClusterPlacemarkManager.swift b/TIYandexMapUtils/Sources/YandexClusterPlacemarkManager.swift
index 84d6ede1..87a2bf73 100644
--- a/TIYandexMapUtils/Sources/YandexClusterPlacemarkManager.swift
+++ b/TIYandexMapUtils/Sources/YandexClusterPlacemarkManager.swift
@@ -37,7 +37,8 @@ open class YandexClusterPlacemarkManager<Model>: BaseClusterPlacemarkManager<YMK
                                        iconFactory: IF?,
                                        tapHandler: TapHandlerClosure?) where IF.Model == [Model] {
 
-        super.init(dataModel: placemarkManagers,
+        super.init(placemarkPosition: placemarkManagers.map(\.placemarkPosition),
+                   dataModel: placemarkManagers,
                    iconFactory: iconFactory?.asAnyMarkerIconFactory { $0.map { $0.dataModel } },
                    tapHandler: tapHandler)
     }