Update to SDK v0.8.0

app.xcodeproj/project.pbxproj

@@ -602,7 +602,7 @@
 			repositoryURL = "https://github.com/2gis/native-sdk-ios-swift-package.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.7.2;
+				version = 0.8.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/2gis/native-sdk-ios-swift-package.git",
         "state": {
           "branch": null,
-          "revision": "8a87d506a618134187410814aa10ec66fb4e8dc0",
-          "version": "0.7.2"
+          "revision": "6f770e55a6d65abfadb6fdfbbc364a6c26af3066",
+          "version": "0.8.0"
         }
       }
     ]

app.xcodeproj/xcshareddata/xcschemes/app.xcscheme

@@ -32,8 +32,8 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

app/Extensions/RenderedObjectInfo+Helpers.swift

@@ -6,19 +6,19 @@ extension RenderedObjectInfo: CustomStringConvertible {
 		let pointDescription = self.closestMapPoint.description
 		switch self.item.item {
 			case let dgisMapObject as DgisMapObject:
-				return "Id: \(dgisMapObject.id().value)"
+				return "Id: \(dgisMapObject.id.value)"
 			case let searchResult as SearchResultMarkerObject:
-				if let id = searchResult.id() {
+				if let id = searchResult.id {
 					return "Id: \(id.value)"
 				} else {
-					return searchResult.markerPosition().description
+					return searchResult.markerPosition.description
 				}
 			case let cluster as ClusterObject:
-				return "Objects count: \(cluster.objectCount())"
+				return "Objects count: \(cluster.objectCount)"
 			case let route as RouteMapObject:
-				return route.route()?.description ?? pointDescription
+				return route.route?.description ?? pointDescription
 			case let routePoint as RoutePointMapObject:
-				return routePoint.route()?.description ?? pointDescription
+				return routePoint.route?.description ?? pointDescription
 			case is MyLocationMapObject, is GeometryMapObject:
 				return pointDescription
 			default:

app/Extensions/TrafficRoute+Helpers.swift

@@ -3,6 +3,6 @@ import PlatformSDK
 extension TrafficRoute: CustomStringConvertible {
 
 	public var description: String {
-		"Distance: \(self.length().millimeters * 1000)m"
+		"Distance: \(self.length.millimeters * 1000)m"
 	}
 }

app/MapObjectCardView/MapObjectCardViewModel.swift

@@ -34,18 +34,23 @@ final class MapObjectCardViewModel: ObservableObject {
 			case let marker as Marker:
 				self.fetchInfo(marker: marker)
 			default:
-				self.fetchInfo(genericMapObject: mapObject)
+				self.fetchInfo(objectInfo: self.objectInfo)
 		}
 	}
 
 	private func fetchInfo(dgisMapObject object: DgisMapObject) {
-		self.getDirectoryObjectCancellable = object.directoryObject().sinkOnMainThread(
+		self.getDirectoryObjectCancellable = object.directoryObject.sinkOnMainThread(
 			receiveValue: {
 				[weak self] directoryObject in
 				guard let directoryObject = directoryObject else { return }
 
-				self?.title = directoryObject.title()
-				self?.description = "ID: \(object.id().value)"
+				self?.title = directoryObject.title
+				self?.description = """
+					\(directoryObject.subtitle)
+					\(directoryObject.formattedAddress(type: .short)?.streetAddress ?? "(no address)")
+					\(directoryObject.markerPosition?.description ?? "(no location)")
+					ID: \(object.id.value)
+					"""
 			},
 			failure: { error in
 				print("Unable to fetch a directory object. Error: \(error).")
@@ -59,7 +64,8 @@ final class MapObjectCardViewModel: ObservableObject {
 		self.description = "\(marker.position)"
 	}
 
-	private func fetchInfo(genericMapObject object: MapObject) {
-		self.title = String(describing: object)
+	private func fetchInfo(objectInfo: RenderedObjectInfo) {
+		self.title = String(describing: type(of: objectInfo))
+		self.description = String(describing: objectInfo)
 	}
 }

app/Marker/MarkerViewModel.swift

@@ -87,7 +87,7 @@ final class MarkerViewModel: ObservableObject {
 	}
 
 	func addMarkers(text: String) {
-		let flatPoint = self.map.camera.position().value.point
+		let flatPoint = self.map.camera.position.value.point
 		let point = GeoPointWithElevation(
 			latitude: flatPoint.latitude,
 			longitude: flatPoint.longitude

app/Route/RouteViewModel.swift

@@ -35,13 +35,13 @@ final class RouteViewModel: ObservableObject {
 	}
 
 	func setupPointA() {
-		_ = self.map.camera.position().sinkOnMainThread { [weak self] position in
+		_ = self.map.camera.position.sinkOnMainThread { [weak self] position in
 			self?.updatePointA(position.point)
 		}
 	}
 
 	func setupPointB() {
-		_ = self.map.camera.position().sinkOnMainThread { [weak self] position in
+		_ = self.map.camera.position.sinkOnMainThread { [weak self] position in
 			self?.updatePointB(position.point)
 		}
 	}

app/Search/DirectoryObjectViewModel.swift

@@ -7,9 +7,9 @@ struct DirectoryObjectViewModel {
 	let address: FormattedAddressViewModel?
 
 	init(object: DirectoryObject) {
-		self.navigationTitle = object.title()
-		self.title = object.title()
-		self.subtitle = object.subtitle()
+		self.navigationTitle = object.title
+		self.title = object.title
+		self.subtitle = object.subtitle
 
 		let formattedAddress = object.formattedAddress(type: .full)
 		self.address = formattedAddress.map(FormattedAddressViewModel.init)

app/Search/SearchResultItemViewModel.swift

@@ -9,8 +9,8 @@ struct SearchResultItemViewModel: Identifiable {
 	let object: DirectoryObjectViewModel
 
 	init(_ item: DirectoryObject) {
-		self.title = item.title()
-		self.subtitle = item.subtitle()
+		self.title = item.title
+		self.subtitle = item.subtitle
 		self.address = item.formattedAddress(type: .short)?.streetAddress
 		self.object = DirectoryObjectViewModel(object: item)
 	}

app/Search/SearchResultViewModel.swift

@@ -8,8 +8,7 @@ struct SearchResultViewModel {
 	}
 
 	init(_ result: SearchResult? = nil) {
-		self.items = result?.firstPage()?.items().compactMap({ $0 }).map(SearchResultItemViewModel.init)
-			?? []
+		self.items = result?.firstPage?.items.compactMap({ $0 }).map(SearchResultItemViewModel.init) ?? []
 	}
 }
 

app/Search/SearchService.swift

@@ -31,9 +31,9 @@ final class SearchService {
 					debugPrint(handler!)
 					dispatcher(.applyObjectSuggest(suggest))
 				case .performSearchHandler(let handler):
-					dispatcher(.searchQuery(handler!.searchQuery()!))
+					dispatcher(.searchQuery(handler!.searchQuery))
 				case .incompleteTextHandler(let handler):
-					dispatcher(.setQueryText(handler!.queryText()))
+					dispatcher(.setQueryText(handler!.queryText))
 				@unknown default:
 					fatalError()
 			}
@@ -63,7 +63,7 @@ final class SearchService {
 			let queryText = queryText
 			let builder = SearchQueryBuilder.fromQueryText(queryText: queryText)
 			let query = builder.build()
-			self.search(query: query!)(dispatcher)
+			self.search(query: query)(dispatcher)
 		}
 	}
 
@@ -98,7 +98,7 @@ final class SearchService {
 			guard !queryText.isEmpty else { return }
 
 			let builder = SuggestQueryBuilder.fromQueryText(queryText: queryText)
-			let query = builder.build()!
+			let query = builder.build()
 			self.suggest(query: query)(dispatcher)
 		}
 	}
@@ -113,7 +113,7 @@ final class SearchService {
 			let cancel = future.sink(receiveValue: {
 				[schedule = self.schedule] result in
 				schedule {
-					let suggestResultViewModel = self.makeSuggestResultViewModel(result: result!)
+					let suggestResultViewModel = self.makeSuggestResultViewModel(result: result)
 					dispatcher(.setSuggestResult(suggestResultViewModel))
 				}
 			}, failure: {

app/Search/SuggestResultViewModel.swift

@@ -12,7 +12,7 @@ struct SuggestResultViewModel {
 	init(
 		result: SuggestResult? = nil
 	) {
-		self.suggests = result?.suggests().compactMap({ $0 }).map(SuggestViewModel.init) ?? []
+		self.suggests = result?.suggests.compactMap({ $0 }).map(SuggestViewModel.init) ?? []
 	}
 }
 

app/Search/SuggestViewModel.swift

@@ -11,11 +11,11 @@ struct SuggestViewModel: Identifiable, Hashable {
 	let object: DirectoryObjectViewModel?
 
 	init(suggest: Suggest) {
-		self.title = suggest.title()
-		self.subtitle = suggest.subtitle()
-		self.applyHandler = suggest.handler()
-		self.icon = makeIcon(for: suggest.handler())
-		self.object = suggest.handler().object.map(DirectoryObjectViewModel.init)
+		self.title = suggest.title
+		self.subtitle = suggest.subtitle
+		self.applyHandler = suggest.handler
+		self.icon = makeIcon(for: suggest.handler)
+		self.object = suggest.handler.object.map(DirectoryObjectViewModel.init)
 	}
 
 	static func ==(_ lhs: Self, rhs: Self) -> Bool {
@@ -46,7 +46,7 @@ private extension SuggestHandler {
 	var object: DirectoryObject? {
 		switch self {
 			case .objectHandler(let handler):
-				return handler!.item()
+				return handler?.item
 			default:
 				return nil
 		}