Skip to content

Commit 082b1a3

Browse files
authored
RC v. 2.0.10 (#264)
## 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.
1 parent 24258f0 commit 082b1a3

File tree

157 files changed

+11049
-9307
lines changed

Some content is hidden

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

157 files changed

+11049
-9307
lines changed

.github/ISSUE_TEMPLATE/missing---unclear-documentation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ The following template instructions are kept for backwards compatibility.
1919
---
2020

2121
<!--
22-
Use this template if you need information about {sen2r} funcionalities which are not [well] documented. You can use it also for GENERAL questions (e.g. "Is it possible to [...] with sen2r?"); instead, for questions related to use cases (or if in doubt about which template to use) please use the "Help needed" template.
22+
Use this template if you need information about {MODIStsp} funcionalities which are not [well] documented. You can use it also for GENERAL questions (e.g. "Is it possible to [...] with sen2r?"); instead, for questions related to use cases (or if in doubt about which template to use) please use the "Help needed" template.
2323
2424
Before opening a new issue:
25-
1. please read the online documentation at https://sen2r.ranghetti.info/ (https://sen2r.ranghetti.info/reference/ in case of a question about a specific function);
26-
2. if your question is related to the {sen2r} GUI, read the embedded documentation ("?" marks in the GUI);
25+
1. please read the online documentation at https://https://docs.ropensci.org/MODIStsp/ (https://docs.ropensci.org/MODIStsp/reference/ in case of a question about a specific function);
26+
2. if your question is related to the {MODIStsp} GUI, read the embedded documentation ("?" marks in the GUI);
2727
3. check if the question was already been mentioned as a GitHub issue.
2828
2929
If your question is not general but related with your specific use case, please use the "Help needed" template.
3030
3131
IMPORTANT NOTES
32-
1. Please remember that {sen2r} is not a commercial tool, so the developer is not obliged to provide assistance: please be polite, be patient if noone will answer you instantly and respect the Code of Conduct (https://sen2r.ranghetti.info/CODE-OF-CONDUCT.html)
32+
1. Please remember that {MODIStsp} is not a commercial tool, so the developer is not obliged to provide assistance: please be polite, be patient if noone will answer you instantly and respect the Code of Conduct (https://ropensci.org/code-of-conduct/)
3333
2. Your are required to answer when details (generally outputs of R commands) are required, and to provide a feedback after opening an issue, even after solving your problem or if you are not yet interested in solving it. In the case of missing feedback, the developer reserve the right to ignore your future requests.
3434
3. Tasks can be closed after 10 days of inactivity (you can reopen it if you need further help).
3535
-->

DESCRIPTION

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Package: MODIStsp
22
Title: Find, Download and Process MODIS Land Products
33
Data
44
Type: Package
5-
Version: 2.0.9
5+
Version: 2.0.10
66
Authors@R: c(person("Lorenzo", "Busetto",
77
role = c("aut"),
88
comment = c(ORCID = '0000-0001-9634-6038')),
99
person("Luigi", "Ranghetti",
10-
email = "luigi@ranghetti.info",
10+
email = "rpackages.ranghetti@gmail.com",
1111
role = c("aut", "cre"),
1212
comment = c(ORCID = '0000-0001-6207-5188')),
1313
person("Leah", "Wasser",
@@ -70,7 +70,6 @@ Suggests:
7070
mapedit (>= 0.6.0),
7171
png,
7272
rappdirs,
73-
rgdal,
7473
rmarkdown,
7574
shiny,
7675
shinyalert (>= 3.0.0),
@@ -90,7 +89,7 @@ URL: https://github.com/ropensci/MODIStsp/, https://docs.ropensci.org/MODIStsp/
9089
BugReports: https://github.com/ropensci/MODIStsp/issues
9190
LazyData: true
9291
VignetteBuilder: knitr
93-
RoxygenNote: 7.2.1
92+
RoxygenNote: 7.2.3
9493
Roxygen: list(markdown = TRUE)
9594
Encoding: UTF-8
9695
Language: en-US

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# MODIStsp 2.0.10
2+
3+
## Minor changes
4+
- Remove explicit {rgdal} dependency (`https://r-spatial.org/r/2022/12/14/evolution2.html`).
5+
- Remove suggested dependency {geojsonlint}.
6+
- Change maintainer's email in order to follow CRAN requirements.
7+
8+
19
# MODIStsp 2.0.9
210

311
## Minor changes

R/MODIStsp-package.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#' @docType package
2121
#' @name MODIStsp-package
2222
#' @author Lorenzo Busetto, phD (2014-2017)
23-
#' @author Luigi Ranghetti, phD (2015-2017) \email{luigi@@ranghetti.info}
23+
#' @author Luigi Ranghetti, phD (2015-2017)
2424
#' @seealso [https://docs.ropensci.org/MODIStsp/](https://docs.ropensci.org/MODIStsp/)
2525
#' @seealso [https://github.com/ropensci/MODIStsp](https://github.com/ropensci/MODIStsp)
2626
#'

R/MODIStsp.R

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#' Default: NULL
2525
#' @param prod_version Version of the selected MODIS product.
2626
#' Currently versions `"006"` and/or `"061"` can be chosen.
27-
#' Default value is `"006"` until decommission of this version will be
27+
#' Default value is `"006"` until decommission of this version will be
2828
#' announced by USGS.
2929
#' Products with version `"061` are experimental: in case users would encounter
3030
#' an error in the encoding of bands or quality flags they are encouraged
@@ -121,14 +121,14 @@
121121
#' @param parallel `logical` If TRUE (default), the function is run using parallel
122122
#' processing, to speed-up the computation for large rasters (with a maximum
123123
#' of 8 cores).
124-
#' The number of cores is automatically determined; specifying it is also
124+
#' The number of cores is automatically determined; specifying it is also
125125
#' possible (e.g. `parallel = 4`). In this case, more than 8 cores can be
126126
#' specified. If FALSE (default), single core processing is used.
127127
#' @param ... not used for values, forces later arguments to bind by name
128128
#' @return NULL
129129
#'
130130
#' @author Lorenzo Busetto, phD (2014-2017)
131-
#' @author Luigi Ranghetti, phD (2015-2017) \email{luigi@@ranghetti.info}
131+
#' @author Luigi Ranghetti, phD (2015-2017)
132132
#' @note License: GPL 3.0
133133
#' @export
134134
#' @seealso [MODIStsp_GUI()], [MODIStsp_process()]
@@ -160,7 +160,7 @@
160160
#' # Note that this example (as well as the following ones) is run in single
161161
#' # core to follow CRAN policies, by setting parallel = FALSE.
162162
#' # Users can exploit multicore functionalities skipping to set this argument.
163-
#'
163+
#'
164164
#' # The following check is performed in order not to provide errors
165165
#' # running the examples if HDF4 is not supported.
166166
#' is_hdf4_supported <- "HDF4" %in% sf::st_drivers("raster")$name
@@ -194,7 +194,7 @@
194194
#' # and retrieves NDVI and EVI data, plus the Usefulness Index Quality Indicator.
195195
#'
196196
#' opts_file <- system.file("testdata/test_MOD13A2.json", package = "MODIStsp")
197-
#'
197+
#'
198198
#' if (is_hdf4_supported) {
199199
#' MODIStsp(gui = FALSE, opts_file = opts_file, verbose = TRUE, parallel = FALSE)
200200
#' }
@@ -208,10 +208,10 @@
208208
#' spatial_file <- system.file("testdata/lakeshapes/garda_lake.shp", package = "MODIStsp")
209209
#' if (is_hdf4_supported) {
210210
#' MODIStsp(
211-
#' gui = FALSE,
211+
#' gui = FALSE,
212212
#' opts_file = opts_file,
213213
#' spatmeth = "file",
214-
#' spafile = spatial_file,
214+
#' spafile = spatial_file,
215215
#' verbose = TRUE,
216216
#' parallel = FALSE
217217
#' )
@@ -223,22 +223,22 @@
223223
#' # spatial file (e.g., to perform the same processing on several extents)
224224
#' # Note that you can also put all your extent files in a specific folder and
225225
#' # create the extent list using for example.
226-
#'
226+
#'
227227
#' extent_list = list.files(
228228
#' system.file("testdata/lakeshapes/", package = "MODIStsp"),
229-
#' "\\.shp$",
229+
#' "\\.shp$",
230230
#' full.names = TRUE
231231
#' )
232232
#' extent_list
233233
#' opts_file <- system.file("testdata/test_MOD13A2.json", package = "MODIStsp")
234-
#'
234+
#'
235235
#' if (is_hdf4_supported) {
236236
#' for (single_shape in extent_list) {
237237
#' MODIStsp(
238-
#' gui = FALSE,
238+
#' gui = FALSE,
239239
#' opts_file = opts_file,
240240
#' spatmeth = "file",
241-
#' spafile = single_shape,
241+
#' spafile = single_shape,
242242
#' verbose = TRUE,
243243
#' parallel = FALSE
244244
#' )
@@ -456,10 +456,10 @@ MODIStsp <- function(...,
456456
# update proc_opts based on arguments passed to the function ----
457457

458458
if(!is.null(selprod)) {proc_opts$selprod <- selprod}
459-
459+
460460
if(!is.null(prod_version)) {proc_opts$prod_version <- prod_version}
461461
if(proc_opts$prod_version=="6") {proc_opts$prod_version <- "006"} # for retrocompatibility
462-
462+
463463
if(!is.null(bandsel)) {proc_opts$bandsel <- bandsel}
464464

465465
if(!is.null(quality_bandsel)) {proc_opts$quality_bandsel <- quality_bandsel}
@@ -484,20 +484,20 @@ MODIStsp <- function(...,
484484

485485
if(!is.null(out_projsel)) {proc_opts$out_projsel <- out_projsel}
486486
if(!is.null(output_proj)) {proc_opts$output_proj <- output_proj}
487-
487+
488488
if(!is.null(out_res_sel)) {proc_opts$out_res_sel <- out_res_sel}
489489
if(!is.null(out_res)) {proc_opts$out_res <- out_res}
490490
if(!is.null(resampling)) {proc_opts$resampling <- resampling}
491-
491+
492492
if(!is.null(reprocess)) {proc_opts$reprocess <- reprocess}
493493
if(!is.null(delete_hdf)) {proc_opts$delete_hdf <- delete_hdf}
494494
if(!is.null(nodata_change)) {proc_opts$nodata_change <- nodata_change}
495495
if(!is.null(scale_val)) {proc_opts$scale_val <- scale_val}
496-
496+
497497
if(!is.null(out_format)) {proc_opts$out_format <- out_format}
498498
if(!is.null(ts_format)) {proc_opts$ts_format <- ts_format}
499499
if(!is.null(compress)) {proc_opts$compress <- compress}
500-
500+
501501
if(!is.null(out_folder)) {proc_opts$out_folder <- out_folder}
502502
if(!is.null(out_folder_mod)) {proc_opts$out_folder_mod <- out_folder_mod}
503503

@@ -567,7 +567,7 @@ MODIStsp <- function(...,
567567
tools::file_path_sans_ext(basename(spafile))
568568
)
569569
}
570-
570+
571571
if (inherits(proc_opts$bbox, "list")) {
572572
proc_opts$bbox <- unlist(proc_opts$bbox)
573573
}

R/MODIStsp_GUI.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#' the GUI and allowing to set, save, load options and eventually
77
#' launch the processing.
88
#' @author Lorenzo Busetto, phD (2014-2017)
9-
#' @author Luigi Ranghetti, phD (2015) \email{luigi@@ranghetti.info}
9+
#' @author Luigi Ranghetti, phD (2015)
1010
#' @note License: GPL 3.0
1111
#' @importFrom utils packageVersion browseURL
1212
#'

R/MODIStsp_addindex.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#' MODIStsp_indexes.json
2626
#' is modified so to allow computation of the additional indexes.
2727
#' @author Lorenzo Busetto, phD (2014-2017)
28-
#' @author Luigi Ranghetti, phD (2015) \email{luigi@@ranghetti.info}
28+
#' @author Luigi Ranghetti, phD (2015)
2929
#' @note License: GPL 3.0
3030
#' @seealso [MODIStsp_resetindexes]
3131
#' @export

R/MODIStsp_download.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#' @return The function is called for its side effects
2626
#' @rdname MODIStsp_download
2727
#' @author Lorenzo Busetto, phD (2014-2017)
28-
#' @author Luigi Ranghetti, phD (2015) \email{luigi@@ranghetti.info}
28+
#' @author Luigi Ranghetti, phD (2015)
2929
#' @importFrom httr RETRY authenticate content GET write_disk
3030
#' @importFrom xml2 as_list
3131

R/MODIStsp_install_launcher.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#' requires to set this option to TRUE (or to launch the script in a root session of R),
3131
#' Default: FALSE
3232
#' @return The function is called for its side effects.
33-
#' @author Luigi Ranghetti, phD (2015) \email{luigi@@ranghetti.info}
33+
#' @author Luigi Ranghetti, phD (2015)
3434
#' @note License: GPL 3.0
3535
#' @export
3636
#' @rdname install_MODIStsp_launcher

R/MODIStsp_process.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
#' @param parallel `logical` If TRUE (default), the function is run using parallel
2727
#' processing, to speed-up the computation for large rasters (with a maximum
2828
#' of 8 cores).
29-
#' The number of cores is automatically determined; specifying it is also
29+
#' The number of cores is automatically determined; specifying it is also
3030
#' possible (e.g. `parallel = 4`). In this case, more than 8 cores can be
3131
#' specified. If FALSE (default), single core processing is used.
3232
#' @return The function is called for its side effects.
3333
#' @author Lorenzo Busetto, phD (2014-2017)
34-
#' @author Luigi Ranghetti, phD (2015) \email{luigi@@ranghetti.info}
34+
#' @author Luigi Ranghetti, phD (2015)
3535
#' @note Thanks Tomislav Hengl and Babak Naimi, whose scripts made the starting point for
36-
#' development of this function ([ModisDownload](http://r-gis.net/?q=ModisDownload);
36+
#' development of this function ([ModisDownload](https://r-gis.net/?q=ModisDownload);
3737
#' [Download_and_resampling_of_MODIS_images](https://en.wikipedia.org/wiki/Regression-kriging?title=Download_and_resampling_of_MODIS_images))
3838
#' @note License: GPL 3.0
3939
#' @export
@@ -283,7 +283,7 @@ MODIStsp_process <- function(proc_opts,
283283
download_server <- attr(date_dirs_all, "server")
284284

285285
if (download_server == "unreachable") {return(invisible(NULL))}
286-
286+
287287
dates <- get_yeardates(proc_opts$download_range,
288288
yy,
289289
start_year, end_year,

0 commit comments

Comments
 (0)