Merge pull request #77 from poissonconsulting/reqName

R/add-gm-elevation-to-point.R

@@ -30,9 +30,7 @@ add_gm_elevation_to_point <- function(x, digits, key) {
 #' }
 fwa_add_gm_elevation_to_point <- function(x, chunk_size = 300L, digits = 7,
                                           key = Sys.getenv("GOOGLE_MAPS_ELEVATION_API_KEY")) {
-  if (!requireNamespace("googleway", quietly = TRUE)) {
-    err("Package 'googleway' must be installed to get elevations from Google Maps.")
-  }
+  rlang::check_installed("googleway", reason = "to get elevations from Google Maps.")
 
   chk_s3_class(x, "sf")
   chk_s3_class(sf::st_geometry(x), "sfc_POINT")

R/mapview-rms-to-rms.R

@@ -42,9 +42,7 @@ join_points <- function(x, y) {
 #' @inheritParams fwa_mapview
 #' @export
 fwa_mapview_rms_to_rms <- function(x, y, zcol = "rm", npoint = 250) {
-  if (!requireNamespace("mapview", quietly = TRUE)) {
-    err("Package 'mapview' must be installed.")
-  }
+  rlang::check_installed("mapview")
 
   chk_s3_class(x, "sf")
   chk_s3_class(sf::st_geometry(x), "sfc_POINT")

R/mapview-rms.R

@@ -33,9 +33,7 @@ thin_points <- function(x, npoint) {
 #' @export
 fwa_mapview_rms <- function(x, layer = NULL, zcol = "rm", legend = FALSE, npoint = 250,
                             ...) {
-  if (!requireNamespace("mapview", quietly = TRUE)) {
-    err("Package 'mapview' must be installed.")
-  }
+  rlang::check_installed("mapview")
 
   chk_s3_class(x, "sf")
   chk_s3_class(sf::st_geometry(x), "sfc_POINT")

R/mapview.R

@@ -10,13 +10,8 @@
 #' @param ... Additional arguments passed to `mapview::mapview()`.
 #' @export
 fwa_mapview <- function(x, layer = NULL, zcol = NULL, legend = FALSE, ...) {
-  if (!requireNamespace("mapview", quietly = TRUE)) {
-    err("Package 'mapview' must be installed.")
-  }
-
-  if (!requireNamespace("hms", quietly = TRUE)) {
-    err("Package 'hms' must be installed.")
-  }
+  rlang::check_installed("mapview")
+  rlang::check_installed("hms")
 
   chk_s3_class(x, "sf")