-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from cyclestreets/revert-87-86-batch-routes-im…
…plement-new-successthreshold-parameter Revert "Add successThreshold, close #86"
- Loading branch information
Showing
4 changed files
with
4 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Type: Package | ||
Package: cyclestreets | ||
Title: Cycle Routing and Data for Cycling Advocacy | ||
Version: 1.1.0 | ||
Version: 1.0.1 | ||
Authors@R: c( | ||
person("Robin", "Lovelace", , "[email protected]", role = c("aut", "cre"), | ||
comment = c(ORCID = "0000-0001-5679-6536")), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,8 +41,6 @@ | |
#' pause: Pause job | ||
#' continue: Continue (re-open) job | ||
#' terminate: Terminate job and delete data | ||
#' @param successThreshold int (0-100) The percentage of routes that must be successfully | ||
#' calculated before the job is considered complete. | ||
#' @param delete_job Delete the job? TRUE by default to avoid clogged servers | ||
#' @param cols_to_keep Columns to return in output sf object | ||
#' @param segments logical, return segments TRUE/FALSE/"both" | ||
|
@@ -96,7 +94,6 @@ batch = function( | |
emailOnCompletion = "[email protected]", | ||
username = Sys.getenv("CYCLESTREETS_UN"), | ||
password = Sys.getenv("CYCLESTREETS_PW"), | ||
successThreshold = 90, | ||
base_url = "https://api.cyclestreets.net/v2/batchroutes.createjob", | ||
pat = Sys.getenv("CYCLESTREETS_BATCH"), | ||
silent = TRUE, | ||
|
@@ -134,7 +131,6 @@ batch = function( | |
password, | ||
base_url, | ||
id, | ||
successThreshold, | ||
pat, | ||
silent = silent | ||
) | ||
|
@@ -281,8 +277,7 @@ batch_routes = function( | |
base_url = "https://api.cyclestreets.net/v2/batchroutes.createjob", | ||
id = 1, | ||
pat, | ||
silent = TRUE, | ||
successThreshold | ||
silent = TRUE | ||
) { | ||
batch_url = paste0(base_url, "?key=", pat) | ||
desire_lines_to_send = desire_lines["id"] | ||
|
@@ -303,8 +298,7 @@ batch_routes = function( | |
includeJsonOutput = includeJsonOutput, | ||
emailOnCompletion = emailOnCompletion, | ||
username = username, | ||
password = password, | ||
successThreshold | ||
password = password | ||
) | ||
message("POSTing the request to create and start the job") | ||
if(!silent) { | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.