Skip to content

Commit

Permalink
Devel (#150)
Browse files Browse the repository at this point in the history
* Change site URL
* Restore v8-3.14 on ArchLinux (package v8 fails to build)
  • Loading branch information
ranghetti authored Feb 11, 2019
1 parent 207af50 commit 6483095
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 51 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions R/s2_gui.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
Expand Down Expand Up @@ -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"
)
)
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -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;",
Expand Down
32 changes: 16 additions & 16 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 <span style="color:#5793dd;vertical-align:top;font-size:90%;font-weight:normal;">sen</span><span style="color:#6a7077;vertical-align:baseline;font-size:115%;font-weight:bolder;">2</span><span style="color:#2f66d5;vertical-align:baseline;font-size:90%;font-weight:bold;">r</span> 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
Expand Down Expand Up @@ -118,35 +118,35 @@ and then launches the main function.
</p>

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
Expand All @@ -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,
Expand All @@ -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},
}
```
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <span style="color:#5793dd;vertical-align:top;font-size:90%;font-weight:normal;">sen</span><span style="color:#6a7077;vertical-align:baseline;font-size:115%;font-weight:bolder;">2</span><span style="color:#2f66d5;vertical-align:baseline;font-size:90%;font-weight:bold;">r</span> 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
-----
Expand All @@ -63,20 +63,20 @@ this opens a GUI which allows to set the required processing parameters, and the
<p style="text-align:center;">
<a href="https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_gui_sheet1.png" target="_blank"> <img src="man/figures/sen2r_gui_sheet1_small.png"> </a> <a href="https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_gui_sheet2.png" target="_blank"> <img src="man/figures/sen2r_gui_sheet2_small.png"> </a> <br/> <a href="https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_gui_sheet3.png" target="_blank"> <img src="man/figures/sen2r_gui_sheet3_small.png"> </a> <a href="https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_gui_sheet4.png" target="_blank"> <img src="man/figures/sen2r_gui_sheet4_small.png"> </a> <a href="https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_gui_sheet5.png" target="_blank"> <img src="man/figures/sen2r_gui_sheet5_small.png"> </a>
</p>
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
-------
Expand All @@ -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: <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](https://dx.doi.org/10.5281/zenodo.1240384). URL: <http://sen2r.ranghetti.info>.

``` bibtex
@Manual{sen2r,
Expand All @@ -98,6 +98,6 @@ Ranghetti, L. and Busetto, L. (2019). *sen2r: an R toolbox to find, download a
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},
}
```
4 changes: 2 additions & 2 deletions docs/articles/installation.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions index.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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},
}
```
Loading

0 comments on commit 6483095

Please sign in to comment.