Skip to content

Commit c55ca5e

Browse files
ranghettipkautio
andauthored
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]>
1 parent 6a9eba2 commit c55ca5e

File tree

101 files changed

+9705
-5553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+9705
-5553
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: MODIStsp
22
Title: Find, Download and Process MODIS Land Products
33
Data
44
Type: Package
5-
Version: 2.0.10.9000
5+
Version: 2.1.0
66
Authors@R: c(person("Lorenzo", "Busetto",
77
role = c("aut"),
88
comment = c(ORCID = '0000-0001-9634-6038')),

NEWS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# MODIStsp 2.1.0
2+
3+
## Major changes
4+
- Major product update: remove decommissioned products v6 (thanks @pkautio).
5+
- Changing default version from 006 to 061.
6+
7+
## Minor changes
8+
- Remove explicit {rgdal} dependency (`https://r-spatial.org/r/2022/12/14/evolution2.html`).
9+
- Remove suggested dependency {geojsonlint}.
10+
- Change maintainer's email in order to follow CRAN requirements.
11+
12+
113
# MODIStsp 2.0.10
214

315
## Minor changes

R/MODIStsp.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#' @param prod_version Version of the selected MODIS product.
2626
#' Currently versions `"061"` and/or `"006"` can be chosen.
2727
#' Default value is `"061"` (version `"006"` was decommissioned by USGS on
28-
#' July 31, 2023, products of this version will be gradually removed).
28+
#' July 31, 2023, products of this version are being gradually removed).
2929
#' In case users would encounter
3030
#' an error in the encoding of bands or quality flags they are encouraged
3131
#' to report it by opening a new issue on GitHub at
@@ -247,7 +247,7 @@
247247
#'
248248
#' # output files are placed in separate folders:
249249
#' outfiles_garda <- list.files(
250-
#' file.path(tempdir(), "MODIStsp/garda_lake/VI_16Days_1Km_v6/NDVI"),
250+
#' file.path(tempdir(), "MODIStsp/garda_lake/VI_16Days_1Km_v61/NDVI"),
251251
#' full.names = TRUE
252252
#' )
253253
#' outfiles_garda
@@ -257,7 +257,7 @@
257257
#' }
258258
#'
259259
#' outfiles_iseo <- list.files(
260-
#' file.path(tempdir(), "MODIStsp/iseo_lake/VI_16Days_1Km_v6/NDVI"),
260+
#' file.path(tempdir(), "MODIStsp/iseo_lake/VI_16Days_1Km_v61/NDVI"),
261261
#' full.names = TRUE
262262
#' )
263263
#' outfiles_iseo

R/MODIStsp_extract.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
#' # MODIStsp for each polygon of a shapefile, for each date in the period
8787
#' # between 2001-01-01 and 2014-12-31
8888
#'
89-
#' # The example uses tif files in testdata/VI_16Days_500m_v6 to build
89+
#' # The example uses tif files in testdata/VI_16Days_500m_v61 to build
9090
#' # a MODIStsp rasterStack corresponding to the 2016 time series of the NDVI index
9191
#' # over the Como Lake (Italy). It then extracts data on polygons corresponding
9292
#' # to different land cover classes saved in testdata/extract_polys.shp
@@ -97,10 +97,10 @@
9797
#'
9898
#' test_zip <- system.file("testdata/VI_16Days_500m_v6/NDVI.zip",
9999
#' package = "MODIStsp")
100-
#' dir.create(file.path(tempdir(), "MODIStsp/VI_16Days_500m_v6"),
100+
#' dir.create(file.path(tempdir(), "MODIStsp/VI_16Days_500m_v61"),
101101
#' showWarnings = FALSE, recursive = TRUE)
102-
#' utils::unzip(test_zip,
103-
#' exdir = file.path(tempdir(), "MODIStsp/VI_16Days_500m_v6"))
102+
#' utils::unzip(test_zip,
103+
#' exdir = file.path(tempdir(), "MODIStsp/VI_16Days_500m_v61"))
104104
#'
105105
#' opts_file <- system.file("testdata/test_extract.json", package = "MODIStsp")
106106
#' MODIStsp(opts_file = opts_file, gui = FALSE, verbose = FALSE)
@@ -113,7 +113,7 @@
113113
#'
114114
#' # Specify the filename of the RData RasterStack of interest
115115
#' stack_file <- file.path(tempdir(),
116-
#' "MODIStsp/VI_16Days_500m_v6/Time_Series/RData/Terra/NDVI",
116+
#' "MODIStsp/VI_16Days_500m_v61/Time_Series/RData/Terra/NDVI",
117117
#' "MOD13A1_NDVI_1_2016_353_2016_RData.RData")
118118
#' basename(stack_file)
119119
#'

R/MODIStsp_get_prodlayers.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#' NOTE: for products available separately for Terra and Aqua (e.g., MOD13Q1/MYD13Q1),
99
#' use the code M*D_code_ (e.g., M*D13Q1)
1010
#' @param prodver character containing the version of the desired MODIS product.
11-
#' Currently versions `"006"` (default) and `"061"` can be chosen.
11+
#' Currently versions `"061"` (default) and `"006"` can be chosen.
1212
#' @return list, containing the slots: `prodname`, `bandnames`, `quality_bandnames` and
1313
#' `indexes_bandnames`, `band_fullnames`, `quality_fullnames`, `indexes_fullnames`
1414
#'
@@ -28,7 +28,7 @@
2828
#' MODIStsp_get_prodlayers("MCD43C4")$indexes_bandnames
2929
#'
3030
#'
31-
MODIStsp_get_prodlayers <- function(prodname, prodver = "006") {
31+
MODIStsp_get_prodlayers <- function(prodname, prodver = "061") {
3232

3333
stopifnot(inherits(prodname, "character"))
3434
prod_opt_list <- load_prodopts()
@@ -60,7 +60,7 @@ MODIStsp_get_prodlayers <- function(prodname, prodver = "006") {
6060
))
6161
}
6262
}
63-
63+
6464
bandnames <- selprod[["bandnames"]]
6565
band_fullnames <- selprod[["band_fullnames"]]
6666
quality_bandnames <- selprod[["quality_bandnames"]]

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
1919
[![](https://www.r-pkg.org/badges/version-ago/MODIStsp)](https://cran.r-project.org/package=MODIStsp)
2020
[![](https://cranlogs.r-pkg.org/badges/MODIStsp?color=orange)](https://cran.r-project.org/package=MODIStsp)
2121
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1972039.svg)](https://doi.org/10.5281/zenodo.1972039)
22-
[![Coverage Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://codecov.io/github/ropensci/MODIStsp?branch=master)
22+
[![Coverage Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://app.codecov.io/github/ropensci/MODIStsp?branch=master)
2323
[![](https://badges.ropensci.org/184_status.svg)](https://github.com/ropensci/software-review/issues/184)
2424
<!-- badges: end -->
2525

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![](https://cranlogs.r-pkg.org/badges/MODIStsp?color=orange)](https://cran.r-project.org/package=MODIStsp)
88
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1972039.svg)](https://doi.org/10.5281/zenodo.1972039)
99
[![Coverage
10-
Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://codecov.io/github/ropensci/MODIStsp?branch=master)
10+
Status](https://img.shields.io/codecov/c/github/ropensci/MODIStsp/master.svg)](https://app.codecov.io/github/ropensci/MODIStsp?branch=master)
1111
[![](https://badges.ropensci.org/184_status.svg)](https://github.com/ropensci/software-review/issues/184)
1212
<!-- badges: end -->
1313

cran-comments.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
MODIStsp 2.1.0
2+
================
3+
4+
## Test environments
5+
* [local installation] Windows 11, 64 bit, R 4.3.1:
6+
There were no ERRORs, WARNINGs nor NOTEs.
7+
* [local installation] Ubuntu 22.04.2, 64 bit, R 4.3.1:
8+
There were no ERRORs, WARNINGs nor NOTEs.
9+
* [macbuilder] macOS 13.3.1 (Mac mini Apple M1), 64 bit, R 4.3.0
10+
(`https://mac.r-project.org/macbuilder/results/1697113984-3ae0262894333719/`):
11+
There were no ERRORs, WARNINGs nor NOTEs.
12+
* [devtools] `check_win_devel()`
13+
(`https://win-builder.r-project.org/45728aRz9fCi/`):
14+
There were no ERRORs, WARNINGs nor NOTEs.
15+
* [devtools] `check_win_release()`
16+
(`https://win-builder.r-project.org/CL1cql0on9q7/`):
17+
There were no ERRORs, WARNINGs nor NOTEs.
18+
* [devtools] `check_win_oldrelease()`
19+
(`https://win-builder.r-project.org/88js3Seeh0k9/`):
20+
There were no ERRORs, WARNINGs nor NOTEs.
21+
22+
123
MODIStsp 2.0.10
224
================
325

0 commit comments

Comments
 (0)