diff --git a/R/Netherlands.R b/R/Netherlands.R index a4afdf05..ef51194e 100644 --- a/R/Netherlands.R +++ b/R/Netherlands.R @@ -38,7 +38,7 @@ Netherlands <- R6::R6Class("Netherlands", ), # nolint end #' @field source_data_cols existing columns within the raw data - source_data_cols = c("cases_new", "deaths_new", "hosp_new"), + source_data_cols = c("cases_new", "deaths_new"), #, "hosp_new" #' @field source_text Plain text description of the source of the data source_text = "National Institute for Public Health and the Environment (RIVM), Netherlands", # nolint #' @field source_url Website address for explanation/introduction of the @@ -60,7 +60,7 @@ Netherlands <- R6::R6Class("Netherlands", mutate( Date_of_publication = ymd(.data$Date_of_publication), Total_reported = as.double(.data$Total_reported), - Hospital_admission = as.double(.data$Hospital_admission), + #Hospital_admission = as.double(.data$Hospital_admission), Deceased = as.double(.data$Deceased), level_1_region_code = sub("[a-z].*-", "", .data$Province), level_1_region_code = paste0( @@ -74,8 +74,8 @@ Netherlands <- R6::R6Class("Netherlands", level_2_region = .data$Municipality_name, level_2_region_code = .data$Municipality_code, cases_new = .data$Total_reported, - deaths_new = .data$Deceased, - hosp_new = .data$Hospital_admission + deaths_new = .data$Deceased #, + #hosp_new = .data$Hospital_admission ) }, diff --git a/data/all_country_data.rda b/data/all_country_data.rda index 5e83bf89..5a05afe2 100644 Binary files a/data/all_country_data.rda and b/data/all_country_data.rda differ diff --git a/tests/testthat/custom_data/Netherlands_level_1.rds b/tests/testthat/custom_data/Netherlands_level_1.rds index ceff2ca3..262a43e3 100644 Binary files a/tests/testthat/custom_data/Netherlands_level_1.rds and b/tests/testthat/custom_data/Netherlands_level_1.rds differ diff --git a/tests/testthat/custom_data/Netherlands_level_2.rds b/tests/testthat/custom_data/Netherlands_level_2.rds index ceff2ca3..262a43e3 100644 Binary files a/tests/testthat/custom_data/Netherlands_level_2.rds and b/tests/testthat/custom_data/Netherlands_level_2.rds differ