diff --git a/DESCRIPTION b/DESCRIPTION index a15ff1a..19df050 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: extractOz Title: Extract Australian Soil, Weather and GRDC Agro-ecological Zone Information from GPS Points -Version: 1.0.0.9000 +Version: 1.1.0 Authors@R: c(person(given = "Adam H.", family = "Sparks", email = "adam.sparks@dpird.wa.gov.au", role = c("aut", "cre"), @@ -15,7 +15,8 @@ Authors@R: c(person(given = "Adam H.", family = "Sparks", Description: Extracts point data for a given GPS coordinate that includes major soil order, weather and GRDC agro-ecological zone information at that point. Encoding: UTF-8 -Roxygen: list(markdown = TRUE) +Roxygen: list(markdown = TRUE, roclets = c("collate", "namespace", "rd", + "roxyglobals::global_roclet")) RoxygenNote: 7.2.3 Imports: curl, @@ -32,6 +33,7 @@ Suggests: knitr, readr, rmarkdown, + roxyglobals, spelling, testthat (>= 3.0.0), tidyverse, @@ -48,3 +50,5 @@ X-schema.org-isPartOf: https://www.dpird.wa.gov.au/ URL: https://github.com/DPIRD-FSI/extractOz BugReports: https://github.com/DPIRD-FSI/extractOz/issues LazyData: true +Config/roxyglobals/filename: generated-globals.R +Config/roxyglobals/unique: FALSE diff --git a/NEWS.md b/NEWS.md index 8deac37..acabcfa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# extractOz 1.0.0.9000 +# extractOz 1.1.0 ## Major changes @@ -15,6 +15,8 @@ - Internal GRDC Agroecoregions object uses the same simplified GPKG and is saved using "xz" compression to save more file space. +- Use {roxyglobals} for tracking global objects in the package in a tidier fashion. + # extractOz 1.0.0 ## Major changes diff --git a/R/df_to_list.R b/R/df_to_list.R index 333479f..20c674c 100644 --- a/R/df_to_list.R +++ b/R/df_to_list.R @@ -28,7 +28,7 @@ #' #' @return A `list` object suitable for use in any of the `extract` functions #' in \pkg{extractOz}. -#' +#' @autoglobal #' @export #' df_to_list <- function(x, names = 1, lonlat = 2:3) { diff --git a/R/extract_ae_zone.R b/R/extract_ae_zone.R index 23d3bb9..59547cc 100644 --- a/R/extract_ae_zone.R +++ b/R/extract_ae_zone.R @@ -19,7 +19,7 @@ #' ) #' #' extract_ae_zone(x = locs) -#' +#' @autoglobal #' @export extract_ae_zone <- function(x) { diff --git a/R/extract_area.R b/R/extract_area.R index 0ed22c5..b12a0d2 100644 --- a/R/extract_area.R +++ b/R/extract_area.R @@ -34,6 +34,7 @@ #' ) #' #' extract_area(x = locs, spatial = aez, area = "AEZ") +#' @autoglobal #' @export extract_area <- function(x, spatial, area) { diff --git a/R/extract_data_drill.R b/R/extract_data_drill.R index 3270945..e8e956b 100644 --- a/R/extract_data_drill.R +++ b/R/extract_data_drill.R @@ -145,7 +145,7 @@ #' @family SILO #' #' @author Adam H. Sparks, \email{adam.sparks@@dpird.wa.gov.au} -#' +#' @autoglobal #' @export extract_data_drill <- function(x, diff --git a/R/extract_patched_point.R b/R/extract_patched_point.R index 41bf897..9649904 100644 --- a/R/extract_patched_point.R +++ b/R/extract_patched_point.R @@ -177,6 +177,7 @@ #' @family weather data #' @family SILO #' +#' @autoglobal #' @export #' extract_patched_point <- function(x, diff --git a/R/extract_power.R b/R/extract_power.R index 8a04a00..2550a06 100644 --- a/R/extract_power.R +++ b/R/extract_power.R @@ -144,6 +144,7 @@ #' #' @family weather data #' +#' @autoglobal #' @export extract_power <- function(x, start_date, diff --git a/R/generated-globals.R b/R/generated-globals.R new file mode 100644 index 0000000..d8af671 --- /dev/null +++ b/R/generated-globals.R @@ -0,0 +1,11 @@ +# Generated by roxyglobals: do not edit by hand + +utils::globalVariables(c( + "aez", # + "location", # + "location", # + "owner", # + "station_code", # + "ind", # + NULL +)) diff --git a/R/globals.R b/R/globals.R index 5fa9cf6..c29d893 100644 --- a/R/globals.R +++ b/R/globals.R @@ -1,6 +1,6 @@ # CRAN NOTE avoidance utils::globalVariables(c("aez", - "daas", + "daas", "location", "ind", "owner", diff --git a/R/internal_functions.R b/R/internal_functions.R index b6763ff..8dc4a01 100644 --- a/R/internal_functions.R +++ b/R/internal_functions.R @@ -1,6 +1,4 @@ - - #' Add %notin% function #' #' Negates `%in%` for easier (mis)matching. @@ -34,7 +32,7 @@ #' .create_dt(x = locs) #' #' @author Adam H. Sparks, \email{adam,sparks@@dpird.wa.gov.au} -#' +#' @autoglobal #' @noRd .create_dt <- function(x) { x <- @@ -47,6 +45,7 @@ #' @param longitude user provided numeric value as decimal degrees #' @param latitude user provided numeric value as decimal degrees #' @noRd +#' @autoglobal #' @return invisible `NULL`, called for its side-effects .check_lonlat <- function(x) { diff --git a/codemeta.json b/codemeta.json index 37e332c..572a29a 100644 --- a/codemeta.json +++ b/codemeta.json @@ -7,7 +7,7 @@ "codeRepository": "https://github.com/DPIRD-FSI/extractOz", "issueTracker": "https://github.com/DPIRD-FSI/extractOz/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "1.0.0.9000", + "version": "1.1.0", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -85,6 +85,18 @@ }, "sameAs": "https://CRAN.R-project.org/package=rmarkdown" }, + { + "@type": "SoftwareApplication", + "identifier": "roxyglobals", + "name": "roxyglobals", + "provider": { + "@id": "https://cran.r-project.org", + "@type": "Organization", + "name": "Comprehensive R Archive Network (CRAN)", + "url": "https://cran.r-project.org" + }, + "sameAs": "https://CRAN.R-project.org/package=roxyglobals" + }, { "@type": "SoftwareApplication", "identifier": "spelling", @@ -215,16 +227,21 @@ "sameAs": "https://CRAN.R-project.org/package=sf" }, "8": { + "@type": "SoftwareApplication", + "identifier": "stats", + "name": "stats" + }, + "9": { "@type": "SoftwareApplication", "identifier": "utils", "name": "utils" }, - "9": { + "10": { "@type": "SoftwareApplication", "identifier": "weatherOz", "name": "weatherOz" }, - "10": { + "11": { "@type": "SoftwareApplication", "identifier": "R", "name": "R", @@ -235,7 +252,7 @@ "applicationCategory": "Tools", "isPartOf": "https://www.dpird.wa.gov.au/", "keywords": ["agriculture", "Australia", "agroecology", "soils", "weather", "weather-data", "soils-data", "agriculture-research", "r-package", "agriculture-data", "australia"], - "fileSize": "1420.245KB", + "fileSize": "1347.764KB", "releaseNotes": "https://github.com/DPIRD-FSI/extractOz/blob/master/NEWS.md", "readme": "https://github.com/DPIRD-FSI/extractOz/blob/main/README.md", "contIntegration": ["https://github.com/DPIRD-FSI/extractOz/actions", "https://codecov.io/gh/DPIRD-FSI/extractOz"], diff --git a/man/extract_ae_zone.Rd b/man/extract_ae_zone.Rd index 6b39ce3..b61144a 100644 --- a/man/extract_ae_zone.Rd +++ b/man/extract_ae_zone.Rd @@ -30,5 +30,4 @@ locs <- list( ) extract_ae_zone(x = locs) - }