all test passed

Author: csaybar

Diff for: R/ee_Initialize.R

@@ -68,10 +68,9 @@ ee_Initialize <- function(user = NULL,
                           ...
 ) {
   # Set google-cloud-sdk in your PATH systen
-  sdkpath <- sprintf("%s/google-cloud-sdk/bin/", Sys.getenv("HOME"))
-  if (!grepl(sdkpath, Sys.getenv("PATH"))) {
-    Sys.setenv(PATH = sprintf("%s:%s", Sys.getenv("PATH"), sdkpath))
-  }
+  gcloud_path <- Sys.getenv("EARTHENGINE_GCLOUD", unset = NA)
+  if (!is.na(gcloud_path))
+    Sys.setenv(PATH = sprintf("%s:%s", Sys.getenv("PATH"), gcloud_path))
 
   # Check sanity of earth-engine and return ee_utils.py module
   init <- ee_check_init()

Diff for: R/ee_as_sf.R

@@ -138,7 +138,7 @@ ee_as_sf <- function(x,
                      maxFeatures = 5000,
                      selectors = NULL,
                      lazy = FALSE,
-                     public = TRUE,
+                     public = FALSE,
                      add_metadata = TRUE,
                      timePrefix = TRUE,
                      quiet = FALSE) {

Diff for: R/ee_download.R

@@ -701,7 +701,7 @@ ee_table_to_asset <- function(collection,
 #' @param dsn Character. Output filename. If missing, a temporary
 #' file will be assigned.
 #' @param overwrite A boolean argument that indicates
-#' whether "filename" should be overwritten. By default TRUE.
+#' whether filename should be overwritten. By default TRUE.
 #' @param consider Interactive. See details.
 #' @param public Logical. If TRUE, a public link to the Google Drive resource is
 #' created.
@@ -711,19 +711,19 @@ ee_table_to_asset <- function(collection,
 #'
 #' @details
 #'
-#' The task argument needs a status as task "COMPLETED" to work, due that the
-#' parameters necessary to identify EE objects into Google Drive are obtained
-#' from \cr \code{ee$batch$Export$*$toDrive(...)$start()$status()}.
+#'The task argument requires a status of "COMPLETED" because
+#'the parameters required to identify EE items in Google Drive
+#'are retrieved from  \cr \code{ee$batch$Export$*$toDrive(...)$start()$status()}.
 #'
-#' \code{consider} argument is necessary due that Google Drive permits users to
-#' create files with the same name. \code{consider} uses an interactive R
-#' session by default to help users identify just the files that they want to
-#' download. Additionally, the options "last" and "all" are implemented. "last"
-#' will download just the last file saved in Google Drive while with "all" all
-#' files will be downloaded.
+#'Due to the fact that Google Drive allows users to create files with the
+#'same name, the \code{consider} argument is required. It use an interactive
+#'R session by default to assist users in identifying the specific files
+#'they wish to download. Additionally, "last" and "all" settings are
+#'provided. "last" will only download the most recently saved file in
+#'Google Drive, whereas "all" will download all files with the same name.
 #'
-#' Finally, if the argument \code{metadata} is TRUE, a list with the
-#' following elements are exported join with the output filename (dsn):
+#' Finally, if the argument \code{metadata} is TRUE, a list containing the
+#' following elements is exported and appended to the output filename (dsn):
 #'
 #' \itemize{
 #'  \item{\bold{ee_id: }}{Name of the Earth Engine task.}
@@ -973,18 +973,20 @@ ee_drive_to_local <- function(task,
 #' @param overwrite A boolean argument that indicates indicating
 #' whether "filename" should be overwritten. By default TRUE.
 #' @param public Logical. If TRUE, a public link to Google Cloud Storage
-#' resource is created.
+#' resource is created. "Public Access Prevention" may need to be removed.
+#' In addition, the bucket access control configuration must be "fine-grained".
+#' See GCS public files documentation for more details.
 #' @param metadata Logical. If TRUE, export the metadata related to the Google
 #' Cloud Storage resource. See details.
 #' @param quiet Logical. Suppress info message
 #' @details
 #'
-#' The task argument needs "COMPLETED" task state to work due to that the parameters
-#' necessaries to locate the file into Google Cloud Storage are obtained from \cr
-#' \code{ee$batch$Export$*$toCloudStorage(...)$start()$status()}.
+#'The task argument requires a status of "COMPLETED" because
+#'the parameters required to identify EE items in Google Drive
+#'are retrieved from \code{ee$batch$Export$*$toCloudStorage(...)$start()$status()}.
 #'
-#' If the argument \code{metadata} is TRUE, a list with the
-#' following elements is exported join with the output filename (dsn):
+#' If the argument \code{metadata} is TRUE, a list containing the following
+#' elements is exported and appended to the output filename (dsn):
 #'
 #' \itemize{
 #'   \item{\bold{ee_id: }}{Name of the Earth Engine task.}

Diff for: R/ee_get.R

@@ -128,7 +128,7 @@ ee_get_date_ic <- function(x, time_end = FALSE) {
 
 
   if (is.null(time_start)) {
-    time_start <- NA
+    time_start <- rep(NA, length(image_id))
   } else {
     time_start <- as.POSIXct(
       x = time_start / 1000,

Diff for: man/ee_as_sf.Rd

@@ -58,7 +58,6 @@ gcs_bucket_uniform_f <- function(){
 have_ee <- reticulate::py_module_available("ee")
 have_numpy <- reticulate::py_module_available("numpy")
 if (have_ee & have_numpy) {
-ee_Initialize(drive = TRUE, gcs = TRUE)
+  ee_Initialize(drive = TRUE, gcs = TRUE)
 }
 
-test_check("rgee")

Diff for: man/ee_drive_to_local.Rd

@@ -1,15 +1,6 @@
 context("rgee: ee_Initialize() test")
-skip_if_no_pypkg()
-# -------------------------------------------------------------------------
-
-test_that("get_authorization_url is working well?",{
-  oauth_func_path <- system.file("python/ee_utils.py", package = "rgee")
-  utils_py <- rgee:::ee_source_python(oauth_func_path)
-  code_challenge <- ee_utils_py_to_r(utils_py$create_codes())
-  ee_url <- ee$oauth$get_authorization_url(code_challenge[[2]])
-  expect_type(ee_url,'character')
-})
 
+# -------------------------------------------------------------------------
 test_that("complex init",{
   out <- tryCatch(
     expr = ee_Initialize(drive = TRUE,
@@ -50,10 +41,6 @@ test_that("ee_connect_to_py",{
   expect_error(rgee:::ee_connect_to_py("demo.py"))
 })
 
-test_that("ee_install_set_init_message", {
-  response <- rgee:::ee_init_message(debug = TRUE)
-  testthat::expect_true(response)
-})
 
 test_that("ee_install_set_init_message", {
   ee_Initialize(drive = TRUE)

Diff for: man/ee_gcs_to_local.Rd

@@ -1,5 +1,4 @@
 context("rgee: sf_as_ee test")
-skip_if_no_pypkg()
 # -------------------------------------------------------------------------
 
 
@@ -203,7 +202,7 @@ test_that("Map$addLayer r6map", {
 
 test_that("Map$centerObject_COG r6map", {
   # amazon
-  resource <- "https://s3-us-west-2.amazonaws.com/planet-disaster-data/hurricane-harvey/SkySat_Freeport_s03_20170831T162740Z3.tif"
+  resource <- "https://oin-hotosm.s3.amazonaws.com/56f9b5a963ebf4bc00074e70/0/56f9c2d42b67227a79b4faec.tif"
   visParams <- list(nodata = 0, expression = "B1*1+B2*4+B3*2", rescale = "0, 2000", colormap_name = "viridis")
   Map$centerObject(resource)
   Map$addLayer(resource, visParams = visParams, shown = TRUE)

Diff for: tests/testthat.R

@@ -1,7 +1,6 @@
 context("rgee: sf_as_ee test")
-skip_if_no_pypkg()
-# -------------------------------------------------------------------------
 
+# -------------------------------------------------------------------------
 # test_that("ee_help_addins 1", {
 #   img <- ee$Image(0)
 #   test01 <- expect_warning(ee_help_addins(debug = FALSE, content = "ee$Image$clip"))

Diff for: tests/testthat/test-Initialize.R

@@ -1,5 +1,10 @@
 context("rgee: ee_check test")
-skip_if_no_pypkg()
+
+library(sf)
+library(rgee)
+
+ee_Initialize(drive = TRUE, gcs = TRUE)
+
 # -------------------------------------------------------------------------
 
 test_that("simple ee_check ",{
@@ -25,10 +30,8 @@ test_that("ee_wrong_message",{
 # })
 
 
-test_that("ee_install check", {
-  message = ee_install(confirm = FALSE)
-  ee_clean_pyenv()
-  expect_true(message)
-})
-
-
+#test_that("ee_install check", {
+  #message = ee_install(confirm = FALSE)
+  #ee_clean_pyenv()
+  #expect_true(message)
+#})

Diff for: tests/testthat/test-R6.R

@@ -1,5 +1,5 @@
 context("rgee: ee_clean_credentials test")
-skip_if_no_pypkg()
+
 # -------------------------------------------------------------------------
 #test_that("ee_clean_credentials", {
   #result_True <- ee_clean_credentials('test')

Diff for: tests/testthat/test-addins.R

@@ -1,5 +1,8 @@
 context("rgee: ee_date test")
-skip_if_no_pypkg()
+
+library(rgee)
+ee_Initialize()
+
 # -------------------------------------------------------------------------
 test_that("rdate_to_eedate I", {
   eedate <- rdate_to_eedate('2000-01-01')