v. 2.0.10.9000 (#269)

* Update develop version

* Fix default version (latest of each product instead than 006)

* Fix version retrieval in manual mode

* Changing default version from 006 to 061

* Product updates. Removed 060 versions.

Product updates. Removed 060 versions. Updated all 060-only products to 061.

* Product updates. Removed 060 versions.

* Fix wrong filename

---------

Co-authored-by: pkautio <[email protected]>

Author: ranghetti

DESCRIPTION

@@ -2,7 +2,7 @@ Package: MODIStsp
 Title: Find, Download and Process MODIS Land Products
     Data
 Type: Package
-Version: 2.0.10
+Version: 2.0.10.9000
 Authors@R: c(person("Lorenzo", "Busetto", 
                  role = c("aut"),
                  comment = c(ORCID = '0000-0001-9634-6038')),

R/MODIStsp.R

@@ -23,10 +23,10 @@
 #'   a list of available product names using function `MODIStsp_get_prodnames`,
 #'   Default: NULL
 #' @param prod_version Version of the selected MODIS product.
-#'   Currently versions `"006"` and/or `"061"` can be chosen.
-#'   Default value is `"006"` until decommission of this version will be
-#'   announced by USGS.
-#'   Products with version `"061` are experimental: in case users would encounter
+#'   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).
+#'   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
 #'   \url{https://github.com/ropensci/MODIStsp/issues}.

R/check_proc_opts.R

@@ -17,7 +17,7 @@ check_proc_opts <- function(proc_opts) {
   assertthat::see_if(o$selprod %in% names(prod_opts),
                      msg = "`selprod` is not a valid MODIS product name!")
 
-  prod_layers <- MODIStsp_get_prodlayers(o$selprod)
+  prod_layers <- MODIStsp_get_prodlayers(o$selprod, prodver = o$prod_version)
   assertthat::see_if(all(o$bandsel %in% prod_layers$bandnames),
                      msg = "Some of `bandsel` are not a valid bandname of the selected MODIS product!")
 

inst/ExtData/MODIStsp_ProdOpts.RData

@@ -1,7 +1,7 @@
 {
   "selcat": null,
   "selprod": null,
-  "prod_version": "006",
+  "prod_version": "061",
   "sensor": "Both",
   "bandsel": null,
   "quality_bandsel": null,

inst/ExtData/MODIStsp_ProdOpts.xml.zip

@@ -1,33 +1,41 @@
 #initialize product and category selectors ----
 
-general_opts <- reactiveValues()
+# general_opts <- reactiveValues()
 rv           <- reactiveValues()
 
 output$selcats <-renderUI({
-  curprod <- which(names(prod_opt_list) == general_opts$selprod)
-  curcat  <- mod_prod_cat$cat[curprod]
-  shiny::selectInput("selcat", "Product Category",
-                     choices  = unique(mod_prod_cat$cat),
-                     selected = curcat)
+  # curprod <- which(names(prod_opt_list) == general_opts$selprod)
+  # curcat  <- mod_prod_cat$cat[curprod]
+  shiny::selectInput(
+    "selcat", "Product Category",
+    choices  = unique(mod_prod_cat$cat),
+    selected = unique(mod_prod_cat$cat)[1]
+  )
 })
 
 output$selprods <-renderUI({
-  shiny::selectInput("selprod",
-                     label = shiny::span("Product Name\u2000",
-                                         shiny::actionLink("help_product",
-                                                           shiny::icon("question-circle"))),
-                     choices = mod_prod_list[mod_prod_cat$cat == (input$selcat)],
-                     selected = general_opts$selprod)
+  shiny::selectInput(
+    "selprod",
+    label = shiny::span(
+      "Product Name\u2000",
+      shiny::actionLink("help_product", shiny::icon("question-circle"))
+    ),
+    choices = mod_prod_list[mod_prod_cat$cat == (input$selcat)],
+    selected = mod_prod_list[mod_prod_cat$cat == (input$selcat)][1]
+  )
 })
 
 output$selvers <-renderUI({
   req(input$selprod)
-  shiny::selectInput("selver",
-                     label = shiny::span("Version\u2000",
-                                         shiny::actionLink("help_version",
-                                                           shiny::icon("question-circle"))),
-                     choices = names(prod_opt_list[[input$selprod]]),
-                     selected = general_opts$selver)
+  shiny::selectInput(
+    "selver",
+    label = shiny::span(
+      "Version\u2000",
+      shiny::actionLink("help_version", shiny::icon("question-circle"))
+    ),
+    choices = names(prod_opt_list[[input$selprod]]),
+    selected = rev(names(prod_opt_list[[input$selprod]]))[1]
+  )
 })
 
 shiny::observeEvent(input$prodinfo, {
@@ -45,10 +53,12 @@ observe({
 
   curlayers <- prod_opt_list[[curprod]][[input$selver]]$bandnames
   curlabels <- prod_opt_list[[curprod]][[input$selver]]$band_fullnames
-  shiny::updateCheckboxGroupInput(session, "sel_layers",
-                                  choiceNames = curlabels,
-                                  choiceValues = curlayers,
-                                  selected = general_opts$curlayers)
+  shiny::updateCheckboxGroupInput(
+    session, "sel_layers",
+    choiceNames = curlabels,
+    choiceValues = curlayers,
+    selected = NULL
+  )
 
   # shiny::isolate(general_opts$curlayers) <- ""
 
@@ -60,10 +70,12 @@ observe({
     qalabels <- "No Quality layers available"
   }
 
-  shiny::updateCheckboxGroupInput(session, "sel_qual",
-                                  choiceNames  = qalabels,
-                                  choiceValues = qalayers,
-                                  selected = general_opts$curqual)
+  shiny::updateCheckboxGroupInput(
+    session, "sel_qual",
+    choiceNames  = qalabels,
+    choiceValues = qalayers,
+    selected = NULL
+  )
 
   # shiny::isolate(general_opts$curqual) <- ""
 
@@ -90,10 +102,12 @@ observe({
     indlayers <- NA
     indlabels <- "No Indexes available"
   }
-  shiny::updateCheckboxGroupInput(session, "sel_ind",
-                                  choiceNames  = indlabels,
-                                  choiceValues = indlayers,
-                                  selected = general_opts$curindexes)
+  shiny::updateCheckboxGroupInput(
+    session, "sel_ind",
+    choiceNames  = indlabels,
+    choiceValues = indlayers,
+    selected = NULL
+  )
 
   # shiny::isolate(general_opts$curindexes) <- ""
 })
@@ -209,6 +223,7 @@ shiny::observe({
 shiny::observe({
   shiny::req(input$selprod)
   shiny::req(input$selver)
+  shiny::req(input$selver %in% names(prod_opt_list[[input$selprod]]))
   indexes <- MODIStsp_get_prodlayers(input$selprod, input$selver)$indexes_bandnames
   if (is.null(indexes)) {
     shinyjs::disable("addindex")