Skip to content
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

Fix CLLocationManager extension example #1208

Merged
merged 2 commits into from
Apr 21, 2017
Merged

Fix CLLocationManager extension example #1208

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
2308e45
Fix CLLocationManager extension example
phlippieb Apr 20, 2017
a2564dd
In location extension example: forward calls to forwarding delegate
phlippieb Apr 21, 2017
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
29 changes: 10 additions & 19 deletions RxExample/Extensions/CLLocationManager+Rx.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,24 @@ extension Reactive where Base: CLLocationManager {
Reactive wrapper for `delegate` message.
*/
public var didUpdateLocations: Observable<[CLLocation]> {
return delegate.methodInvoked(#selector(CLLocationManagerDelegate.locationManager(_:didUpdateLocations:)))
.map { a in
return try castOrThrow([CLLocation].self, a[1])
}
return (delegate as! RxCLLocationManagerDelegateProxy).didUpdateLocationsSubject.asObservable()
}

/**
Reactive wrapper for `delegate` message.
*/
public var didFailWithError: Observable<NSError> {
return delegate.methodInvoked(#selector(CLLocationManagerDelegate.locationManager(_:didFailWithError:)))
.map { a in
return try castOrThrow(NSError.self, a[1])
}
public var didFailWithError: Observable<Error> {
return (delegate as! RxCLLocationManagerDelegateProxy).didFailWithErrorSubject.asObservable()
}

#if os(iOS) || os(macOS)
/**
Reactive wrapper for `delegate` message.
*/
public var didFinishDeferredUpdatesWithError: Observable<NSError?> {
public var didFinishDeferredUpdatesWithError: Observable<Error?> {
return delegate.methodInvoked(#selector(CLLocationManagerDelegate.locationManager(_:didFinishDeferredUpdatesWithError:)))
.map { a in
return try castOptionalOrThrow(NSError.self, a[1])
return try castOptionalOrThrow(Error.self, a[1])
}
}
#endif
Expand Down Expand Up @@ -118,7 +112,7 @@ extension Reactive where Base: CLLocationManager {
#endif

#if os(iOS) || os(macOS)

/**
Reactive wrapper for `delegate` message.
*/
Expand All @@ -136,11 +130,11 @@ extension Reactive where Base: CLLocationManager {
/**
Reactive wrapper for `delegate` message.
*/
public var monitoringDidFailForRegionWithError: Observable<(region: CLRegion?, error: NSError)> {
public var monitoringDidFailForRegionWithError: Observable<(region: CLRegion?, error: Error)> {
return delegate.methodInvoked(#selector(CLLocationManagerDelegate.locationManager(_:monitoringDidFailFor:withError:)))
.map { a in
let region = try castOptionalOrThrow(CLRegion.self, a[1])
let error = try castOrThrow(NSError.self, a[2])
let error = try castOrThrow(Error.self, a[2])
return (region: region, error: error)
}
}
Expand Down Expand Up @@ -176,11 +170,11 @@ extension Reactive where Base: CLLocationManager {
/**
Reactive wrapper for `delegate` message.
*/
public var rangingBeaconsDidFailForRegionWithError: Observable<(region: CLBeaconRegion, error: NSError)> {
public var rangingBeaconsDidFailForRegionWithError: Observable<(region: CLBeaconRegion, error: Error)> {
return delegate.methodInvoked(#selector(CLLocationManagerDelegate.locationManager(_:rangingBeaconsDidFailFor:withError:)))
.map { a in
let region = try castOrThrow(CLBeaconRegion.self, a[1])
let error = try castOrThrow(NSError.self, a[2])
let error = try castOrThrow(Error.self, a[2])
return (region: region, error: error)
}
}
Expand Down Expand Up @@ -212,9 +206,6 @@ extension Reactive where Base: CLLocationManager {
return CLAuthorizationStatus(rawValue: Int32(number.intValue)) ?? .notDetermined
}
}



}


Expand Down
23 changes: 20 additions & 3 deletions RxExample/Extensions/RxCLLocationManagerDelegateProxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,31 @@ import CoreLocation
class RxCLLocationManagerDelegateProxy : DelegateProxy
, CLLocationManagerDelegate
, DelegateProxyType {


internal lazy var didUpdateLocationsSubject = PublishSubject<[CLLocation]>()
internal lazy var didFailWithErrorSubject = PublishSubject<Error>()

class func currentDelegateFor(_ object: AnyObject) -> AnyObject? {
let locationManager: CLLocationManager = object as! CLLocationManager
return locationManager.delegate
}

class func setCurrentDelegate(_ delegate: AnyObject?, toObject object: AnyObject) {
let locationManager: CLLocationManager = object as! CLLocationManager
locationManager.delegate = delegate as? CLLocationManagerDelegate
if let delegate = delegate {
locationManager.delegate = (delegate as! CLLocationManagerDelegate)
} else {
locationManager.delegate = nil
}
}

public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
_forwardToDelegate?.locationManager(manager, didUpdateLocations: locations)
didUpdateLocationsSubject.onNext(locations)
}

public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
_forwardToDelegate?.locationManager(manager, didFailWithError: error)
didFailWithErrorSubject.onNext(error)
}
}