version 1.3.5

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: sen2r
 Type: Package
 Title: Find, Download and Process Sentinel-2 Data
-Version: 1.3.4
+Version: 1.3.5
 Authors@R: c(person("Luigi", "Ranghetti",
                     email = "luigi@ranghetti.info",
                     role = c("aut", "cre"),
@@ -22,21 +22,21 @@ URL: http://sen2r.ranghetti.info, https://github.com/ranghetti/sen2r
 BugReports: https://github.com/ranghetti/sen2r/issues
 Depends: R (>= 3.5.0)
 Imports: methods, sf (>= 0.9.2), stars (>= 0.4.1), data.table, raster,
-        rgdal, XML, jsonlite, geojsonio, leaflet, leaflet.extras,
-        mapedit, shiny, shinyFiles, shinydashboard, shinyjs,
-        shinyWidgets, foreach, parallel, doParallel, httr, RcppTOML
-Suggests: spelling, geojsonlint, httptest, knitr, rmarkdown, sys,
-        tools, units, testthat (>= 2.1.0)
+        rgdal, XML, jsonlite, geojsonio, foreach, parallel, doParallel,
+        httr, RcppTOML
+Suggests: leaflet, leafpm, mapedit, shiny, shinyFiles, shinydashboard,
+        shinyjs, shinyWidgets, spelling, geojsonlint, httptest, knitr,
+        rmarkdown, sys, tools, units, testthat (>= 2.1.0)
 SystemRequirements: GDAL (>= 2.1.2), PROJ (>= 4.9.1), GEOS (>= 3.4.2),
         Cairo, Curl, NetCDF, jq, Protocol Buffers, V8, OpenSSL,
         Libxml2.
 VignetteBuilder: knitr
 RoxygenNote: 7.1.0
 Language: en-GB
 NeedsCompilation: no
-Packaged: 2020-04-22 08:40:27 UTC; lranghetti
+Packaged: 2020-06-01 03:15:30 UTC; lranghetti
 Author: Luigi Ranghetti [aut, cre] (<https://orcid.org/0000-0001-6207-5188>),
   Lorenzo Busetto [aut] (<https://orcid.org/0000-0001-9634-6038>)
 Maintainer: Luigi Ranghetti <luigi@ranghetti.info>
 Repository: CRAN
-Date/Publication: 2020-04-22 09:30:02 UTC
+Date/Publication: 2020-06-01 07:40:02 UTC

NAMESPACE

@@ -12,6 +12,7 @@ S3method(st_crs2,numeric)
 export(abs2rel)
 export(build_example_param_file)
 export(check_gdal)
+export(check_gui_deps)
 export(check_scihub_connection)
 export(check_scihub_login)
 export(check_sen2r_deps)
@@ -62,7 +63,6 @@ export(str_pad2)
 export(tiles_intersects)
 export(write_scihub_login)
 import(data.table)
-import(mapedit)
 importFrom(RcppTOML,parseTOML)
 importFrom(XML,htmlTreeParse)
 importFrom(XML,readHTMLTable)
@@ -82,29 +82,6 @@ importFrom(httr,progress)
 importFrom(httr,write_disk)
 importFrom(jsonlite,fromJSON)
 importFrom(jsonlite,toJSON)
-importFrom(leaflet,addLayersControl)
-importFrom(leaflet,addMapPane)
-importFrom(leaflet,addPolygons)
-importFrom(leaflet,addProviderTiles)
-importFrom(leaflet,addTiles)
-importFrom(leaflet,clearShapes)
-importFrom(leaflet,fitBounds)
-importFrom(leaflet,hideGroup)
-importFrom(leaflet,labelOptions)
-importFrom(leaflet,layersControlOptions)
-importFrom(leaflet,leaflet)
-importFrom(leaflet,leafletOutput)
-importFrom(leaflet,leafletProxy)
-importFrom(leaflet,pathOptions)
-importFrom(leaflet,removeLayersControl)
-importFrom(leaflet,removeShape)
-importFrom(leaflet,renderLeaflet)
-importFrom(leaflet.extras,addDrawToolbar)
-importFrom(leaflet.extras,drawPolygonOptions)
-importFrom(leaflet.extras,drawRectangleOptions)
-importFrom(leaflet.extras,editToolbarOptions)
-importFrom(leaflet.extras,removeDrawToolbar)
-importFrom(mapedit,editModUI)
 importFrom(methods,as)
 importFrom(methods,formalArgs)
 importFrom(methods,is)
@@ -140,6 +117,7 @@ importFrom(sf,st_convex_hull)
 importFrom(sf,st_coordinates)
 importFrom(sf,st_crs)
 importFrom(sf,st_difference)
+importFrom(sf,st_drivers)
 importFrom(sf,st_geometry)
 importFrom(sf,st_geometry_type)
 importFrom(sf,st_intersection)
@@ -156,114 +134,6 @@ importFrom(sf,st_transform)
 importFrom(sf,st_union)
 importFrom(sf,st_write)
 importFrom(sf,st_zm)
-importFrom(shiny,HTML)
-importFrom(shiny,NS)
-importFrom(shiny,a)
-importFrom(shiny,actionButton)
-importFrom(shiny,actionLink)
-importFrom(shiny,addResourcePath)
-importFrom(shiny,br)
-importFrom(shiny,callModule)
-importFrom(shiny,checkboxGroupInput)
-importFrom(shiny,checkboxInput)
-importFrom(shiny,code)
-importFrom(shiny,column)
-importFrom(shiny,conditionalPanel)
-importFrom(shiny,dateRangeInput)
-importFrom(shiny,div)
-importFrom(shiny,downloadButton)
-importFrom(shiny,downloadHandler)
-importFrom(shiny,em)
-importFrom(shiny,fileInput)
-importFrom(shiny,fluidPage)
-importFrom(shiny,fluidRow)
-importFrom(shiny,h2)
-importFrom(shiny,h3)
-importFrom(shiny,helpText)
-importFrom(shiny,hr)
-importFrom(shiny,htmlOutput)
-importFrom(shiny,icon)
-importFrom(shiny,img)
-importFrom(shiny,incProgress)
-importFrom(shiny,isolate)
-importFrom(shiny,modalButton)
-importFrom(shiny,modalDialog)
-importFrom(shiny,numericInput)
-importFrom(shiny,observe)
-importFrom(shiny,observeEvent)
-importFrom(shiny,outputOptions)
-importFrom(shiny,p)
-importFrom(shiny,passwordInput)
-importFrom(shiny,radioButtons)
-importFrom(shiny,reactive)
-importFrom(shiny,reactiveFileReader)
-importFrom(shiny,reactivePoll)
-importFrom(shiny,reactiveVal)
-importFrom(shiny,reactiveValues)
-importFrom(shiny,removeModal)
-importFrom(shiny,renderText)
-importFrom(shiny,renderUI)
-importFrom(shiny,req)
-importFrom(shiny,runApp)
-importFrom(shiny,selectInput)
-importFrom(shiny,setProgress)
-importFrom(shiny,shinyApp)
-importFrom(shiny,showModal)
-importFrom(shiny,sliderInput)
-importFrom(shiny,span)
-importFrom(shiny,stopApp)
-importFrom(shiny,strong)
-importFrom(shiny,tagList)
-importFrom(shiny,textInput)
-importFrom(shiny,textOutput)
-importFrom(shiny,uiOutput)
-importFrom(shiny,updateCheckboxGroupInput)
-importFrom(shiny,updateCheckboxInput)
-importFrom(shiny,updateDateRangeInput)
-importFrom(shiny,updateNumericInput)
-importFrom(shiny,updateRadioButtons)
-importFrom(shiny,updateSelectInput)
-importFrom(shiny,updateSliderInput)
-importFrom(shiny,updateTextInput)
-importFrom(shiny,verbatimTextOutput)
-importFrom(shiny,withMathJax)
-importFrom(shiny,withProgress)
-importFrom(shinyFiles,getVolumes)
-importFrom(shinyFiles,parseDirPath)
-importFrom(shinyFiles,parseFilePaths)
-importFrom(shinyFiles,parseSavePath)
-importFrom(shinyFiles,shinyDirButton)
-importFrom(shinyFiles,shinyDirChoose)
-importFrom(shinyFiles,shinyFileChoose)
-importFrom(shinyFiles,shinyFileSave)
-importFrom(shinyFiles,shinyFilesButton)
-importFrom(shinyFiles,shinySaveButton)
-importFrom(shinyWidgets,confirmSweetAlert)
-importFrom(shinyWidgets,pickerInput)
-importFrom(shinyWidgets,sendSweetAlert)
-importFrom(shinyWidgets,switchInput)
-importFrom(shinyWidgets,updatePickerInput)
-importFrom(shinyWidgets,updateSwitchInput)
-importFrom(shinydashboard,box)
-importFrom(shinydashboard,dashboardBody)
-importFrom(shinydashboard,dashboardHeader)
-importFrom(shinydashboard,dashboardPage)
-importFrom(shinydashboard,dashboardSidebar)
-importFrom(shinydashboard,menuItem)
-importFrom(shinydashboard,sidebarMenu)
-importFrom(shinydashboard,tabItem)
-importFrom(shinydashboard,tabItems)
-importFrom(shinyjs,click)
-importFrom(shinyjs,delay)
-importFrom(shinyjs,disable)
-importFrom(shinyjs,disabled)
-importFrom(shinyjs,enable)
-importFrom(shinyjs,extendShinyjs)
-importFrom(shinyjs,hidden)
-importFrom(shinyjs,hide)
-importFrom(shinyjs,html)
-importFrom(shinyjs,toggle)
-importFrom(shinyjs,useShinyjs)
 importFrom(stars,read_stars)
 importFrom(stars,st_dimensions)
 importFrom(stars,write_stars)
@@ -273,7 +143,6 @@ importFrom(stats,runif)
 importFrom(stats,setNames)
 importFrom(utils,capture.output)
 importFrom(utils,download.file)
-importFrom(utils,getFromNamespace)
 importFrom(utils,head)
 importFrom(utils,packageVersion)
 importFrom(utils,read.table)

NEWS.md

@@ -1,3 +1,22 @@
+# Version 1.3.5
+
+## Major changes
+- GDAL is no longer a mandatory external dependency, being used only to smooth/bufferise cloud masks (and optionally to compute spectral indices, RGB images and thumbnails).
+- "Graphical" packages needed to run the GUI (**`leaflet`**, **`leafpm`**, **`mapedit`**, **`shiny`**, **`shinyFiles`**, **`shinydashboard`**, **`shinyjs`**, **`shinyWidgets`**) are now suggested dependencies. In the case they are missing and the user tries to run the GUI, an error is returned with the command for installing them.
+
+## Minor changes
+- Edit the GUI in order to disable selectors when dependencies required to run them are not available.
+- Automatic tests were reorganised and improved after GDAL changes.
+
+## Documentation
+- Document **`sen2r`** installation over Ubuntu Focal.
+- Update documentation according to GDAL changes.
+
+## Bug fixes
+- Fix Travis-**`lwgeom`** incompatibilities (#319)
+- Fix #310 and #311
+
+
 # Version 1.3.4
 
 ## New functions
@@ -180,7 +199,7 @@ Here above the related changes:
 <br/>
 ## **sen2r** CRAN release
 _________________________
-**`sen2r`** was accepted on CRAN (2017-10-21, version 1.1.0).
+**`sen2r`** was accepted on CRAN (2019-10-21, version 1.1.0).
 From now, it is possible to install [the CRAN version](https://CRAN.R-project.org/package=sen2r) with the following command:
 ```r
 install.packages("sen2r")

R/abs2rel.R

@@ -16,6 +16,11 @@
 #' @return The relative path
 #'
 #' @author Luigi Ranghetti, phD (2017) \email{luigi.ranghetti@@gmail.com}
+#' @references L. Ranghetti, M. Boschetti, F. Nutini, L. Busetto (2020).
+#'  "sen2r": An R toolbox for automatically downloading and preprocessing 
+#'  Sentinel-2 satellite data. _Computers & Geosciences_, 139, 104473. DOI: 
+#'  \href{https://doi.org/10.1016/j.cageo.2020.104473}{10.1016/j.cageo.2020.104473}, 
+#'  URL: \url{http://sen2r.ranghetti.info/}.
 #' @note License: GPL 3.0
 #' @export
 #'

R/add_rgb_image.R

@@ -3,13 +3,30 @@
 #' @param s2_bands 2-length list (one for TOA, one for BOA),
 #'  each element being a list of S2 bands, as defined in [s2_gui].
 #' @author Luigi Ranghetti, phD (2019) \email{luigi@@ranghetti.info}
+#' @references L. Ranghetti, M. Boschetti, F. Nutini, L. Busetto (2020).
+#'  "sen2r": An R toolbox for automatically downloading and preprocessing 
+#'  Sentinel-2 satellite data. _Computers & Geosciences_, 139, 104473. DOI: 
+#'  \href{https://doi.org/10.1016/j.cageo.2020.104473}{10.1016/j.cageo.2020.104473}, 
+#'  URL: \url{http://sen2r.ranghetti.info/}.
 #' @note License: GPL 3.0
-#' @importFrom shiny actionButton column fluidRow HTML icon modalButton
-#'  modalDialog radioButtons sliderInput strong tagList
-#' @importFrom shinyWidgets pickerInput
 
 add_rgb_image <- function(s2_bands) {
 
+  # Define internal functions as aliases of shiny* - leaflet* ones,
+  # so to avoid using "shiny::" every time
+  actionButton <- shiny::actionButton
+  column <- shiny::column
+  fluidRow <- shiny::fluidRow
+  HTML <- shiny::HTML
+  icon <- shiny::icon
+  modalButton <- shiny::modalButton
+  modalDialog <- shiny::modalDialog
+  radioButtons <- shiny::radioButtons
+  sliderInput <- shiny::sliderInput
+  strong <- shiny::strong
+  tagList <- shiny::tagList
+  pickerInput <- shinyWidgets::pickerInput
+
   modalDialog(
     title = "Set a new RGB image",
     size = "m",

R/build_example_param_file.R

@@ -9,6 +9,11 @@
 #' @return The path of the created file.
 #'
 #' @author Luigi Ranghetti, phD (2019) \email{luigi@@ranghetti.info}
+#' @references L. Ranghetti, M. Boschetti, F. Nutini, L. Busetto (2020).
+#'  "sen2r": An R toolbox for automatically downloading and preprocessing 
+#'  Sentinel-2 satellite data. _Computers & Geosciences_, 139, 104473. DOI: 
+#'  \href{https://doi.org/10.1016/j.cageo.2020.104473}{10.1016/j.cageo.2020.104473}, 
+#'  URL: \url{http://sen2r.ranghetti.info/}.
 #' @note License: GPL 3.0
 #' @importFrom jsonlite toJSON
 #' @export