Avoid using .onLoad to make package data available

Add prefixing where needed

Also fix minor issues w/ cli_abort_ifnot and cli_warn_ifnot

R/convert_dist_units.R

@@ -77,7 +77,8 @@ set_dist_units <- function(x = NULL,
   value <-
     arg_match(
       value,
-      c(dist_unit_options, area_unit_options),
+      c(sfext::dist_unit_options,
+        sfext::area_unit_options),
       error_call = call
     )
 

R/get_paper.R

@@ -156,13 +156,15 @@ set_paper_orientation <- function(paper, orientation = NULL, bbox = NULL) {
 #'
 #' @noRd
 get_paper_name <- function(paper) {
+  paper_sizes <- sfext::paper_sizes
   paper_sizes[tolower(paper_sizes[["name"]]) %in% tolower(paper), ]
 }
 
 #' Get paper using standard and optional series or size
 #'
 #' @noRd
 get_paper_standard <- function(standard, series = NULL, size = NULL) {
+  paper_sizes <- sfext::paper_sizes
   standard <- match.arg(standard, c("ANSI", "ISO", "British Imperial", "JIS", "USPS", "Facebook", "Instagram", "Twitter"), several.ok = TRUE)
   paper <- paper_sizes[paper_sizes[["standard"]] %in% standard, ]
 
@@ -184,6 +186,7 @@ get_paper_standard <- function(standard, series = NULL, size = NULL) {
 #' @noRd
 #' @importFrom dplyr filter
 get_paper_dims <- function(width = NULL, height = NULL, units = NULL) {
+  paper_sizes <- sfext::paper_sizes
   units <- match.arg(tolower(units), c("in", "mm", "px"))
   paper <- paper_sizes[paper_sizes[["units"]] %in% units, ]
 
@@ -212,7 +215,7 @@ get_paper_dims <- function(width = NULL, height = NULL, units = NULL) {
 #' @export
 get_social_image <- function(image = NULL, platform = NULL, format = NULL, orientation = NULL) {
   lifecycle::signal_stage("superseded", "sfext::get_social_image()", "papersize::get_social_size()")
-
+  paper_sizes <- sfext::paper_sizes
   image_sizes <- paper_sizes[paper_sizes$type == "social", ]
 
   if (!is_null(platform)) {

R/get_scale.R

@@ -17,7 +17,7 @@
 get_scale <- function(scale = NULL,
                       standard = NULL,
                       series = NULL) {
-  select_scale <- standard_scales
+  select_scale <- sfext::standard_scales
 
   if (!is_null(scale)) {
     select_scale <- dplyr::filter(select_scale, .data$scale %in% {{ scale }})
@@ -29,7 +29,8 @@ get_scale <- function(scale = NULL,
   }
 
   if (!is_null(series)) {
-    series <- arg_match(series, unique(standard_scales$series), multiple = TRUE)
+    series_values <- unique(sfext::standard_scales$series)
+    series <- arg_match(series, series_values, multiple = TRUE)
     select_scale <- dplyr::filter(select_scale, .data$series %in% {{ series }})
   }
 

R/is_dist_units.R

@@ -20,7 +20,7 @@
 #' @family dist
 #' @export
 is_dist_units <- function(x) {
-  is_units(x) && (get_dist_units(x) %in% c(dist_unit_options, area_unit_options))
+  is_units(x) && (get_dist_units(x) %in% c(sfext::dist_unit_options, sfext::area_unit_options))
 }
 
 #' @name diff_dist
@@ -124,18 +124,19 @@ get_dist_units <- function(x, allow_null = TRUE, multiple = TRUE, quiet = FALSE)
     return(
       arg_match(
         x,
-        c(dist_unit_options, area_unit_options),
+        c(sfext::dist_unit_options,
+          sfext::area_unit_options),
         multiple = multiple
       )
     )
   }
 
   if (is_units(x)) {
     x_is_dist_unit <-
-      all(as.character(units(x)[["numerator"]]) %in% dist_unit_options)
+      all(as.character(units(x)[["numerator"]]) %in% sfext::dist_unit_options)
 
     x_not_area_unit <-
-      !(as.character(units(x)) %in% area_unit_options)
+      !(as.character(units(x)) %in% sfext::area_unit_options)
 
     if (x_is_dist_unit && x_not_area_unit) {
       return(as.character(units(x)[["numerator"]]))
@@ -185,7 +186,7 @@ as_dist_units <- function(x,
   units <-
     arg_match(
       units,
-      c(dist_unit_options, area_unit_options),
+      c(sfext::dist_unit_options, sfext::area_unit_options),
       error_call = call
     )
 

R/sf_bbox_dist.R

@@ -54,7 +54,7 @@ sf_bbox_dist <- function(bbox,
   units <-
     arg_match(
       units,
-      c(units_gdal, dist_unit_options)
+      c(units_gdal, sfext::dist_unit_options)
     )
 
   dist <-

R/utils.R

@@ -9,18 +9,6 @@
 #  has_fileext int_to_alpha as_numbered_labels str_add_fileext
 #  str_remove_fileext str_extract_fileext has_min_length
 
-.onLoad <- function(lib, pkg) {
-  utils::data(
-    list = c(
-      "dist_units",
-      "dist_unit_options", "area_unit_options",
-      "standard_scales", "paper_sizes"
-    ),
-    package = pkg,
-    envir = parent.env(environment())
-  )
-}
-
 utils::globalVariables(
   c(
     "filename", "image_description", "image_height", "image_width", "latitude",
@@ -33,12 +21,14 @@ utils::globalVariables(
 )
 
 #' @noRd
-cli_abort_ifnot <- function(...,
+cli_abort_ifnot <- function(x = NULL,
+                            ...,
                             message = NULL,
                             arg = caller_arg(x),
                             .envir = call,
                             call = caller_env()) {
   cli_ifnot(
+    x = x,
     ...,
     message = message,
     .default = cli::cli_abort,
@@ -50,12 +40,14 @@ cli_abort_ifnot <- function(...,
 
 
 #' @noRd
-cli_warn_ifnot <- function(...,
+cli_warn_ifnot <- function(x = NULL,
+                          ...,
                            message = NULL,
                            arg = caller_arg(x),
                            .envir = call,
                            call = caller_env()) {
   cli_ifnot(
+    x = x,
     ...,
     message = message,
     .default = cli::cli_warn,