fix prepInputsFireYear() rasterization problems

PredictiveEcology · Sep 27, 2024 · 5273950 · 5273950
1 parent 3908d3b
commit 5273950
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -9,7 +9,7 @@ URL:
     https://landr.predictiveecology.org,
     https://github.com/PredictiveEcology/LandR
 Date: 2024-09-27
-Version: 1.1.5.9023
+Version: 1.1.5.9024
 Authors@R: c(
     person("Eliot J B", "McIntire", email = "[email protected]",
            role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6914-8316")),

diff --git a/R/prepInputObjects.R b/R/prepInputObjects.R
@@ -627,8 +627,12 @@ prepInputsFireYear <- function(..., rasterToMatch, fireField = "YEAR", earliestY
       d[[fireField]] <- as.numeric(as.factor(d[[fireField]]))
     }
     if (is(rasterToMatch, "SpatRaster")) {
+      if (!is(d, "SpatVector")) {
+        d <- vect(d)
+      }
       fireRas <- terra::rasterize(d, rasterToMatch, field = fireField)
-      fireRas[!is.na(terra::values(fireRas)) & terra::values(fireRas) < earliestYear] <- NA
+      fireRas[!is.na(terra::values(fireRas, mat = FALSE)) &
+                terra::values(fireRas, mat = FALSE) < earliestYear] <- NA
     } else {
       .requireNamespace("fasterize", stopOnFALSE = TRUE)
       fireRas <- fasterize::fasterize(d, raster = rasterToMatch, field = fireField)