Skip to content

Record response end date before deserialization #342

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
1ec5 merged 1 commit into from
Feb 9, 2019
Merged

Record response end date before deserialization #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions MapboxDirections/MBDirections.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,10 @@ open class Directions: NSObject {
@discardableResult open func calculate(_ options: RouteOptions, completionHandler: @escaping RouteCompletionHandler) -> URLSessionDataTask {
let fetchStartDate = Date()
let task = dataTask(forCalculating: options, completionHandler: { (json) in
let responseEndDate = Date()
let response = options.response(from: json)
if let routes = response.1 {
self.postprocess(routes, fetchStartDate: fetchStartDate, uuid: json["uuid"] as? String)
self.postprocess(routes, fetchStartDate: fetchStartDate, responseEndDate: responseEndDate, uuid: json["uuid"] as? String)
}
completionHandler(response.0, response.1, nil)
}) { (error) in
Expand All @@ -178,9 +179,10 @@ open class Directions: NSObject {
@discardableResult open func calculate(_ options: MatchOptions, completionHandler: @escaping MatchCompletionHandler) -> URLSessionDataTask {
let fetchStartDate = Date()
let task = dataTask(forCalculating: options, completionHandler: { (json) in
let responseEndDate = Date()
let response = options.response(from: json)
if let matches = response {
self.postprocess(matches, fetchStartDate: fetchStartDate, uuid: json["uuid"] as? String)
self.postprocess(matches, fetchStartDate: fetchStartDate, responseEndDate: responseEndDate, uuid: json["uuid"] as? String)
}
completionHandler(response, nil)
}) { (error) in
Expand All @@ -205,9 +207,10 @@ open class Directions: NSObject {
@discardableResult open func calculateRoutes(matching options: MatchOptions, completionHandler: @escaping RouteCompletionHandler) -> URLSessionDataTask {
let fetchStartDate = Date()
let task = dataTask(forCalculating: options, completionHandler: { (json) in
let responseEndDate = Date()
let response = options.response(containingRoutesFrom: json)
if let routes = response.1 {
self.postprocess(routes, fetchStartDate: fetchStartDate, uuid: json["uuid"] as? String)
self.postprocess(routes, fetchStartDate: fetchStartDate, responseEndDate: responseEndDate, uuid: json["uuid"] as? String)
}
completionHandler(response.0, response.1, nil)
}) { (error) in
Expand Down Expand Up @@ -369,8 +372,7 @@ open class Directions: NSObject {
/**
Adds request- or response-specific information to each result in a response.
*/
func postprocess(_ results: [DirectionsResult], fetchStartDate: Date, uuid: String?) {
let responseEndDate = Date()
func postprocess(_ results: [DirectionsResult], fetchStartDate: Date, responseEndDate: Date, uuid: String?) {
for result in results {
result.accessToken = self.accessToken
result.apiEndpoint = self.apiEndpoint
Expand Down