Merge pull request #48 from bluegreen-labs/master

removing raster dependencies (raster, rgdal, maptools)

DESCRIPTION

@@ -18,21 +18,20 @@ Imports:
     httr,
     utils,
     sf,
-    raster,
+    sp,
     terra,
     stats,
     memoise,
     jsonlite
 License: AGPL-3
 LazyData: true
 ByteCompile: true
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 Suggests:
     knitr,
-    rmarkdown,
+    markdown,
     covr,
     testthat,
-    rgdal,
     ggplot2,
     dplyr
 VignetteBuilder: knitr

NAMESPACE

@@ -7,9 +7,8 @@ export(mt_dates)
 export(mt_products)
 export(mt_sites)
 export(mt_subset)
-export(mt_to_raster)
 export(mt_to_terra)
 export(sin_to_ll)
+import(sp)
 importFrom(memoise,memoise)
-importFrom(raster,stack)
 importFrom(terra,rast)

NEWS.md

@@ -1,3 +1,7 @@
+# MODISTools 1.1.3
+
+* removing {raster} dependencies
+
 # MODISTools 1.1.2
 
 * removing parallel processing in batch tool due to timeout issues

R/coordinate_conversion.R

@@ -38,14 +38,17 @@ sin_to_ll <- function(x, y){
   }
 
   # convert to sf object
-  coords <- sf::st_as_sf(x = data.frame(as.numeric(x),
-                                        as.numeric(y),
-                                        stringsAsFactors = FALSE),
-                     coords = c("as.numeric.x.", "as.numeric.y."),
-                     crs = "+proj=sinu +a=6371007.181 +b=6371007.181 +units=m")
+  coords <- suppressWarnings(
+  sf::st_as_sf(
+    x = data.frame(as.numeric(x),
+                   as.numeric(y),
+                   stringsAsFactors = FALSE),
+    coords = c("as.numeric.x.", "as.numeric.y."),
+    crs = "+proj=sinu +a=6371007.181 +b=6371007.181 +units=m +type=crs"
+  ))
 
   # reproject coordinates
-  coords <- sf::st_transform(coords, "+init=epsg:4326")
+  coords <- sf::st_transform(coords, crs = 4326)
 
   # unravel the sf dataframe into a normal one
   coords <- as.data.frame(do.call("rbind", lapply(coords$geometry, unlist)))
@@ -134,7 +137,9 @@ mt_bbox <- function(
   # projection etc.
   p <- sf::st_linestring(m)
   p <- sf::st_cast(p, "POLYGON")
-  p <- sf::st_sfc(p, crs = "+proj=sinu +a=6371007.181 +b=6371007.181 +units=m")
+  p <- suppressWarnings(
+    sf::st_sfc(p, crs = "+proj=sinu +a=6371007.181 +b=6371007.181 +units=m +type=crs")
+  )
 
   # a full description of the sinusoidal projection is provided on the
   # lpdaac page:

R/mt_batch_subset.R

@@ -26,7 +26,7 @@
 #' @export
 #' @examples
 #'
-#' \donttest{
+#' \dontrun{
 #' # create data frame with a site_name, lat and lon column
 #' # holding the respective names of sites and their location
 #' df <- data.frame("site_name" = paste("test",1:2))

R/mt_to_terra.R

@@ -1,6 +1,7 @@
 #' Convert tidy MODISTools data to terra SpatRaster
 #'
-#' Convert tidy MODISTools data to a terra SpatRaster
+#' Convert tidy MODISTools data to a terra SpatRaster for easy
+#' spatial processing and plotting.
 #'
 #' @param df a valid MODISTools data frame with a single band (filter for a
 #' particular band using the dplyr \code{filter()} function or base \code{subset()}
@@ -32,6 +33,7 @@
 #' LC_r <- mt_to_terra(df = LC)
 #'}
 #' @importFrom terra rast
+#' @import sp
 
 mt_to_terra <- function(
   df,
@@ -70,12 +72,14 @@ mt_to_terra <- function(
   # loop over all dates, format rasters and return
   r <- do.call("c",
                lapply(dates, function(date){
+
                  # stuff values into raster
                  m <- matrix(as.numeric(df$value[df$calendar_date == date]) *
                                as.numeric(df$scale[df$calendar_date == date]),
                              df$nrows[1],
                              df$ncols[1],
-                             byrow = TRUE)
+                             byrow = TRUE
+                             )
 
                  # convert to raster and return
                  return(terra::rast(m))
@@ -89,21 +93,22 @@ mt_to_terra <- function(
     cellsize = df$cellsize[1],
     nrows = df$nrows[1],
     ncols = df$ncols[1],
-    transform = FALSE)
+    transform = FALSE
+    )
 
   # convert to Spatial object (easier to get extent)
   bb <- sf::as_Spatial(bb)
 
   # assign extent + projection bb to raster
   terra::ext(r) <- terra::ext(bb)
-  terra::crs(r) <- as.character(terra::crs(bb))
+  terra::crs(r) <- bb@proj4string@projargs
   names(r) <- as.character(dates)
 
   # reproject to lat long when desired
   if(reproject){
     r <- terra::project(
       r,
-      "epsg:4326"
+      crs = 4326
       )
   }
 

README.Rmd

@@ -158,6 +158,8 @@ Hufkens (2022). The MODISTools package: an interface to the MODIS Land Products
 
 ## Acknowledgements
 
-Original development was supported by the UK Natural Environment Research Council (NERC; grants NE/K500811/1 and NE/J011193/1), and the Hans Rausing Scholarship. Refactoring was supported through the Belgian Science Policy office COBECORE project (BELSPO; grant BR/175/A3/COBECORE). Logo design elements are taken from the FontAwesome library according to [these terms](https://fontawesome.com/license), where the globe element was inverted and intersected.
+Original development was supported by the UK Natural Environment Research Council (NERC; grants NE/K500811/1 and NE/J011193/1), and the Hans Rausing Scholarship. Refactoring was supported through the Belgian Science Policy office COBECORE project (BELSPO; grant BR/175/A3/COBECORE). Logo design elements are taken from the FontAwesome library according to [these terms](https://fontawesome.com/license), where the globe element was inverted and intersected. Continued support for MODISTools is provided by [BlueGreen Labs](https://bluegreenlabs.org).
+
+<a href='https://bluegreenlabs.org'><img src='https://bluegreenlabs.org/img/logo_text_small.png' width="200"/></a>
 
 [![ropensci_footer](https://ropensci.org/public_images/ropensci_footer.png)](https://ropensci.org)