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.

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 errors #45

Merged
merged 3 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
inst/doc
docs
archive/
httr2-test/
19 changes: 19 additions & 0 deletions NHSRpopulation.Rproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
NumSpacesForTab: 2
Encoding: UTF-8

RnwWeave: Sweave
LaTeX: pdfLaTeX

StripTrailingWhitespace: Yes

BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
16 changes: 13 additions & 3 deletions R/get_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ get_data <- function(data,
value <- NULL
lsoa11cd <- NULL
lsoa_code <- NULL
imd_decile <- NULL
imd_rank <- NULL
imd_score <- NULL

# Check there is corresponding type data somewhere in data frame
# Use this to allow for other column names to be used in later code
Expand Down Expand Up @@ -71,15 +74,15 @@ get_data <- function(data,
## Generate specific text for the url

if (is.atomic(data) && is_postcode_check == 0 &&
is_lsoa_check > 0) {
is_lsoa_check > 0) {
text <- paste0(
"LSOA11CD IN ('",
paste(data,
collapse = "', '"
), "')"
)
} else if (is.data.frame(data) && is_postcode_check == 0 &&
is_lsoa_check > 0) {
is_lsoa_check > 0) {
text <- paste0(
"LSOA11CD IN ('",
paste(data[[column]],
Expand Down Expand Up @@ -113,7 +116,7 @@ get_data <- function(data,
## IMD data

if (is_postcode_check == 0 && is_lsoa_check > 0 &&
is.data.frame(data)) {
is.data.frame(data)) {
data_out <- imd_api(
text = text,
req = req
Expand Down Expand Up @@ -150,6 +153,13 @@ get_data <- function(data,
dplyr::left_join(
data_out,
dplyr::join_by(lsoa_code == lsoa11cd)
) |>
dplyr::select(
1:3,
imd_decile,
imd_rank,
imd_score,
dplyr::everything()
)
} else if (exists("pc_data") && url_type == "postcode") {
pc_data
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading