Skip to content

Fix desired accuracy initialiser #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 29, 2022
Merged

Fix desired accuracy initialiser #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5a0401
Fixed desiredAccuracy not being set when using convenience initialiser.
AndrewDodd42 Nov 21, 2022
31aca10
Added test of desired accuracy setting.
AndrewDodd42 Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions Sources/AsyncLocationKit/AsyncLocationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,19 @@ public final class AsyncLocationManager {
private var locationManager: CLLocationManager
private var proxyDelegate: AsyncDelegateProxyInterface
private var locationDelegate: CLLocationManagerDelegate
private var desiredAccuracy: LocationAccuracy = .bestAccuracy

public init() {
locationManager = CLLocationManager()
proxyDelegate = AsyncDelegateProxy()
locationDelegate = LocationDelegate(delegateProxy: proxyDelegate)
locationManager.delegate = locationDelegate
locationManager.desiredAccuracy = desiredAccuracy.convertingAccuracy
public convenience init(desiredAccuracy: LocationAccuracy = .bestAccuracy) {
self.init(locationManager: CLLocationManager(), desiredAccuracy: desiredAccuracy)
}
public init(locationManager: CLLocationManager, desiredAccuracy: LocationAccuracy) {

public init(locationManager: CLLocationManager, desiredAccuracy: LocationAccuracy = .bestAccuracy) {
self.locationManager = locationManager
proxyDelegate = AsyncDelegateProxy()
locationDelegate = LocationDelegate(delegateProxy: proxyDelegate)
self.locationManager.delegate = locationDelegate
self.locationManager.desiredAccuracy = desiredAccuracy.convertingAccuracy
}

public convenience init(desiredAccuracy: LocationAccuracy) {
self.init()
self.desiredAccuracy = desiredAccuracy
}

public func getAuthorizationStatus() -> CLAuthorizationStatus {
if #available(iOS 14, *) {
Expand Down
13 changes: 12 additions & 1 deletion Tests/AsyncLocationKitTests/AsyncLocationKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@ import CoreLocation
@testable import AsyncLocationKit

final class AsyncLocationKitTests: XCTestCase {
let locationManager = AsyncLocationManager(locationManager: MockLocationManager(), desiredAccuracy: .bestAccuracy)
static let mockLocationManager = MockLocationManager()

func testDesiredAccuracy() {
let firstAccuracy: LocationAccuracy = .nearestTenMetersAccuracy
let locationManager = AsyncLocationManager(locationManager: AsyncLocationKitTests.mockLocationManager, desiredAccuracy: firstAccuracy)
XCTAssertTrue(AsyncLocationKitTests.mockLocationManager.desiredAccuracy == firstAccuracy.convertingAccuracy)

let secondAccuracy: LocationAccuracy = .bestForNavigationAccuracy
locationManager.updateAccuracy(with: secondAccuracy)
XCTAssertTrue(AsyncLocationKitTests.mockLocationManager.desiredAccuracy == secondAccuracy.convertingAccuracy)
}

func testRequestLocation() async {
do {
let locationManager = AsyncLocationManager(locationManager: AsyncLocationKitTests.mockLocationManager)
let location = try await locationManager.requestLocation()

switch location {
Expand Down