Update plot_raster function, fix imports and documentation

Author: pkalanta

.gitignore

@@ -32,3 +32,4 @@ rsconnect/
 inputs/
 J4RTmpFile
 .secret
+.Rprofile

.gitmodules

@@ -0,0 +1,18 @@
+[submodule "modules/Biomass_borealDataPrep"]
+	path = modules/Biomass_borealDataPrep
+	url = https://github.com/PredictiveEcology/Biomass_borealDataPrep
+[submodule "modules/Biomass_core"]
+	path = modules/Biomass_core
+	url = https://github.com/PredictiveEcology/Biomass_core
+[submodule "modules/LandR_reforestation"]
+	path = modules/LandR_reforestation
+	url = https://github.com/ianmseddy/LandR_reforestation
+[submodule "modules/scfm"]
+	path = modules/scfm
+	url = https://github.com/PredictiveEcology/scfm
+[submodule "modules/Biomass_regeneration"]
+	path = modules/Biomass_regeneration
+	url = https://github.com/PredictiveEcology/Biomass_regeneration
+[submodule "modules/simpleHarvest"]
+	path = modules/simpleHarvest
+	url = https://github.com/pkalanta/simpleHarvest

R/LandR-package.R

@@ -18,6 +18,7 @@
 "_PACKAGE"
 
 ## usethis namespace: start
+#'
 #' @importFrom crayon blue cyan green magenta red
 #' @importFrom data.table as.data.table copy data.table dcast fifelse fread
 #' @importFrom data.table is.data.table last melt rbindlist
@@ -26,12 +27,17 @@
 #' @importFrom fpCompare %==% %>>% %<<% %<=%
 #' @importFrom ggplot2 aes coord_equal coord_sf element_blank element_text facet_wrap
 #' @importFrom ggplot2 geom_bar geom_hline geom_line geom_point labs geom_raster geom_ribbon geom_sf
+#' @importFrom ggplot2 ggplot
 #' @importFrom ggplot2 ggplot ggtitle guide_legend guides labs
+#' @importFrom ggplot2 ggplot ggtitle theme_bw labs
+#' @importFrom ggplot2 ggtitle
+#' @importFrom ggplot2 labs
 #' @importFrom ggplot2 scale_color_distiller
 #' @importFrom ggplot2 scale_fill_distiller scale_fill_manual
 #' @importFrom ggplot2 scale_fill_viridis_c scale_fill_viridis_d
 #' @importFrom ggplot2 scale_linetype_manual scale_x_discrete
 #' @importFrom ggplot2 stat stat_summary sym theme theme_classic unit
+#' @importFrom ggplot2 theme_bw
 #' @importFrom ggpubr theme_pubr
 #' @importFrom ggspatial annotation_north_arrow layer_spatial north_arrow_minimal
 #' @importFrom grDevices colorRampPalette dev.off png
@@ -68,5 +74,6 @@
 #' @importFrom tools file_ext file_path_sans_ext
 #' @importFrom utils capture.output combn count.fields data getFromNamespace head install.packages
 #' @importFrom utils str tail untar
+#' @importFrom viridis scale_fill_viridis
 ## usethis namespace: end
 NULL

R/plotting.R

@@ -286,30 +286,35 @@ plotFunction <- function(ras, studyArea, limits = NULL) {
     )
 }
 
-#' Plot function for generic SpatRaster objects with Plots
+#' Plot function for generic raster objects with Plots
 #'
 #' @param x SpatRaster for current or cumulative harvest
 #' @param title character, the plot title
 #' @param subtitle character, the plot subtitle
 #'
 #' @returns ggplot object
 #' @export
-#' @importFrom ggplot2 ggplot ggtitle theme_bw labs
-#' @importFrom tidyterra geom_spatraster
-#' @importFrom viridis scale_fill_viridis
-plot_genericMap <- function(x, title = NULL, subtitle = NULL) {
+
+plot_raster <- function(x, title = NULL, subtitle = NULL) {
   if (!inherits(x, "SpatRaster")) {
     stop("x must be a SpatRaster object.")
   }
 
-  gg_gm <- ggplot() +
+  gg_raster <- ggplot() +
     geom_spatraster(data = x) +
     scale_fill_viridis(na.value = "transparent") +
     theme_bw()
 
-  if (!is.null(title) || !is.null(subtitle)) {
-    gg_gm <- gg_gm + ggtitle(title) + labs(subtitle = subtitle)
+  # if (!is.null(title) || !is.null(subtitle)) {
+  #   gg_raster <-  gg_raster + ggtitle(title) + labs(subtitle = subtitle)
+  if (!is.null(title)) {
+    gg_raster <- gg_raster + ggtitle(title)
+  }
+  if (!is.null(subtitle)) {
+    gg_raster <- gg_raster + labs(subtitle = subtitle)
   }
 
-  gg_gm  # return ggplot object
+  gg_raster  # return ggplot object
 }
+
+