Merge pull request #6 from Open-EO/master

updates
pramitghosh · Apr 5, 2019 · 679be02 · 679be02
2 parents 0676aca + 0077270
commit 679be02
Show file tree

Hide file tree

Showing 38 changed files with 51 additions and 42 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: openEO.R.UDF
 Type: Package
 Title: User-defined functions (UDF) in R on Earth observation data in cloud back-ends
-Version: 0.0.4
-Date: 2019-01-07
+Version: 0.1
+Date: 2019-04-05
 Authors@R: c(person(given = "Pramit", family = "Ghosh", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-1852-5951")),
               person(given = "Florian", family = "Lahn", email = "[email protected]", role = c("aut", "ctb")))
 Maintainer: Pramit Ghosh <[email protected]>
@@ -27,6 +27,7 @@ Imports:
 Suggests:
   RStoolbox,
   Rcpp,
-  rmarkdown
+  rmarkdown,
+  knitr
 RoxygenNote: 6.1.1
 VignetteBuilder: knitr
diff --git a/README.md b/README.md
@@ -98,11 +98,12 @@ Here are some test results for operations on a timeseries (3 timesteps with a te
 
 Aggregation over bands (using `max()`) and time (using `mean()`) using Strategy 1 and 2A
 ![Aggregation operations using Strategy 1 and 2A](https://github.com/Open-EO/openeo-r-udf/blob/master/data/s1v2a.png)
-Reprojection (using `stars::st_warp()`) and Unsupervised Classification (using `RStoolbox::unsuperClass()`) using Strategy 2B and 3
-![Reprojection and Unsupervised Classification using Strategy 2B and 3](https://github.com/Open-EO/openeo-r-udf/blob/master/data/s2bv3.png)
-![Legend](https://github.com/Open-EO/openeo-r-udf/blob/master/data/s_legend.jpeg)
+Calculation of NDVI, CRS transformation (using `stars::st_warp()`) and Unsupervised Classification (using `RStoolbox::unsuperClass()`) using Strategy 2B
+![Calculation of NDVI, Reprojection and Unsupervised Classification using Strategy 2B](https://github.com/Open-EO/openeo-r-udf/blob/master/data/s2b.png)
+Calculation of NDVI, CRS transformation (using `stars::st_warp()`) and Unsupervised Classification (using `RStoolbox::unsuperClass()`) using Strategy 3
+![Calculation of NDVI, Reprojection and Unsupervised Classification using Strategy 3](https://github.com/Open-EO/openeo-r-udf/blob/master/data/s3.png)
 
-Further details regarding these strategies and their implementations may be found on these [slides](https://pramitghosh.github.io/slides/defense_25-1.html) and in [Ghosh et al., 2018](https://www.researchgate.net/publication/330533820_Running_user-defined_functions_in_R_on_Earth_observation_data_in_cloud_back-ends).
+Further details regarding these strategies and their implementations may be found on these [slides](https://pramitghosh.github.io/slides/defense_25-1.html) and in [Ghosh et al. (2018)](https://www.researchgate.net/publication/330533820_Running_user-defined_functions_in_R_on_Earth_observation_data_in_cloud_back-ends).
 
 ### Testing
 Examples of HTTP POST bodies (as JSONs) for strategies 2A, 2B and 3 can be found in [pramitghosh/openeo-r-udf-examples](https://github.com/pramitghosh/openeo-r-udf-examples). Manuals on how to do that is available on the Wiki.
diff --git a/data/s1v2a.png b/data/s1v2a.png
diff --git a/data/s2b.png b/data/s2b.png
diff --git a/data/s3.png b/data/s3.png
diff --git a/docker/install_package_with_dependencies.R b/docker/install_package_with_dependencies.R
@@ -4,7 +4,7 @@ install.packages("devtools",dependencies=TRUE)
 library(devtools)
 
 install.packages("plumber",dependencies=TRUE)
-install.packages("stars", dependencies = TRUE)
+install_version("stars", version = "0.2-0")
 install.packages("base64enc", dependencies = TRUE)
 install.packages("zip", dependencies = TRUE)
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/file-based.html b/docs/articles/file-based.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/openEO.R.UDF.html b/docs/articles/openEO.R.UDF.html
diff --git a/docs/articles/web-based_JSON.html b/docs/articles/web-based_JSON.html
diff --git a/docs/articles/web-based_base64.html b/docs/articles/web-based_base64.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/man/figures/strategy_1.png b/docs/man/figures/strategy_1.png
diff --git a/docs/man/figures/strategy_2.png b/docs/man/figures/strategy_2.png
diff --git a/docs/man/figures/strategy_3.png b/docs/man/figures/strategy_3.png
diff --git a/docs/reference/binary2stars.html b/docs/reference/binary2stars.html
diff --git a/docs/reference/figures/s1v2a.png b/docs/reference/figures/s1v2a.png
diff --git a/docs/reference/figures/s2b.png b/docs/reference/figures/s2b.png
diff --git a/docs/reference/figures/s3.png b/docs/reference/figures/s3.png
diff --git a/docs/reference/figures/strategy_1.png b/docs/reference/figures/strategy_1.png
diff --git a/docs/reference/figures/strategy_2.png b/docs/reference/figures/strategy_2.png
diff --git a/docs/reference/figures/strategy_3.png b/docs/reference/figures/strategy_3.png
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/plot_response.html b/docs/reference/plot_response.html
diff --git a/docs/reference/raw2stars.html b/docs/reference/raw2stars.html
diff --git a/docs/reference/read_generics.html b/docs/reference/read_generics.html
diff --git a/docs/reference/run_UDF.binary.html b/docs/reference/run_UDF.binary.html
diff --git a/docs/reference/run_UDF.html b/docs/reference/run_UDF.html
diff --git a/docs/reference/run_UDF.json.html b/docs/reference/run_UDF.json.html
diff --git a/docs/reference/run_UDF.json.raw.html b/docs/reference/run_UDF.json.raw.html