fix prepInputsFireYear

Author: ianmseddy

DESCRIPTION

@@ -9,7 +9,7 @@ URL:
     https://landr.predictiveecology.org,
     https://github.com/PredictiveEcology/LandR
 Date: 2025-06-04
-Version: 1.1.5.9046
+Version: 1.1.5.9047
 Authors@R: c(
     person("Eliot J B", "McIntire", email = "[email protected]",
            role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6914-8316")),

R/prepInputObjects.R

@@ -664,13 +664,23 @@ prepInputsFireYear <- function(..., rasterToMatch, fireField = "YEAR", earliestY
 
   ## invalid NFDB polygons will cause Rstudio to crash during postProcess as of 8/21/2024
   ## removing invalid polygons is far faster than fixing the 0.1% of data
-  postProcessArgs <- dots[names(dots) %in% c("to", "maskTo", "projectTo", "cropTo")]
+  #projectTo must be rasterToMatch due to terra rasterize
+  #but don't project yet because of NFDB
+  postProcessArgs <- dots[names(dots) %in% c("to", "projectTo", "studyArea", "maskTo")]
   if (length(postProcessArgs) == 0) {
-    postProcessArgs$to <- rasterToMatch
+    postProcessArgs$cropTo <- rasterToMatch
+    postProcessArgs$projectTo <- rasterToMatch
+    postProcessArgs$maskTo = rasterToMatch
   }
+  postProcessArgs$projectTo <- rasterToMatch
 
   preProcessArgs <- dots[!names(dots) %in% names(postProcessArgs)]
+  #you can crop without worrying about geometry
+  preProcessArgs$cropTo <- rasterToMatch
+
   allFires <- do.call(prepInputs, append(list(fun = fun), preProcessArgs))
+
+  #the reason this isn't combined into one function is due to geometry issues in NFDB
   allFires <- allFires[terra::is.valid(allFires), ] ## drop invalid geometries
 
   ## This may potentially result in dots intended for postProcess being lost.
@@ -692,7 +702,9 @@ prepInputsFireYear <- function(..., rasterToMatch, fireField = "YEAR", earliestY
       if (!is(d, "SpatVector")) {
         d <- vect(d)
       }
-      fireRas <- terra::rasterize(d, rasterToMatch, field = fireField)
+
+      #fun = max to take the most recent fire year
+      fireRas <- terra::rasterize(d, rasterToMatch, field = fireField, fun = max)
       fireRas[!is.na(terra::values(fireRas, mat = FALSE)) &
         terra::values(fireRas, mat = FALSE) < earliestYear] <- NA
     } else {

R/prepInputs_NTEMS.R

@@ -207,7 +207,8 @@ prepInputs_NTEMS_DominantSpecies <- function(year = 2011, destinationPath, sppEq
   }
 
   domSpp <- lapply(uniqueVals[["NTEMS_Species_Code"]], FUN = function(spp, ras = domSpp,
-                                                                      template = projectTo) { # converting each species to binary layers and reprojecting to save user computation time
+                                                                      template = projectTo) {
+    # converting each species to binary layers and reprojecting to save user computation time
     newMap <- domSpp
     newMap[!domSpp[] == spp] <- 0
     newMap[domSpp[] == spp] <- 1