v. 2.1.0 (#270)

* Update develop version * Switch test/doc versions to 6.1 * Update documentation * RC 2.1.0 * cran-comments * Local test errors * Fix tests after removing v.006 * Fix tests locally --------- Co-authored-by: pkautio <[email protected]>
ropensci · Oct 13, 2023 · c55ca5e · c55ca5e
1 parent 6a9eba2
commit c55ca5e
Show file tree

Hide file tree

Showing 101 changed files with 9,705 additions and 5,553 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: MODIStsp
 Title: Find, Download and Process MODIS Land Products
     Data
 Type: Package
-Version: 2.0.10.9000
+Version: 2.1.0
 Authors@R: c(person("Lorenzo", "Busetto", 
                  role = c("aut"),
                  comment = c(ORCID = '0000-0001-9634-6038')),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,15 @@
+# MODIStsp 2.1.0
+
+## Major changes
+- Major product update: remove decommissioned products v6 (thanks @pkautio).
+- Changing default version from 006 to 061.
+
+## Minor changes
+- Remove explicit {rgdal} dependency (`https://r-spatial.org/r/2022/12/14/evolution2.html`).
+- Remove suggested dependency {geojsonlint}.
+- Change maintainer's email in order to follow CRAN requirements.
+
+
 # MODIStsp 2.0.10
 
 ## Minor changes

diff --git a/R/MODIStsp.R b/R/MODIStsp.R
@@ -25,7 +25,7 @@
 #' @param prod_version Version of the selected MODIS product.
 #'   Currently versions `"061"` and/or `"006"` can be chosen.
 #'   Default value is `"061"` (version `"006"` was decommissioned by USGS on
-#'   July 31, 2023, products of this version will be gradually removed).
+#'   July 31, 2023, products of this version are being gradually removed).
 #'   In case users would encounter
 #'   an error in the encoding of bands or quality flags they are encouraged
 #'   to report it by opening a new issue on GitHub at
@@ -247,7 +247,7 @@
 #'
 #' # output files are placed in separate folders:
 #' outfiles_garda <- list.files(
-#'   file.path(tempdir(), "MODIStsp/garda_lake/VI_16Days_1Km_v6/NDVI"),
+#'   file.path(tempdir(), "MODIStsp/garda_lake/VI_16Days_1Km_v61/NDVI"),
 #'   full.names = TRUE
 #' )
 #' outfiles_garda
@@ -257,7 +257,7 @@
 #' }
 #'
 #' outfiles_iseo <- list.files(
-#'   file.path(tempdir(), "MODIStsp/iseo_lake/VI_16Days_1Km_v6/NDVI"),
+#'   file.path(tempdir(), "MODIStsp/iseo_lake/VI_16Days_1Km_v61/NDVI"),
 #'   full.names = TRUE
 #' )
 #' outfiles_iseo

diff --git a/R/MODIStsp_extract.R b/R/MODIStsp_extract.R
@@ -86,7 +86,7 @@
 #' # MODIStsp for each polygon of a shapefile, for each date in the period
 #' # between 2001-01-01 and 2014-12-31
 #'
-#' # The example uses tif files in testdata/VI_16Days_500m_v6 to build
+#' # The example uses tif files in testdata/VI_16Days_500m_v61 to build
 #' # a MODIStsp rasterStack corresponding to the 2016 time series of the NDVI index
 #' # over the Como Lake (Italy). It then extracts data on polygons corresponding
 #' # to different land cover classes saved in testdata/extract_polys.shp
@@ -97,10 +97,10 @@
 #'
 #' test_zip <-  system.file("testdata/VI_16Days_500m_v6/NDVI.zip",
 #'                          package = "MODIStsp")
-#' dir.create(file.path(tempdir(), "MODIStsp/VI_16Days_500m_v6"),
+#' dir.create(file.path(tempdir(), "MODIStsp/VI_16Days_500m_v61"),
 #'            showWarnings = FALSE, recursive = TRUE)
-#' utils::unzip(test_zip, 
-#'              exdir = file.path(tempdir(), "MODIStsp/VI_16Days_500m_v6"))
+#' utils::unzip(test_zip,
+#'              exdir = file.path(tempdir(), "MODIStsp/VI_16Days_500m_v61"))
 #'
 #' opts_file <- system.file("testdata/test_extract.json", package = "MODIStsp")
 #' MODIStsp(opts_file = opts_file, gui = FALSE, verbose = FALSE)
@@ -113,7 +113,7 @@
 #'
 #' # Specify the filename of the RData RasterStack of interest
 #' stack_file  <- file.path(tempdir(),
-#'  "MODIStsp/VI_16Days_500m_v6/Time_Series/RData/Terra/NDVI",
+#'  "MODIStsp/VI_16Days_500m_v61/Time_Series/RData/Terra/NDVI",
 #'   "MOD13A1_NDVI_1_2016_353_2016_RData.RData")
 #' basename(stack_file)
 #'

diff --git a/R/MODIStsp_get_prodlayers.R b/R/MODIStsp_get_prodlayers.R
@@ -8,7 +8,7 @@
 #'  NOTE: for products available separately for Terra and Aqua (e.g., MOD13Q1/MYD13Q1),
 #'  use the code M*D_code_ (e.g., M*D13Q1)
 #' @param prodver character containing the version of the desired MODIS product.
-#'  Currently versions `"006"` (default) and `"061"` can be chosen.
+#'  Currently versions `"061"` (default) and `"006"` can be chosen.
 #' @return list, containing the slots: `prodname`, `bandnames`, `quality_bandnames` and
 #'  `indexes_bandnames`, `band_fullnames`, `quality_fullnames`, `indexes_fullnames`
 #'
@@ -28,7 +28,7 @@
 #' MODIStsp_get_prodlayers("MCD43C4")$indexes_bandnames
 #'
 #'
-MODIStsp_get_prodlayers <- function(prodname, prodver = "006") {
+MODIStsp_get_prodlayers <- function(prodname, prodver = "061") {
 
   stopifnot(inherits(prodname, "character"))
   prod_opt_list <- load_prodopts()
@@ -60,7 +60,7 @@ MODIStsp_get_prodlayers <- function(prodname, prodver = "006") {
       ))
     }
   }
-  
+
   bandnames         <- selprod[["bandnames"]]
   band_fullnames    <- selprod[["band_fullnames"]]
   quality_bandnames <- selprod[["quality_bandnames"]]

diff --git a/README.Rmd b/README.Rmd
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
 [![](https://www.r-pkg.org/badges/version-ago/MODIStsp)](https://cran.r-project.org/package=MODIStsp)
 [![](https://cranlogs.r-pkg.org/badges/MODIStsp?color=orange)](https://cran.r-project.org/package=MODIStsp)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1972039.svg)](https://doi.org/10.5281/zenodo.1972039)
-[![Coverage Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://codecov.io/github/ropensci/MODIStsp?branch=master)
+[![Coverage Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://app.codecov.io/github/ropensci/MODIStsp?branch=master)
 [![](https://badges.ropensci.org/184_status.svg)](https://github.com/ropensci/software-review/issues/184)
 <!-- badges: end -->
 

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![](https://cranlogs.r-pkg.org/badges/MODIStsp?color=orange)](https://cran.r-project.org/package=MODIStsp)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1972039.svg)](https://doi.org/10.5281/zenodo.1972039)
 [![Coverage
-Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://codecov.io/github/ropensci/MODIStsp?branch=master)
+Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://app.codecov.io/github/ropensci/MODIStsp?branch=master)
 [![](https://badges.ropensci.org/184_status.svg)](https://github.com/ropensci/software-review/issues/184)
 <!-- badges: end -->
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,3 +1,25 @@
+MODIStsp 2.1.0
+================
+
+## Test environments
+* [local installation] Windows 11, 64 bit, R 4.3.1: 
+  There were no ERRORs, WARNINGs nor NOTEs.
+* [local installation] Ubuntu 22.04.2, 64 bit, R 4.3.1: 
+  There were no ERRORs, WARNINGs nor NOTEs.
+* [macbuilder] macOS 13.3.1 (Mac mini Apple M1), 64 bit, R 4.3.0
+  (`https://mac.r-project.org/macbuilder/results/1697113984-3ae0262894333719/`):
+  There were no ERRORs, WARNINGs nor NOTEs.
+* [devtools] `check_win_devel()`
+  (`https://win-builder.r-project.org/45728aRz9fCi/`): 
+  There were no ERRORs, WARNINGs nor NOTEs.
+* [devtools] `check_win_release()`
+  (`https://win-builder.r-project.org/CL1cql0on9q7/`): 
+  There were no ERRORs, WARNINGs nor NOTEs.
+* [devtools] `check_win_oldrelease()`
+  (`https://win-builder.r-project.org/88js3Seeh0k9/`): 
+  There were no ERRORs, WARNINGs nor NOTEs.
+
+
 MODIStsp 2.0.10
 ================