use single-step data.table fn for relocate

Author: nmdefries

NAMESPACE

@@ -68,6 +68,7 @@ importFrom(data.table,copy)
 importFrom(data.table,key)
 importFrom(data.table,rbindlist)
 importFrom(data.table,set)
+importFrom(data.table,setcolorder)
 importFrom(data.table,setkeyv)
 importFrom(dplyr,arrange)
 importFrom(dplyr,bind_rows)

R/epi_df.R

@@ -111,6 +111,8 @@ NULL
 #' @param ... Additional arguments passed to methods.
 #' @return An `epi_df` object.
 #' 
+#' @importFrom data.table setcolorder
+#'
 #' @export
 new_epi_df = function(x = tibble::tibble(), geo_type, time_type, as_of,
                       additional_metadata = list(), ...) {
@@ -159,11 +161,8 @@ new_epi_df = function(x = tibble::tibble(), geo_type, time_type, as_of,
 
   # Reorder columns (geo_value, time_value, ...)
   if(sum(dim(x)) != 0){
-    cols_to_put_first <- colnames(x) %in% c("geo_value", "time_value")
-    x <- x[, c(
-      which(cols_to_put_first),
-      which(!cols_to_put_first)
-    )]
+    # Moves columns in place
+    setcolorder(x, c("geo_value", "time_value"))
   }
 
   # Apply epi_df class, attach metadata, and return