Checks

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: enerscape
 Type: Package
 Title: Compute Energy Landscapes
-Version: 0.1.0
+Version: 0.1.1
 Author: Emilio Berti
 Maintainer: Emilio Berti <[email protected]>
 Description: Compute energy landscapes using a digital elevation model (DEM) 
@@ -13,6 +13,7 @@ Imports:
     raster,
     gdistance,
     rgdal,
+    rgeos,
     sp,
     Matrix
 Suggests:

R/circuitscape.R

@@ -22,8 +22,8 @@ circuitscape_skeleton <- function(
       stop("points are not data.frame or matrix")
     }
   }
-  pr <- raster::rasterize(points, en$rasters$Work, na.rm = TRUE)
-  raster::writeRaster(en$rasters$Work, file.path(path, "/work.tif"),
+  pr <- raster::rasterize(points, en$rasters$EnergyScape, na.rm = TRUE)
+  raster::writeRaster(en$rasters$EnergyScape, file.path(path, "/work.tif"),
                       overwrite = TRUE)
   raster::writeRaster(pr, file.path(path, "/loc.tif"),
                       overwrite = TRUE)

R/en_path.R

@@ -16,7 +16,9 @@
 #' data("volcano")
 #' dem <- raster(volcano)
 #' en <- enerscape(dem, 10, unit = "kcal", neigh = 16)
-#' en_path(en, draw = TRUE, n = 10)
+# p <- coordinates(en$rasters$DEM)[sample(1:ncell(en$rasters$DEM), 5), ]
+# path <- sp::SpatialLines(list(sp::Lines(sp::Line(p), ID = "path")))
+# en_path(en, path)
 #' }
 #' @export
 #' @references Etten, J. van. (2017). R Package gdistance: Distances and Routes
@@ -51,7 +53,7 @@ en_path <- function(
   } else if (class(p)[1] != "SpatialLines") {
     stop("Path must be a SpatialLines object")
   }
-  w <- raster::extract(en$rasters$Work, p)[[1]]
+  w <- raster::extract(en$rasters$EnergyScape, p)[[1]]
   ans <- list(Path = p,
               Distance = sp::SpatialLinesLengths(p),
               Cost = sum(w))

R/enerscape.R

@@ -14,7 +14,7 @@
 #'   Prampero et al. (1979).
 #' @param v speed of cyclist (km / h), only for \code{method = 'cycling'}.
 #' @return A list with elements a rasterStack of the digital elevation model,
-#'   slope, work, and conductance and the conductance as a transitionLayer for
+#'   slope, energy landscape, and conductance and the conductance as a transitionLayer for
 #'   path analysis.
 #' @details From the digital elevation model, transition slopes, energy costs
 #'   and conductances (1 / work) are computed based on the model described in

R/least-cost_path.R

@@ -33,7 +33,7 @@ en_lcp <- function(
     stop("en must be an enerscape object")
   } else {
     x <- en$rasters$DEM
-    work <- en$rasters$Work
+    work <- en$rasters$EnergyScape
     cond <- en$cond_tr
   }
   ans <- list() #initialize return value

R/omniscape.R

@@ -18,9 +18,9 @@ omniscape_skeleton <- function(
     stop("Missing mandatory input")
   }
   if (aggr_fact > 1) {
-    w <- raster::aggregate(en$rasters$Work, aggr_fact)
+    w <- raster::aggregate(en$rasters$EnergyScape, aggr_fact)
   } else {
-    w <- en$rasters$Work
+    w <- en$rasters$EnergyScape
   }
   raster::writeRaster(w, file.path(path, "/work.tif"),
                       overwrite = TRUE)