Skip to content

Commit edbf1ac

Browse files
committed
Nat's suggestions
1 parent ad70c69 commit edbf1ac

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

R/archive.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ validate_epi_archive <- function(
442442

443443
#' `as_epi_archive` converts a data frame, data table, or tibble into an
444444
#' `epi_archive` object.
445-
#' @param ... used for specifying column names, such as `version = release_date`
445+
#' @param ... used for specifying column names, as in [`dplyr::rename`]. For
446+
#' example `version = release_date`
446447
#'
447448
#' @rdname epi_archive
448449
#'
@@ -463,7 +464,8 @@ as_epi_archive <- function(
463464
x <- guess_column_name(x, "version", version_column_names())
464465
if (!test_subset(c("geo_value", "time_value", "version"), names(x))) {
465466
cli_abort(
466-
"Columns `geo_value`, `time_value`, and `version` must be present in `x`."
467+
"Either columns `geo_value`, `time_value`, and `version` must be present in `x`, or related columns (see the internal
468+
functions `guess_time_column_name()`, `guess_geo_column_name()` and/or `guess_geo_version_name()` for complete list)."
467469
)
468470
}
469471
if (anyMissing(x$version)) {

R/epi_df.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ NULL
9595
#'
9696
#' @export
9797
new_epi_df <- function(x = tibble::tibble(), geo_type, time_type, as_of,
98-
additional_metadata = list(), ...) {
98+
additional_metadata = list()) {
9999
assert_data_frame(x)
100100
assert_list(additional_metadata)
101101

@@ -279,7 +279,7 @@ as_epi_df.tbl_df <- function(x, geo_type, time_type, as_of,
279279

280280
new_epi_df(
281281
x, geo_type, time_type, as_of,
282-
additional_metadata, ...
282+
additional_metadata
283283
)
284284
}
285285

man/epi_archive.Rd

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/new_epi_df.Rd

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)