Fix rcmdcheck warnings (#874)

Author: gadenbuie

R/layers.R

@@ -357,7 +357,8 @@ addRasterLegend <- function(map, x, layer = 1, ...) {
   #
   # remove the levels to get the raw cell values
   levels(x) <- NULL
-  color_info <- base::subset(color_info, value %in% terra::unique(x)[[1]])
+  value_in_layer <- color_info$value %in% terra::unique(x)[[1]]
+  color_info <- color_info[value_in_layer & !is.na(value_in_layer), ]
 
   res <- if (is.data.frame(lvls)) {
     # Use the labels from levels(x), and look up the matching colors.

R/normalize-terra.R

@@ -51,19 +51,24 @@ polygonData.SpatVector <- function(obj) {
 
 # helpers -----------------------------------------------------------------
 assure_crs_terra <- function(x) {
-  prj <- crs(x, proj=TRUE)
-  if (is.lonlat(x, perhaps=TRUE, warn=FALSE)) {
+  stopifnot(is_installed("terra"))
+
+  prj <- raster::crs(x, proj = TRUE)
+
+  if (is.na(prj) || (prj == "")) {
+    # Don't have enough information to check
+    warning("SpatVector layer is not long-lat data", call. = FALSE)
+    return(x)
+  }
+
+  if (terra::is.lonlat(x, perhaps = TRUE, warn = FALSE)) {
     if (!grepl("+datum=WGS84", prj, fixed = TRUE)) {
-	  x <- project(x, "+proj=longlat +datum=WGS84")
+      x <- terra::project(x, "+proj=longlat +datum=WGS84")
     }
-	return(x)
-  }
-  # Don't have enough information to check
-  if (is.na(crs) || (crs=="")) {
-    warning("SpatVector layer is not long-lat data", call. = FALSE)	
     return(x)
   }
-  project(x, "+proj=longlat +datum=WGS84")
+
+  terra::project(x, "+proj=longlat +datum=WGS84")
 }
 
 check_crs_terra <- function(x) {