properly fix for prepInputsFireRegimePolys when url supplied by user

PredictiveEcology · Jun 5, 2024 · c4428e9 · c4428e9
1 parent 9eef396
commit c4428e9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,8 +8,8 @@ Description: The original fire model is described by Cumming et al. (1998),
 URL: https://scfmutils.predictiveecology.org,
     https://github.com/PredictiveEcology/scfmutils,
     https://predictiveecology.github.io/scfmutils/
-Date: 2024-05-09
-Version: 0.0.13.9001
+Date: 2024-06-05
+Version: 0.0.13.9002
 Authors@R: c(
     person("Steve", "Cumming", email = "[email protected]",
            role = c("aut")),

diff --git a/R/utils_fireRegimePolys.R b/R/utils_fireRegimePolys.R
@@ -123,6 +123,20 @@ prepInputsFireRegimePolys <- function(url = NULL, destinationPath = tempdir(),
         tmp <- sf::st_transform(tmp, sf::st_crs(studyArea))
       }
     }
+  } else {
+    tmp <- prepInputs(url = url,
+                      destinationPath = destinationPath,
+                      studyArea = studyArea,
+                      rasterToMatch = rasterToMatch,
+                      fun = "sf::st_read",
+                      overwrite = TRUE) ## TODO: doesn't reproject -- fix upstream?
+
+    ## workaround issues with prepInputs() not reprojecting:
+    if (!is.null(rasterToMatch)) {
+      tmp <- sf::st_transform(tmp, raster::crs(rasterToMatch))
+    } else if (is.null(rasterToMatch) && !is.null(studyArea)) {
+      tmp <- sf::st_transform(tmp, sf::st_crs(studyArea))
+    }
   }
 
   if (grepl("^ECO", type)) {