remove country.column argument

R/clean.R

@@ -7,7 +7,6 @@ clean <- function(x, ...) UseMethod("clean")
 #' @description Cleans survey data to work with the 'contact_matrix' function
 #'
 #' @param x A [survey()] object
-#' @param country.column the name of the country in which the survey participant was interviewed
 #' @param participant.age.column the column in `x$participants` containing participants' age
 #' @param ... ignored
 #' @importFrom data.table fcase
@@ -19,20 +18,20 @@ clean <- function(x, ...) UseMethod("clean")
 #' cleaned <- clean(polymod) # not really necessary as the 'polymod' data set has already been cleaned
 #' @autoglobal
 #' @export
-clean.contact_survey <- function(x, country.column = "country", participant.age.column = "part_age", ...) {
+clean.contact_survey <- function(x, participant.age.column = "part_age", ...) {
   chkDots(...)
 
   ## update country names
-  if (country.column %in% colnames(x$participants)) {
-    countries <- x$participants[[country.column]]
+  if ("country" %in% colnames(x$participants)) {
+    countries <- x$participants$country
     origin.code <- fcase(
       all(nchar(as.character(countries)) == 2), "iso2c",
       all(nchar(as.character(countries)) == 3), "iso3c",
       default = "country.name"
     )
     converted_countries <- suppressWarnings(countrycode(countries, origin.code, "country.name"))
     converted_countries[is.na(converted_countries)] <- as.character(countries[is.na(converted_countries)])
-    x$participants[, paste(country.column) := factor(converted_countries)]
+    x$participants[, country := factor(converted_countries)]
   }
 
   if (nrow(x$participants) > 0 &&

R/globals.R

@@ -1,6 +1,7 @@
 # Generated by roxyglobals: do not edit by hand
 
 utils::globalVariables(c(
+  "country", # <clean.contact_survey>
   "..age.unit", # <clean.contact_survey>
   "..high", # <clean.contact_survey>
   "..low", # <clean.contact_survey>