From 648309530bf5dc351d63552b5ceb54277b73193e Mon Sep 17 00:00:00 2001 From: Luigi Ranghetti <6874239+ranghetti@users.noreply.github.com> Date: Mon, 11 Feb 2019 15:55:26 +0100 Subject: [PATCH] Devel (#150) * Change site URL * Restore v8-3.14 on ArchLinux (package v8 fails to build) --- DESCRIPTION | 2 +- R/s2_gui.R | 6 ++--- R/zzz.R | 2 +- README.Rmd | 32 +++++++++++------------ README.md | 28 ++++++++++---------- docs/articles/installation.html | 4 +-- docs/authors.html | 4 +-- docs/index.html | 4 +-- index.Rmd | 4 +-- index.md | 4 +-- inst/CITATION | 4 +-- inst/extdata/code/create_README.sh | 4 +-- inst/logs/190130104033_s2_translate.txt | 4 +++ inst/logs/190130105135_s2_calcindices.txt | 1 + inst/logs/190130161207_s2download.txt | 2 ++ inst/logs/190208152347_gdal_warp.txt | 3 +++ inst/logs/190208152944_s2_mask.txt | 6 +++++ vignettes/installation.Rmd | 4 +-- 18 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 inst/logs/190130104033_s2_translate.txt create mode 100644 inst/logs/190130105135_s2_calcindices.txt create mode 100644 inst/logs/190130161207_s2download.txt create mode 100644 inst/logs/190208152347_gdal_warp.txt create mode 100644 inst/logs/190208152944_s2_mask.txt diff --git a/DESCRIPTION b/DESCRIPTION index d3e63062..a3b71be2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -14,7 +14,7 @@ Description: This package contains useful functions to preprocess Sentinel-2 ima This package is under construction. License: GPL-3 + file LICENSE Encoding: UTF-8 -URL: https://ranghetti.github.io/sen2r, https://github.com/ranghetti/sen2r +URL: http://sen2r.ranghetti.info, https://github.com/ranghetti/sen2r BugReports: https://github.com/ranghetti/sen2r/issues Imports: reticulate, diff --git a/R/s2_gui.R b/R/s2_gui.R index 3cc11b30..65963b8a 100644 --- a/R/s2_gui.R +++ b/R/s2_gui.R @@ -69,7 +69,7 @@ s2_gui <- function(param_list = NULL, div( style = "text-align:center;padding-top:17px;padding-bottom:30px;", a( - href='https://ranghetti.github.io/sen2r', + href='http://sen2r.ranghetti.info', target = "_blank", uiOutput("img_logo") ) @@ -186,8 +186,8 @@ s2_gui <- function(param_list = NULL, "open_github_doc", label = "\u2000Open documentation", icon = icon("info-circle"), - onclick ="window.open('https://ranghetti.github.io/sen2r', '_blank')", - # onclick ="window.open('https://ranghetti.github.io/sen2r/articles/sen2r_gui.html', '_blank')", + onclick ="window.open('http://sen2r.ranghetti.info', '_blank')", + # onclick ="window.open('http://sen2r.ranghetti.info/articles/sen2r_gui.html', '_blank')", class = "darkbutton" ) ) diff --git a/R/zzz.R b/R/zzz.R index 3fa82a03..e6e2d955 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -2,7 +2,7 @@ packageStartupMessage(paste( "Welcome to sen2r. To use the package from a GUI, launch", " > sen2r()", - "Documentation: https://ranghetti.github.io/sen2r", + "Documentation: http://sen2r.ranghetti.info", if (Sys.info()["sysname"] == "Windows") { paste( "\nIMPORTANT: sen2r depends on some external tools;", diff --git a/README.Rmd b/README.Rmd index 4f40566d..84123e5c 100644 --- a/README.Rmd +++ b/README.Rmd @@ -77,13 +77,13 @@ remotes::install_github("ranghetti/sen2r") ``` For detailed instructions about installing the package (including dependencies), -see the [Installation](https://ranghetti.github.io/sen2r/articles/installation.html) page. +see the [Installation](http://sen2r.ranghetti.info/articles/installation.html) page. ### Run as Docker image A dockerised version of sen2r is available [here](https://cloud.docker.com/repository/docker/ranghetti/sen2r). -For detailed instructions about using it, see the page ["Run in a Docker container"](https://ranghetti.github.io/sen2r/articles/docker.html) page. +For detailed instructions about using it, see the page ["Run in a Docker container"](http://sen2r.ranghetti.info/articles/docker.html) page. ## Usage @@ -118,35 +118,35 @@ and then launches the main function.
Alternatively, -[`sen2r()`](https://ranghetti.github.io/sen2r/reference/sen2r.html) +[`sen2r()`](http://sen2r.ranghetti.info/reference/sen2r.html) can be launched with a list of parameters (created with -[`s2_gui()`](https://ranghetti.github.io/sen2r/reference/s2_gui.html)) +[`s2_gui()`](http://sen2r.ranghetti.info/reference/s2_gui.html)) or passing manually the parameters as arguments of the function -(see [the documentation of the function](https://ranghetti.github.io/sen2r/reference/sen2r.html) for further details). +(see [the documentation of the function](http://sen2r.ranghetti.info/reference/sen2r.html) for further details). Other specific functions can be used to run single steps separately: -* [`s2_list()`](https://ranghetti.github.io/sen2r/reference/s2_list.html) +* [`s2_list()`](http://sen2r.ranghetti.info/reference/s2_list.html) to retrieve the list of available Sentinel-2 products basing on input parameters; -* [`s2_download()`](https://ranghetti.github.io/sen2r/reference/s2_download.html) +* [`s2_download()`](http://sen2r.ranghetti.info/reference/s2_download.html) to download Sentinel-2 products; * [`sen2cor()`](reference/sen2cor.html) to correct level-1C products using [Sen2Cor](http://step.esa.int/main/third-party-plugins-2/sen2cor); -* [`s2_translate()`](https://ranghetti.github.io/sen2r/reference/s2_translate.html) +* [`s2_translate()`](http://sen2r.ranghetti.info/reference/s2_translate.html) to convert Sentinel-2 products from SAFE format to a format managed by GDAL; -* [`s2_merge()`](https://ranghetti.github.io/sen2r/reference/s2_merge.html) +* [`s2_merge()`](http://sen2r.ranghetti.info/reference/s2_merge.html) to merge Sentinel-2 tiles which have the same date and orbit; -* [`gdal_warp()`](https://ranghetti.github.io/sen2r/reference/gdal_warp.html) +* [`gdal_warp()`](http://sen2r.ranghetti.info/reference/gdal_warp.html) to clip, reproject and warp raster files (this is a wrapper to call [gdal_translate](http://www.gdal.org/gdal_translate.html) or [gdalwarp](http://www.gdal.org/gdalwarp.html) basing on input parameters); -* [`s2_mask()`](https://ranghetti.github.io/sen2r/reference/s2_mask.html) +* [`s2_mask()`](http://sen2r.ranghetti.info/reference/s2_mask.html) to apply a cloud mask to Sentinel-2 products; -* [`s2_rgb()`](https://ranghetti.github.io/sen2r/reference/s2_rgb.html) +* [`s2_rgb()`](http://sen2r.ranghetti.info/reference/s2_rgb.html) to generate RGB images from Sentinel-2 Surface Reflectance multiband raster files; -* [`s2_calcindices()`](https://ranghetti.github.io/sen2r/reference/s2_calcindices.html) +* [`s2_calcindices()`](http://sen2r.ranghetti.info/reference/s2_calcindices.html) to compute maps of spectral indices from Sentinel-2 Surface Reflectance multiband raster files; -* [`s2_thumbnails()`](https://ranghetti.github.io/sen2r/reference/s2_thumbnails.html) +* [`s2_thumbnails()`](http://sen2r.ranghetti.info/reference/s2_thumbnails.html) to generate RGB thumbnails (JPEG or PNG) of the products. ## Credits @@ -165,7 +165,7 @@ The functionalities to search and download SAFE tiles are based on the Python to To cite this library, please use the following entry: -Ranghetti, L.\ and Busetto, L.\ (`r strftime(Sys.Date(),"%Y")`). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version `r packageVersion("sen2r")`. DOI: [10.5281/zenodo.1240384](https://dx.doi.org/10.5281/zenodo.1240384). URL: [https://ranghetti.github.io/sen2r](https://ranghetti.github.io/sen2r). +Ranghetti, L.\ and Busetto, L.\ (`r strftime(Sys.Date(),"%Y")`). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version `r packageVersion("sen2r")`. DOI: [10.5281/zenodo.1240384](https://dx.doi.org/10.5281/zenodo.1240384). URL: [http://sen2r.ranghetti.info](http://sen2r.ranghetti.info). ```bibtex @Manual{sen2r, @@ -174,6 +174,6 @@ Ranghetti, L.\ and Busetto, L.\ (`r strftime(Sys.Date(),"%Y")`). *sen2r: an R to year = {`r strftime(Sys.Date(),"%Y")`}, note = {R package version `r packageVersion("sen2r")`}, doi = {10.5281/zenodo.1240384}, - url = {https://ranghetti.github.io/sen2r}, + url = {http://sen2r.ranghetti.info}, } ``` diff --git a/README.md b/README.md index 305a61dd..dec7645f 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,13 @@ The package can be installed from GitHub with the R package **remotes**: remotes::install_github("ranghetti/sen2r") ``` -For detailed instructions about installing the package (including dependencies), see the [Installation](https://ranghetti.github.io/sen2r/articles/installation.html) page. +For detailed instructions about installing the package (including dependencies), see the [Installation](http://sen2r.ranghetti.info/articles/installation.html) page. ### Run as Docker image A dockerised version of sen2r is available [here](https://cloud.docker.com/repository/docker/ranghetti/sen2r). -For detailed instructions about using it, see the page ["Run in a Docker container"](https://ranghetti.github.io/sen2r/articles/docker.html) page. +For detailed instructions about using it, see the page ["Run in a Docker container"](http://sen2r.ranghetti.info/articles/docker.html) page. Usage ----- @@ -63,20 +63,20 @@ this opens a GUI which allows to set the required processing parameters, and the -Alternatively, [`sen2r()`](https://ranghetti.github.io/sen2r/reference/sen2r.html) can be launched with a list of parameters (created with [`s2_gui()`](https://ranghetti.github.io/sen2r/reference/s2_gui.html)) or passing manually the parameters as arguments of the function (see [the documentation of the function](https://ranghetti.github.io/sen2r/reference/sen2r.html) for further details). +Alternatively, [`sen2r()`](http://sen2r.ranghetti.info/reference/sen2r.html) can be launched with a list of parameters (created with [`s2_gui()`](http://sen2r.ranghetti.info/reference/s2_gui.html)) or passing manually the parameters as arguments of the function (see [the documentation of the function](http://sen2r.ranghetti.info/reference/sen2r.html) for further details). Other specific functions can be used to run single steps separately: -- [`s2_list()`](https://ranghetti.github.io/sen2r/reference/s2_list.html) to retrieve the list of available Sentinel-2 products basing on input parameters; -- [`s2_download()`](https://ranghetti.github.io/sen2r/reference/s2_download.html) to download Sentinel-2 products; +- [`s2_list()`](http://sen2r.ranghetti.info/reference/s2_list.html) to retrieve the list of available Sentinel-2 products basing on input parameters; +- [`s2_download()`](http://sen2r.ranghetti.info/reference/s2_download.html) to download Sentinel-2 products; - [`sen2cor()`](reference/sen2cor.html) to correct level-1C products using [Sen2Cor](http://step.esa.int/main/third-party-plugins-2/sen2cor); -- [`s2_translate()`](https://ranghetti.github.io/sen2r/reference/s2_translate.html) to convert Sentinel-2 products from SAFE format to a format managed by GDAL; -- [`s2_merge()`](https://ranghetti.github.io/sen2r/reference/s2_merge.html) to merge Sentinel-2 tiles which have the same date and orbit; -- [`gdal_warp()`](https://ranghetti.github.io/sen2r/reference/gdal_warp.html) to clip, reproject and warp raster files (this is a wrapper to call [gdal\_translate](http://www.gdal.org/gdal_translate.html) or [gdalwarp](http://www.gdal.org/gdalwarp.html) basing on input parameters); -- [`s2_mask()`](https://ranghetti.github.io/sen2r/reference/s2_mask.html) to apply a cloud mask to Sentinel-2 products; -- [`s2_rgb()`](https://ranghetti.github.io/sen2r/reference/s2_rgb.html) to generate RGB images from Sentinel-2 Surface Reflectance multiband raster files; -- [`s2_calcindices()`](https://ranghetti.github.io/sen2r/reference/s2_calcindices.html) to compute maps of spectral indices from Sentinel-2 Surface Reflectance multiband raster files; -- [`s2_thumbnails()`](https://ranghetti.github.io/sen2r/reference/s2_thumbnails.html) to generate RGB thumbnails (JPEG or PNG) of the products. +- [`s2_translate()`](http://sen2r.ranghetti.info/reference/s2_translate.html) to convert Sentinel-2 products from SAFE format to a format managed by GDAL; +- [`s2_merge()`](http://sen2r.ranghetti.info/reference/s2_merge.html) to merge Sentinel-2 tiles which have the same date and orbit; +- [`gdal_warp()`](http://sen2r.ranghetti.info/reference/gdal_warp.html) to clip, reproject and warp raster files (this is a wrapper to call [gdal\_translate](http://www.gdal.org/gdal_translate.html) or [gdalwarp](http://www.gdal.org/gdalwarp.html) basing on input parameters); +- [`s2_mask()`](http://sen2r.ranghetti.info/reference/s2_mask.html) to apply a cloud mask to Sentinel-2 products; +- [`s2_rgb()`](http://sen2r.ranghetti.info/reference/s2_rgb.html) to generate RGB images from Sentinel-2 Surface Reflectance multiband raster files; +- [`s2_calcindices()`](http://sen2r.ranghetti.info/reference/s2_calcindices.html) to compute maps of spectral indices from Sentinel-2 Surface Reflectance multiband raster files; +- [`s2_thumbnails()`](http://sen2r.ranghetti.info/reference/s2_thumbnails.html) to generate RGB thumbnails (JPEG or PNG) of the products. Credits ------- @@ -89,7 +89,7 @@ The functionalities to search and download SAFE tiles are based on the Python to To cite this library, please use the following entry: -Ranghetti, L. and Busetto, L. (2019). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version 1.0.0. DOI: [10.5281/zenodo.1240384](https://dx.doi.org/10.5281/zenodo.1240384). URL:sudo pacman -S --noconfirm r base-devel gcc-fortran python-gdal wget aria2 jq protobuf git
cd /tmp; git clone https://aur.archlinux.org/gyp-git.git
cd gyp-git; makepkg -si --noconfirm
-cd /tmp; git clone https://aur.archlinux.org/v8.git
-cd v8; makepkg -si --noconfirm
+cd /tmp; git clone https://aur.archlinux.org/v8-3.14.git
+cd v8-3.14; makepkg -si --noconfirm
cd /tmp; git clone https://aur.archlinux.org/udunits.git
cd udunits; makepkg -si --noconfirm
Installation was tested on date 2018-11-21.
diff --git a/docs/authors.html b/docs/authors.html index 07495460..2b02f568 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -109,7 +109,7 @@Ranghetti L, Busetto L (2019). sen2r: an R toolbox to find, download and preprocess Sentinel-2 data. -doi: 10.5281/zenodo.1240384, R package version 1.0.0, https://ranghetti.github.io/sen2r. +doi: 10.5281/zenodo.1240384, R package version 1.0.0, http://sen2r.ranghetti.info.
@Manual{, author = {Luigi Ranghetti and Lorenzo Busetto}, @@ -117,7 +117,7 @@Citation
year = {2019}, note = {R package version 1.0.0}, doi = {10.5281/zenodo.1240384}, - url = {https://ranghetti.github.io/sen2r}, + url = {http://sen2r.ranghetti.info}, }
The sen2r logo, partially derived from the R logo, is released under the Creative Commons Attribution-ShareAlike 4.0 International license (CC-BY-SA 4.0).
The functionalities to search and download SAFE tiles are based on the Python tool Sentinel-download by Olivier Hagolle, released under the GNU General Public License version 2 (GPL‑2).
To cite this library, please use the following entry:
-Ranghetti, L. and Busetto, L. (2019). sen2r: an R toolbox to find, download and preprocess Sentinel-2 data. R package version 1.0.0. DOI: 10.5281/zenodo.1240384. URL: https://ranghetti.github.io/sen2r.
+Ranghetti, L. and Busetto, L. (2019). sen2r: an R toolbox to find, download and preprocess Sentinel-2 data. R package version 1.0.0. DOI: 10.5281/zenodo.1240384. URL: http://sen2r.ranghetti.info.
@Manual{sen2r,
title = {sen2r: an R toolbox to find, download and preprocess Sentinel-2 data},
author = {Luigi Ranghetti and Lorenzo Busetto},
year = {2019},
note = {R package version 1.0.0},
doi = {10.5281/zenodo.1240384},
- url = {https://ranghetti.github.io/sen2r},
+ url = {http://sen2r.ranghetti.info},
}