A few fixes for some issues #244
Open
Conversation
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
swapped interactive with ask (which was not used) which is v important to be able to leave code running without being prompted. Changed default file to second. The only year where two csvs are available is 2020 and for escooter data. Maybe this is interesting for some, but the other file should be the default. returning destfile works better for dependent functions get.R main change is to skip the read_ functions which involve multiple nested functions appear to be unneccesary and are a headache to debug. utils.R Main change is to fix find_file_name function which was looking for a csv with year name for years before 2018. This data is all in one file which has 1979 in.
|
Looking at this now Blaise... |
|
Hitting this issue with |
|
| #' Get data download dir | ||
| #' @examples | ||
| #' # get_data_directory() | ||
| get_data_directory = function() { |
There was a problem hiding this comment.
Why remove this? It's needed in other functions.
There was a problem hiding this comment.
I think I meant to move to get.R (as it took me a while to find where it was).
Have added to get.R
| result = result[!grepl(pattern = "adjust", x = result)] | ||
| result = result[grepl(pattern = years, x = result)] | ||
| result = result[grepl(pattern = "1979", x = result)] |
R/get.R
Outdated
| data_dir = data_dir, | ||
| format = format) | ||
| # read in from the file path defined above | ||
| if(grepl(type, "vehicles", ignore.case = TRUE)){ |
There was a problem hiding this comment.
The first argument of grepl() is pattern so shouldn't "vehicles" go before type?
| @@ -112,7 +112,7 @@ get_stats19 = function(year = NULL, | |||
| ) | |||
| output_format = "tibble" | |||
| } | |||
| if (grepl(type, "casualties", ignore.case = TRUE) && output_format %in% c("sf", "ppp")) { | |||
| if (grepl("casualties", type, ignore.case = TRUE) && output_format %in% c("sf", "ppp")) { | |||
There was a problem hiding this comment.
Suggested change
| if (grepl("casualties", type, ignore.case = TRUE) && output_format %in% c("sf", "ppp")) { | |
| if (grepl("cas", type, ignore.case = TRUE) && output_format %in% c("sf", "ppp")) { |
And save for "veh" and "acc|col" so more things match.
|
Thanks @BlaiseKelly almost there! Please can you take a look at Source: https://github.com/ropensci/stats19/actions/runs/10091716542/job/27903832622?pr=244#step:6:260 Any ideas why? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
swapped interactive with ask (which was not used) which is v important to be able to leave code running without being prompted.
Changed default file to second. The only year where two csvs are available is 2020 and for escooter data. Maybe this is interesting for some, but the other file should be the default.
returning destfile works better for dependent functions
get.R
main change is to skip the read_ functions which involve multiple nested functions appear to be unneccesary and are a headache to debug.
utils.R
Main change is to fix find_file_name function which was looking for a csv with year name for years before 2018. This data is all in one file which has 1979 in.