fixes

Author: rhijmans

R/layers.R

@@ -454,7 +454,7 @@ addRasterImage_SpatRaster <- function(
 ) {
 
   # terra 1.5-50 has terra::has.RGB()
-  if (x@ptr$rgb) {
+  if (has.RGB(x)) {
     # RGB(A) channels to color table
     x <- terra::colorize(x, "col")
   } else if (terra::nlyr(x) > 1) {

R/normalize-terra.R

@@ -50,6 +50,21 @@ polygonData.SpatVector <- function(obj) {
 
 
 # helpers -----------------------------------------------------------------
+assure_crs_terra <- function(x) {
+  prj <- crs(x, proj=TRUE)
+  if (is.lonlat(x, perhaps=TRUE, warn=FALSE)) {
+    if (!grepl("+datum=WGS84", prj, fixed = TRUE)) {
+	  x <- 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")
+}
 
 check_crs_terra <- function(x) {
   crs <- crs(x)