diff --git a/DESCRIPTION b/DESCRIPTION index da64028e..ebc96381 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: sen2r Type: Package Title: Find, Download and Process Sentinel-2 Data -Version: 1.3.5 +Version: 1.3.6 Authors@R: c(person("Luigi", "Ranghetti", email = "luigi@ranghetti.info", role = c("aut", "cre"), @@ -16,6 +16,8 @@ Description: Functions to download Sentinel-2 optical images (and eventually automate) the steps necessary to build a complete Sentinel-2 processing chain. A Graphical User Interface to facilitate data processing is also provided. + For additional documentation refer to the following article: + Ranghetti et al. (2020) . License: GPL-3 Encoding: UTF-8 URL: http://sen2r.ranghetti.info, https://github.com/ranghetti/sen2r diff --git a/NEWS.md b/NEWS.md index fd0d145b..86e1fbae 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# Version 1.3.6 + +## Bug fixes +- Fix GDAL usage over Windows (a new version was specifically released for this bug because it caused **`sen2r`** stopping for many Windows users). + + # Version 1.3.5 ## Major changes diff --git a/R/check_sen2r_deps.R b/R/check_sen2r_deps.R index 29a7a55d..b6972665 100644 --- a/R/check_sen2r_deps.R +++ b/R/check_sen2r_deps.R @@ -190,8 +190,8 @@ check_sen2r_deps <- function() { # build the icon of the check observe({ input$check_gdal - rv$check_gdal_isvalid <- if (!is.null(binpaths()$gdal_calc)) { - file.exists(binpaths()$gdal_calc) + rv$check_gdal_isvalid <- if (!is.null(binpaths()$gdalinfo)) { + file.exists(binpaths()$gdalinfo) } else {FALSE} }) output$check_gdal_isvalid <- renderText(rv$check_gdal_isvalid) diff --git a/R/init_python.R b/R/init_python.R index 50c3b950..af565af0 100644 --- a/R/init_python.R +++ b/R/init_python.R @@ -19,7 +19,7 @@ init_python <- function() { binpaths <- load_binpaths("gdal") pythonhome_new <- list.files( - file.path(dirname(dirname(binpaths$gdal_calc)),"apps"), + file.path(dirname(dirname(binpaths$gdalinfo)),"apps"), pattern="^Python", full.names=TRUE )[1] diff --git a/cran-comments.md b/cran-comments.md index 0ad906d5..318e9e0c 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,4 @@ -# sen2r v. 1.3.5 +# sen2r v. 1.3.6 ## Test environments * [local installation] Ubuntu 18.04, 64 bit, R 3.6.3 @@ -9,4 +9,12 @@ * [win-builder] R unstable (r78617), 4.0.0 and 3.6.3 (devel, release and oldrelease) ## R CMD check results -There were no ERRORs, WARNINGs or NOTEs. \ No newline at end of file +There were no ERRORs or WARNINGs. + +A note was returned: +``` +Days since last update: 3 +``` +this because this is a bug-fixing release: +the bug I need to fix affects the major part of Windows users, +so this patch is urgent. diff --git a/docs/404.html b/docs/404.html index b85538bf..edd9327c 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/CODE-OF-CONDUCT.html b/docs/CODE-OF-CONDUCT.html index d589aa72..21b32db5 100644 --- a/docs/CODE-OF-CONDUCT.html +++ b/docs/CODE-OF-CONDUCT.html @@ -81,7 +81,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 74a86205..a6405bad 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -81,7 +81,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/docker.html b/docs/articles/docker.html index 8cf30d9a..42378ea3 100644 --- a/docs/articles/docker.html +++ b/docs/articles/docker.html @@ -37,7 +37,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/index.html b/docs/articles/index.html index 6e6e6950..207e44f0 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/installation.html b/docs/articles/installation.html index f3291454..3c698fc4 100644 --- a/docs/articles/installation.html +++ b/docs/articles/installation.html @@ -37,7 +37,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/outstructure.html b/docs/articles/outstructure.html index 009ad363..0e349cbe 100644 --- a/docs/articles/outstructure.html +++ b/docs/articles/outstructure.html @@ -37,7 +37,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/sen2r_cmd.html b/docs/articles/sen2r_cmd.html index 8a7e642a..bfd5bc33 100644 --- a/docs/articles/sen2r_cmd.html +++ b/docs/articles/sen2r_cmd.html @@ -37,7 +37,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/articles/sen2r_gui.html b/docs/articles/sen2r_gui.html index 5794ba9c..b6ebeb09 100644 --- a/docs/articles/sen2r_gui.html +++ b/docs/articles/sen2r_gui.html @@ -37,7 +37,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/authors.html b/docs/authors.html index 22dd5348..dfc02d91 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ sen2r: Find, Download and Process Sentinel-2 Data - 1.3.5 + 1.3.6 diff --git a/docs/index.html b/docs/index.html index 4a178cc1..7a5613ed 100644 --- a/docs/index.html +++ b/docs/index.html @@ -17,7 +17,9 @@ sen2r provides the instruments required to easily perform (and eventually automate) the steps necessary to build a complete Sentinel-2 processing chain. - A Graphical User Interface to facilitate data processing is also provided."> + A Graphical User Interface to facilitate data processing is also provided. + For additional documentation refer to the following article: + Ranghetti et al. (2020) <doi:10.1016/j.cageo.2020.104473>.">