Merge pull request #4 from steffilazerte/facet_wepp

Facet wepp

.Rbuildignore

@@ -14,3 +14,4 @@
 FES4 Input files
 ^doc$
 ^Meta$
+^RELEASE.R$

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: LITAP
 Type: Package
 Title: Landscape Integrated Terrain Analysis Package
-Version: 0.3.1
+Version: 0.4.0
 Authors@R: c(
      person("Steffi", "LaZerte", email = "[email protected]", role = c("aut","cre")))
 Description: Flow analysis of elevation data including pit removal. 
@@ -11,25 +11,31 @@ Encoding: UTF-8
 LazyData: true
 URL: https://github.com/steffilazerte/LITAP
 Depends:
-    R (>= 3.3)
+    R (>= 3.5.0)
 Imports:
+    assertr (>= 2.7),
     dplyr (>= 0.7.0),
     DT (>= 0.2),
     ggplot2 (>= 3.2.0),
-    gridExtra(>= 2.2.1),
-    magrittr(>= 1.5),
+    glue (>= 1.4.2),
+    gridExtra (>= 2.2.1),
+    magrittr (>= 1.5),
     progress (>= 1.1.2),
     purrr (>= 0.2.2.2),
-    raster(>= 2.5.8),
+    raster (>= 2.5.8),
     readr (>= 1.1.0),
+    rlang (>= 0.4.10),
     rmarkdown (>= 1.5),
     stringr (>= 1.2.0),
     tibble (>= 2.1.3),
+    tidyselect (>= 1.1.0),
     tidyr (>= 1.0.0)
 Suggests: 
     foreign (>= 0.8.67),
     knitr,
+    microbenchmark,
     readxl,
     testthat
 VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.1
+Roxygen: list(markdown = TRUE)

NAMESPACE

@@ -1,8 +1,10 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
+export(facet_mapper)
 export(flow_mapper)
 export(flow_plot)
 export(form_mapper)
 export(load_file)
+export(wepp_mapper)
 importFrom(magrittr,"%>%")

NEWS.md

@@ -1,3 +1,15 @@
+# LITAP 0.4.0 (2021-02-12)
+
+- Added `facet_mapper()` based on FacetMapR
+- Added `wepp_mapper()` based on WeppMapR
+- Internal changes to increase `form_mapper()` speed
+- Added ARULE deriving based on Li et al. 2011. Canadian Journal of Soil Science 91(2), 251-266.
+- Added both forms of calculating qweti, qarea, and lnqarea to `form_mapper()`
+  (Originally values based on actual grid-cell area, now, qweti1, qarea1, lnqarea1 based on
+  number of cells, and qweti2, qarea2, lnqarea2 based on grid-cell area).
+- Reduced number of output files
+- Updated reports
+
 # LITAP 0.3.1 (2020-01-24)
 
 - Update to `tidyr` v1.0.0

R/LITAP.R

@@ -1,3 +1,13 @@
+.onAttach <- function(libname, pkgname) {
+  packageStartupMessage("LITAP v", utils::packageVersion("LITAP"), "\n",
+                        "Please note that 'LITAP' is based on Bob MacMillan's ",
+                        "LandMapper suite of programs.\n",
+                        "LITAP is still in development; Help us by submitting ",
+                        "bugs/feature requests: \n",
+                        "http://github.com/steffilazerte/LITAP/issues")
+}
+
+
 #' Dealing with CRAN Notes due to Non-standard evaluation
 #' @keywords internal
 .onLoad <- function(libname = find.package("LITAP"), pkgname = "LITAP"){
@@ -6,8 +16,8 @@
     utils::globalVariables(
       # Vars used in Non-Standard Evaluations, declare here to avoid CRAN warnings
       c("centre", "col_f", "buffer", "buffer_n", "data", "becomes",
-        "drec", "flatcell", "ldir", "local_shed",
-        "seqno", "adjacent", "elev", "elev_n", "ldir_n", "seqno_n", "patch",
+        "drec", "flatcell", "ldir", "ddir", "local_shed",
+        "seqno", "adjacent", "elev", "elev_n", "ddir_n", "ldir_n", "seqno_n", "patch",
         "n_p", "n_shedno_", "next_pit", "out_col", "out_elev", "out_row", "out_seqno",
         "parea", "pit_area", "pit_col", "pit_elev", "pit_elev_out", "pit_row",
         "pit_seqno", "pit_seqno_out", "pit_vol", "pond_shed", "pour_elev",
@@ -19,7 +29,7 @@
         "drains_to", "drains_to_orig", "drec_buffer", "edge", "edge_map", "elev_diff", "end_pit",
         "fill_shed", "final", "group1", "group2", "group3", "group4", "highlight",
         "in_col", "in_elev", "in_row", "in_seqno", "initial_shed", "initial_shed_n", "last_elev",
-        "ldir_opts", "max_slope", "median", "min_elev_n", "missing_n",
+        "ldir_opts", "ddir_opts", "max_slope", "median", "min_elev_n", "missing_n",
         "mm2fl", "mutate", "n", "n1", "n2", "n3", "n4", "n_elev", "n_seqno", "n_shedno", "shedno",
         'shedno_n', 'removed', "relief",
         "x", "y", "elev", "type", "col_out",

R/LITAP_common_docs.R

@@ -0,0 +1,20 @@
+# args ------------------
+#' Common arguments for [flow_mapper()] and [form_mapper()]
+#'
+#' @param resume Character. From which stage should the run be resumed? (see
+#'   Details below)
+#' @param end Character. If ending a run after a particular step, which step
+#'   (see Details below)
+#' @param out_format Character. What format should the data be output as? "csv"
+#'   for Comma-separated values, "dbf" for dbf database files, or "rds" for R
+#'   data format.
+#' @param clean Logical. Remove all output files from previous runs in this
+#'   folder?
+#' @param report Logical. Create html report of results?
+#' @param log Logical. Create log file recording progress?
+#' @param verbose Logical. Output extra progress messages.
+#' @param quiet Logical. Suppress all messages.
+#'
+#' @keywords internal
+#' @name args
+NULL