diff --git a/README.Rmd b/README.Rmd index 5f69de34..3421a6a1 100644 --- a/README.Rmd +++ b/README.Rmd @@ -25,7 +25,7 @@ knitr::opts_chunk$set( -# An R toolbox to find, download and preprocess Sentinel-2 data +# R toolbox to find, download and preprocess Sentinel-2 data sen2r is an R library which helps to download and preprocess Sentinel-2 optical images. @@ -104,18 +104,22 @@ this opens a GUI which allows to set the required processing parameters, and then launches the main function.

- + - + - +
+ - + + + +

Alternatively, @@ -160,9 +164,11 @@ The [ -An R toolbox to find, download and preprocess Sentinel-2 data -============================================================= +R toolbox to find, download and preprocess Sentinel-2 data +========================================================== sen2r is an R library which helps to download and preprocess Sentinel-2 optical images. The purpose of the functions contained in the library is to provide the instruments required to easily perform (and eventually automate) all the steps necessary to build a complete Sentinel-2 processing chain, without the need of any manual intervention nor the needing to manually integrate any external tool. @@ -67,7 +67,7 @@ sen2r() this opens a GUI which allows to set the required processing parameters, and then launches the main function.

- +

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). @@ -90,9 +90,11 @@ Credits The [sen2r logo](https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_logo_200px.png), partially derived from the [R logo](https://www.r-project.org/logo), is released under the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0) (CC-BY-SA 4.0). +The functionalities to search and download SAFE tiles are based on the Python tool [Sentinel-download](https://github.com/olivierhagolle/Sentinel-download) by Olivier Hagolle, released under the [GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.html) (GPL‑2). + To cite this library, please use the following entry: -Ranghetti, L. and Busetto, L. (2018). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version 0.3.4. DOI: [10.5281/zenodo.1240384](https://ranghetti.github.io/sen2r). +Ranghetti, L. and Busetto, L. (2018). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version 0.3.4. DOI: [10.5281/zenodo.1240384](https://dx.doi.org/10.5281/zenodo.1240384). URL: . ``` bibtex @Manual{sen2r, diff --git a/docs/articles/sen2r_gui.html b/docs/articles/sen2r_gui.html index 530e274f..eeced33b 100644 --- a/docs/articles/sen2r_gui.html +++ b/docs/articles/sen2r_gui.html @@ -92,7 +92,7 @@

Description of the GUI

The GUI is composed of four main sheets:

- +

  1. diff --git a/docs/articles/sen2r_gui_sheet1.jpg b/docs/articles/sen2r_gui_sheet1.jpg deleted file mode 100644 index 21398746..00000000 Binary files a/docs/articles/sen2r_gui_sheet1.jpg and /dev/null differ diff --git a/docs/articles/sen2r_gui_sheet1.png b/docs/articles/sen2r_gui_sheet1.png new file mode 100755 index 00000000..9028d87a Binary files /dev/null and b/docs/articles/sen2r_gui_sheet1.png differ diff --git a/docs/articles/sen2r_gui_sheet1_small.png b/docs/articles/sen2r_gui_sheet1_small.png index 1a29f6e6..25839088 100644 Binary files a/docs/articles/sen2r_gui_sheet1_small.png and b/docs/articles/sen2r_gui_sheet1_small.png differ diff --git a/docs/articles/sen2r_gui_sheet2.jpg b/docs/articles/sen2r_gui_sheet2.jpg deleted file mode 100644 index d22be0af..00000000 Binary files a/docs/articles/sen2r_gui_sheet2.jpg and /dev/null differ diff --git a/docs/articles/sen2r_gui_sheet2.png b/docs/articles/sen2r_gui_sheet2.png new file mode 100755 index 00000000..5fb970d6 Binary files /dev/null and b/docs/articles/sen2r_gui_sheet2.png differ diff --git a/docs/articles/sen2r_gui_sheet2_small.png b/docs/articles/sen2r_gui_sheet2_small.png index d8e1f25a..60fff6da 100644 Binary files a/docs/articles/sen2r_gui_sheet2_small.png and b/docs/articles/sen2r_gui_sheet2_small.png differ diff --git a/docs/articles/sen2r_gui_sheet3.jpg b/docs/articles/sen2r_gui_sheet3.jpg deleted file mode 100644 index 3009d7c0..00000000 Binary files a/docs/articles/sen2r_gui_sheet3.jpg and /dev/null differ diff --git a/docs/articles/sen2r_gui_sheet3.png b/docs/articles/sen2r_gui_sheet3.png new file mode 100755 index 00000000..81905d55 Binary files /dev/null and b/docs/articles/sen2r_gui_sheet3.png differ diff --git a/docs/articles/sen2r_gui_sheet3_small.png b/docs/articles/sen2r_gui_sheet3_small.png index 34e42c95..79dad87d 100644 Binary files a/docs/articles/sen2r_gui_sheet3_small.png and b/docs/articles/sen2r_gui_sheet3_small.png differ diff --git a/docs/articles/sen2r_gui_sheet4.jpg b/docs/articles/sen2r_gui_sheet4.jpg deleted file mode 100644 index fb8abcc6..00000000 Binary files a/docs/articles/sen2r_gui_sheet4.jpg and /dev/null differ diff --git a/docs/articles/sen2r_gui_sheet4.png b/docs/articles/sen2r_gui_sheet4.png new file mode 100755 index 00000000..195413b4 Binary files /dev/null and b/docs/articles/sen2r_gui_sheet4.png differ diff --git a/docs/articles/sen2r_gui_sheet4_small.png b/docs/articles/sen2r_gui_sheet4_small.png index c6a5fcdd..7355b3b6 100644 Binary files a/docs/articles/sen2r_gui_sheet4_small.png and b/docs/articles/sen2r_gui_sheet4_small.png differ diff --git a/docs/articles/sen2r_gui_sheet5.png b/docs/articles/sen2r_gui_sheet5.png new file mode 100755 index 00000000..730958e6 Binary files /dev/null and b/docs/articles/sen2r_gui_sheet5.png differ diff --git a/docs/articles/sen2r_gui_sheet5_small.png b/docs/articles/sen2r_gui_sheet5_small.png new file mode 100644 index 00000000..45e34e3b Binary files /dev/null and b/docs/articles/sen2r_gui_sheet5_small.png differ diff --git a/docs/authors.html b/docs/authors.html index f4f44678..2a324009 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -6,7 +6,7 @@ -Authors • An R toolbox to find, download an preprocess Sentinel-2 data +Citation and Authors • An R toolbox to find, download an preprocess Sentinel-2 data @@ -30,7 +30,7 @@ - + @@ -57,7 +57,7 @@ -
    +
    2. +
    +

    Citation

    + +

    Developers

      diff --git a/docs/reference/figures/sen2r_gui_sheet1.jpg b/docs/reference/figures/sen2r_gui_sheet1.jpg deleted file mode 100644 index 21398746..00000000 Binary files a/docs/reference/figures/sen2r_gui_sheet1.jpg and /dev/null differ diff --git a/docs/reference/figures/sen2r_gui_sheet1.png b/docs/reference/figures/sen2r_gui_sheet1.png new file mode 100755 index 00000000..9028d87a Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet1.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet1_small.png b/docs/reference/figures/sen2r_gui_sheet1_small.png index 1a29f6e6..25839088 100644 Binary files a/docs/reference/figures/sen2r_gui_sheet1_small.png and b/docs/reference/figures/sen2r_gui_sheet1_small.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet2.jpg b/docs/reference/figures/sen2r_gui_sheet2.jpg deleted file mode 100644 index d22be0af..00000000 Binary files a/docs/reference/figures/sen2r_gui_sheet2.jpg and /dev/null differ diff --git a/docs/reference/figures/sen2r_gui_sheet2.png b/docs/reference/figures/sen2r_gui_sheet2.png new file mode 100755 index 00000000..5fb970d6 Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet2.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet2_small.png b/docs/reference/figures/sen2r_gui_sheet2_small.png index d8e1f25a..60fff6da 100644 Binary files a/docs/reference/figures/sen2r_gui_sheet2_small.png and b/docs/reference/figures/sen2r_gui_sheet2_small.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet3.jpg b/docs/reference/figures/sen2r_gui_sheet3.jpg deleted file mode 100644 index 3009d7c0..00000000 Binary files a/docs/reference/figures/sen2r_gui_sheet3.jpg and /dev/null differ diff --git a/docs/reference/figures/sen2r_gui_sheet3.png b/docs/reference/figures/sen2r_gui_sheet3.png new file mode 100755 index 00000000..81905d55 Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet3.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet3_small.png b/docs/reference/figures/sen2r_gui_sheet3_small.png index 34e42c95..79dad87d 100644 Binary files a/docs/reference/figures/sen2r_gui_sheet3_small.png and b/docs/reference/figures/sen2r_gui_sheet3_small.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet4.jpg b/docs/reference/figures/sen2r_gui_sheet4.jpg deleted file mode 100644 index fb8abcc6..00000000 Binary files a/docs/reference/figures/sen2r_gui_sheet4.jpg and /dev/null differ diff --git a/docs/reference/figures/sen2r_gui_sheet4.png b/docs/reference/figures/sen2r_gui_sheet4.png new file mode 100755 index 00000000..195413b4 Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet4.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet4_small.png b/docs/reference/figures/sen2r_gui_sheet4_small.png index c6a5fcdd..7355b3b6 100644 Binary files a/docs/reference/figures/sen2r_gui_sheet4_small.png and b/docs/reference/figures/sen2r_gui_sheet4_small.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet5.png b/docs/reference/figures/sen2r_gui_sheet5.png new file mode 100755 index 00000000..730958e6 Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet5.png differ diff --git a/docs/reference/figures/sen2r_gui_sheet5_small.png b/docs/reference/figures/sen2r_gui_sheet5_small.png new file mode 100644 index 00000000..45e34e3b Binary files /dev/null and b/docs/reference/figures/sen2r_gui_sheet5_small.png differ diff --git a/docs/reference/s2_dop.html b/docs/reference/s2_dop.html index 8de940cf..47032e0e 100644 --- a/docs/reference/s2_dop.html +++ b/docs/reference/s2_dop.html @@ -180,38 +180,38 @@

      Note

      Examples

      # All the passages in a cycle of 10 days over all the orbits
 s2_dop()
      #>            date mission orbit
-#>   1: 2019-01-30      2A   102
-#>   2: 2019-01-30      2A   103
-#>   3: 2019-01-30      2A   104
-#>   4: 2019-01-30      2A   105
-#>   5: 2019-01-30      2A   106
+#>   1: 2019-02-01      2A   001
+#>   2: 2019-02-01      2A   131
+#>   3: 2019-02-01      2A   132
+#>   4: 2019-02-01      2A   133
+#>   5: 2019-02-01      2A   134
 #>  ---                         
-#> 282: 2019-02-08      2B   025
-#> 283: 2019-02-08      2B   026
-#> 284: 2019-02-08      2B   027
-#> 285: 2019-02-08      2B   028
-#> 286: 2019-02-08      2B   029
      
+#> 282: 2019-02-10      2B   054
+#> 283: 2019-02-10      2B   055
+#> 284: 2019-02-10      2B   056
+#> 285: 2019-02-10      2B   057
+#> 286: 2019-02-10      2B   058
      
 # The passages in the current month over two orbits
 s2_dop(c("022", "065"), "this month")
      #>           date mission orbit
-#>  1: 2019-01-02      2B   065
-#>  2: 2019-01-04      2A   022
-#>  3: 2019-01-07      2A   065
-#>  4: 2019-01-09      2B   022
-#>  5: 2019-01-12      2B   065
-#>  6: 2019-01-14      2A   022
-#>  7: 2019-01-17      2A   065
-#>  8: 2019-01-19      2B   022
-#>  9: 2019-01-22      2B   065
-#> 10: 2019-01-24      2A   022
-#> 11: 2019-01-27      2A   065
-#> 12: 2019-01-29      2B   022
      
+#>  1: 2019-02-01      2B   065
+#>  2: 2019-02-03      2A   022
+#>  3: 2019-02-06      2A   065
+#>  4: 2019-02-08      2B   022
+#>  5: 2019-02-11      2B   065
+#>  6: 2019-02-13      2A   022
+#>  7: 2019-02-16      2A   065
+#>  8: 2019-02-18      2B   022
+#>  9: 2019-02-21      2B   065
+#> 10: 2019-02-23      2A   022
+#> 11: 2019-02-26      2A   065
+#> 12: 2019-02-28      2B   022
      
 # The dates in which Sentinel-2A will pass in next six weeks over one orbit 
 s2_dop("022", "6 weeks", mission = "2A")$date
      #> [1] "2019-02-03" "2019-02-13" "2019-02-23" "2019-03-05"
      
 # The date in which Sentinel-2A would be passed in the last 10 days over one orbit 
 s2_dop("022", "-10 days", mission = "2A")$date
      #> [1] "2019-01-24"
      
 # All the orbits covered today
-s2_dop(timewindow = Sys.Date(), mission = "2B")$orbit
      #>  [1] "030" "031" "032" "033" "034" "035" "036" "037" "038" "039" "040" "041"
-#> [13] "042" "043" "044"
      
+s2_dop(timewindow = Sys.Date(), mission = "2B")$orbit
      #>  [1] "059" "060" "061" "062" "063" "064" "065" "066" "067" "068" "069" "070"
+#> [13] "071" "072"
      
 # The passages in a fixed time window for one orbit
 s2_dop(65, as.Date(c("2018-08-01", "2018-08-31")))
      #>          date mission orbit
 #> 1: 2018-08-05      2B   065
diff --git a/index.Rmd b/index.Rmd
index ee848554..f838e861 100644
--- a/index.Rmd
+++ b/index.Rmd
@@ -25,7 +25,7 @@ knitr::opts_chunk$set(
 
 
 
-# An R toolbox to find, download and preprocess Sentinel-2 data
+# R toolbox to find, download and preprocess Sentinel-2 data
 
 sen2r 
 is an R library which helps to download and preprocess Sentinel-2 optical images.
@@ -104,18 +104,22 @@ this opens a GUI which allows to set the required processing parameters,
 and then launches the main function.
 
 
      
-  
+  
     
   
-  
+  
     
   
-  
+  
      
+        
     
   
-  
+  
     
   
+  
+    
+  
 
      
 
 Alternatively, 
@@ -160,9 +164,11 @@ The [
 
-An R toolbox to find, download and preprocess Sentinel-2 data
-=============================================================
+R toolbox to find, download and preprocess Sentinel-2 data
+==========================================================
 
 sen2r is an R library which helps to download and preprocess Sentinel-2 optical images. The purpose of the functions contained in the library is to provide the instruments required to easily perform (and eventually automate) all the steps necessary to build a complete Sentinel-2 processing chain, without the need of any manual intervention nor the needing to manually integrate any external tool.
 
@@ -67,7 +67,7 @@ sen2r()
 this opens a GUI which allows to set the required processing parameters, and then launches the main function.
 
 
      
-           
+      
               
 
      
 Alternatively, [`sen2r()`](reference/sen2r.md) can be launched with a list of parameters (created with [`s2_gui()`](reference/s2_gui.md)) or passing manually the parameters as arguments of the function (see [the documentation of the function](reference/sen2r.md) for further details).
 
@@ -90,9 +90,11 @@ Credits
 
 The [sen2r logo](https://raw.githubusercontent.com/ranghetti/sen2r/devel/man/figures/sen2r_logo_200px.png), partially derived from the [R logo](https://www.r-project.org/logo), is released under the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0) (CC-BY-SA 4.0).
 
+The functionalities to search and download SAFE tiles are based on the Python tool [Sentinel-download](https://github.com/olivierhagolle/Sentinel-download) by Olivier Hagolle, released under the [GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.html) (GPL‑2).
+
 To cite this library, please use the following entry:
 
-Ranghetti, L. and Busetto, L. (2018). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version 0.3.4. DOI: [10.5281/zenodo.1240384](https://ranghetti.github.io/sen2r).
+Ranghetti, L. and Busetto, L. (2018). *sen2r: an R toolbox to find, download and preprocess Sentinel-2 data*. R package version 0.3.4. DOI: [10.5281/zenodo.1240384](https://dx.doi.org/10.5281/zenodo.1240384). URL: .
 
 ``` bibtex
 @Manual{sen2r,
diff --git a/inst/CITATION b/inst/CITATION
new file mode 100644
index 00000000..746ce68f
--- /dev/null
+++ b/inst/CITATION
@@ -0,0 +1,21 @@
+citHeader(paste(
+  "sen2r is being developed by Luigi Ranghetti and Lorenzo Busetto (IREA-CNR),",
+  "and it is released under the GNU General Public License version 3 (GPL‑3).",
+  "To cite package 'sen2r' in publications use:"
+))
+
+citEntry(
+  entry        = "Manual",
+  author       = "Luigi Ranghetti and Lorenzo Busetto",
+  title        = "sen2r: an R toolbox to find, download and preprocess Sentinel-2 data",
+  year         = "2018",
+  note         = "R package version 0.3.4",
+  doi          = "10.5281/zenodo.1240384",
+  url          = "https://ranghetti.github.io/sen2r",
+  textVersion  = paste(
+    "L. Ranghetti, L. Busetto (2018).",
+    "sen2r: an R toolbox to find, download and preprocess Sentinel-2 data.",
+    "R package version 0.3.4. DOI: 10.5281/zenodo.1240384.",
+    "URL: https://ranghetti.github.io/sen2r/."
+  )
+)
diff --git a/man/figures/sen2r_gui_sheet1.jpg b/man/figures/sen2r_gui_sheet1.jpg
deleted file mode 100644
index 21398746..00000000
Binary files a/man/figures/sen2r_gui_sheet1.jpg and /dev/null differ
diff --git a/man/figures/sen2r_gui_sheet1.png b/man/figures/sen2r_gui_sheet1.png
new file mode 100755
index 00000000..9028d87a
Binary files /dev/null and b/man/figures/sen2r_gui_sheet1.png differ
diff --git a/man/figures/sen2r_gui_sheet1_small.png b/man/figures/sen2r_gui_sheet1_small.png
index 1a29f6e6..25839088 100644
Binary files a/man/figures/sen2r_gui_sheet1_small.png and b/man/figures/sen2r_gui_sheet1_small.png differ
diff --git a/man/figures/sen2r_gui_sheet2.jpg b/man/figures/sen2r_gui_sheet2.jpg
deleted file mode 100644
index d22be0af..00000000
Binary files a/man/figures/sen2r_gui_sheet2.jpg and /dev/null differ
diff --git a/man/figures/sen2r_gui_sheet2.png b/man/figures/sen2r_gui_sheet2.png
new file mode 100755
index 00000000..5fb970d6
Binary files /dev/null and b/man/figures/sen2r_gui_sheet2.png differ
diff --git a/man/figures/sen2r_gui_sheet2_small.png b/man/figures/sen2r_gui_sheet2_small.png
index d8e1f25a..60fff6da 100644
Binary files a/man/figures/sen2r_gui_sheet2_small.png and b/man/figures/sen2r_gui_sheet2_small.png differ
diff --git a/man/figures/sen2r_gui_sheet3.jpg b/man/figures/sen2r_gui_sheet3.jpg
deleted file mode 100644
index 3009d7c0..00000000
Binary files a/man/figures/sen2r_gui_sheet3.jpg and /dev/null differ
diff --git a/man/figures/sen2r_gui_sheet3.png b/man/figures/sen2r_gui_sheet3.png
new file mode 100755
index 00000000..81905d55
Binary files /dev/null and b/man/figures/sen2r_gui_sheet3.png differ
diff --git a/man/figures/sen2r_gui_sheet3_small.png b/man/figures/sen2r_gui_sheet3_small.png
index 34e42c95..79dad87d 100644
Binary files a/man/figures/sen2r_gui_sheet3_small.png and b/man/figures/sen2r_gui_sheet3_small.png differ
diff --git a/man/figures/sen2r_gui_sheet4.jpg b/man/figures/sen2r_gui_sheet4.jpg
deleted file mode 100644
index fb8abcc6..00000000
Binary files a/man/figures/sen2r_gui_sheet4.jpg and /dev/null differ
diff --git a/man/figures/sen2r_gui_sheet4.png b/man/figures/sen2r_gui_sheet4.png
new file mode 100755
index 00000000..195413b4
Binary files /dev/null and b/man/figures/sen2r_gui_sheet4.png differ
diff --git a/man/figures/sen2r_gui_sheet4_small.png b/man/figures/sen2r_gui_sheet4_small.png
index c6a5fcdd..7355b3b6 100644
Binary files a/man/figures/sen2r_gui_sheet4_small.png and b/man/figures/sen2r_gui_sheet4_small.png differ
diff --git a/man/figures/sen2r_gui_sheet5.png b/man/figures/sen2r_gui_sheet5.png
new file mode 100755
index 00000000..730958e6
Binary files /dev/null and b/man/figures/sen2r_gui_sheet5.png differ
diff --git a/man/figures/sen2r_gui_sheet5_small.png b/man/figures/sen2r_gui_sheet5_small.png
new file mode 100644
index 00000000..45e34e3b
Binary files /dev/null and b/man/figures/sen2r_gui_sheet5_small.png differ
diff --git a/vignettes/sen2r_gui.Rmd b/vignettes/sen2r_gui.Rmd
index 7a446b77..36201681 100644
--- a/vignettes/sen2r_gui.Rmd
+++ b/vignettes/sen2r_gui.Rmd
@@ -37,18 +37,22 @@ This page describes how to use the GUI in order to set your own processing chain
 The GUI is composed of four main sheets:
 
 
      
-  
+  
     
   
-  
+  
     
   
-  
+  
      
+        
     
   
-  
+  
     
   
+  
+    
+  
 
      
 
 1. [  Product selection ](#product-selection)