Skip to content

Commit

Permalink
Merge pull request #128 from NIEHS/1.1.0
Browse files Browse the repository at this point in the history
1.1.0
  • Loading branch information
kyle-messier authored Oct 4, 2024
2 parents 541bd68 + 1cc31fe commit 85a3408
Show file tree
Hide file tree
Showing 66 changed files with 920 additions and 139 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: amadeus
Title: Accessing and Analyzing Large-Scale Environmental Data
Version: 1.0.7
Version: 1.1.0
Authors@R: c(
person(given = "Mitchell", family = "Manware", role = c("aut", "ctb"), comment = c(ORCID = "0009-0003-6440-6106")),
person(given = "Insang", family = "Song", role = c("aut", "ctb"), comment = c(ORCID = "0000-0001-8732-3256")),
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export(download_epa_certificate)
export(download_geos)
export(download_gmted)
export(download_gridmet)
export(download_hash)
export(download_hms)
export(download_huc)
export(download_koppen_geiger)
Expand Down Expand Up @@ -156,6 +157,7 @@ importFrom(httr,HEAD)
importFrom(methods,is)
importFrom(nhdplusTools,get_huc)
importFrom(parallelly,availableWorkers)
importFrom(rlang,hash_file)
importFrom(rlang,inject)
importFrom(rlang,sym)
importFrom(sf,st_as_sf)
Expand Down
14 changes: 7 additions & 7 deletions R/calculate_covariates_auxiliary.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#' @param dataset character(1). Covariate parent dataset.
#' @param locs_id character(1). Column containing identifier for each unique
#' coordinate location.
#' @keywords internal
#' @keywords internal auxiliary
#' @importFrom stringi stri_pad
#' @return a data.frame or SpatVector object (depending on `from`)
#' @export
Expand Down Expand Up @@ -133,7 +133,7 @@ calc_setcolumns <- function(
#' @param time_type placeholder
#' @param level placeholder
#' @return NULL; provides progress messages to R console.
#' @keywords internal
#' @keywords internal auxiliary
#' @export
calc_message <- function(
dataset,
Expand Down Expand Up @@ -212,7 +212,7 @@ calc_message <- function(
#' `data.frame`? Default is `FALSE`.
#' @return A `list` containing `SpatVector` and `data.frame` objects
#' @seealso [`process_locs_vector()`], [`check_for_null_parameters()`]
#' @keywords internal
#' @keywords internal auxiliary
#' @importFrom terra as.data.frame
#' @importFrom terra crs
#' @export
Expand Down Expand Up @@ -261,7 +261,7 @@ calc_prepare_locs <- function(
#' (ie. GEOS data), "year" (ie. SEDAC population data), or "yearmonth"
#' (ie. TerraClimate data).
#' @return a `Date`, `POSIXt`, or `integer` object based on `format =`
#' @keywords internal
#' @keywords internal auxiliary
#' @export
calc_time <- function(
time,
Expand Down Expand Up @@ -300,7 +300,7 @@ calc_time <- function(
#' `POSIXt`? If `FALSE`, the time values will be checked for integer class
#' (year and year-month).
#' @return NULL; returns a stop error if `time` is wrong class
#' @keywords internal
#' @keywords internal auxiliary
#' @export
# nolint start
calc_check_time <- function(
Expand Down Expand Up @@ -353,7 +353,7 @@ calc_check_time <- function(
#' @importFrom exactextractr exact_extract
#' @importFrom sf st_as_sf
#' @return a `data.frame` object
#' @keywords internal
#' @keywords internal auxiliary
#' @export
calc_worker <- function(
dataset,
Expand Down Expand Up @@ -506,7 +506,7 @@ calc_worker <- function(
#' @param crs terra::crs(1). Coordinate reference system (inherited from
#' `from`).
#' @importFrom terra vect
#' @keywords auxiliary
#' @keywords internal auxiliary
#' @author Mitchell Manware
#' @return a data.frame or SpatVector object (depending on `geom` paramter)
#' @export
Expand Down
Loading

0 comments on commit 85a3408

Please sign in to comment.