rgee 1.1.2

Author: csaybar

.Rbuildignore

@@ -21,4 +21,5 @@
 ^test\credentials
 ^doc$
 ^Meta$
-^tester\.R$
+^tester\.R$
+^CITATION\.cff$

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rgee
 Title: R Bindings for Calling the 'Earth Engine' API
-Version: 1.1.1
+Version: 1.1.2
 Authors@R: 
     c(person(given = "Cesar",
              family = "Aybar",

NAMESPACE

@@ -9,8 +9,6 @@ S3method(ee_print,ee.image.Image)
 S3method(ee_print,ee.imagecollection.ImageCollection)
 S3method(print,ee.computedobject.ComputedObject)
 export("%>%")
-export(.__Extra__)
-export(.__Extra_module__)
 export(Map)
 export(R6Map)
 export(ee)

NEWS.md

@@ -11,6 +11,12 @@ vignette: >
   %\VignetteIndexEntry{NEWS}
   %\VignetteEncoding{UTF-8}
 ---
+# rgee 1.1.2
+
+- Fix an error in 'ee_check' warning message.
+- 'ee_extra' Python package is now a submodule of rgeeExtra.
+- 'ee_install' typo fixed.
+
 # rgee 1.1.1
 
 - Deprecated.R file deleted.

R/ee_Initialize.R

@@ -259,18 +259,6 @@ ee_Initialize <- function(user = NULL,
   ee$ImageCollection$Dataset <- eeDataset_b$ic
   ee$Image$Dataset <- eeDataset_b$image
 
-
-  # If Extra module exist add to ee!
-  tryCatch(
-    expr = {
-      ee$Extra <- .__Extra__
-      ee$`__Extra__` <- .__Extra_module__
-    },
-    error = function(e) {
-      {ee$Extra <- NULL}
-    }
-  )
-
   invisible(TRUE)
 }
 
@@ -834,27 +822,6 @@ ee_Dataset_creator <- function(eeDataset) {
   list(image = eedataset_img, ic = eedataset_ic, fc = eedataset_fc)
 }
 
-
-#' Exist ee_extra
-#' @noRd
-eeExtra_exist <- function() {
-  condition <- reticulate::py_module_available("ee_extra")
-  if (!condition) {
-    "Consider installing ee_extra Python package. ee_extra enables"
-    "the integration between Javascript and rgee. The following functions"
-    "will not work until you install ee_extra:"
-    "- rgeeExtra::module()"
-    "- ee$Extra$*"
-    "To  install ee_extra please try as follow:"
-    "> ee_install(): To create and set a Python environment with all rgee dependencies."
-    "> ee_install_upgrade(): Run previously ee_Initialize to set a Python Env."
-    "> pip3 install ee_extra"
-    "> conda install ee_xtra"
-  }
-  return(condition)
-}
-
-
 #' Testing 403 error in GD
 #' @noRd
 test_drive_privileges <-function(user) {

R/ee_check.R

@@ -109,7 +109,7 @@ ee_check_python_packages <- function(quiet = FALSE) {
       sprintf("version used by rgee (%s). You might use:", ee_version()),
       "* rgee::ee_install_upgrade()",
       sprintf(
-        "* reticulate::py_install('earthengine-api==%s')",
+        "* reticulate::py_install('earthengine-api==%s', envname='PUT_HERE_YOUR_PYENV')",
         ee_version()
       ),
       sprintf(

R/ee_clean.R

@@ -15,13 +15,13 @@ ee_clean_credentials <- function(user='not_defined', quiet = FALSE) {
   oauth_func_path <- system.file("python/ee_utils.py", package = "rgee")
   utils_py <- ee_source_python(oauth_func_path)
   ee_path <- ee_utils_py_to_r(utils_py$ee_path())
-  email_clean <- gsub("@gmail.com", "", user)
+  user_clean <- gsub("@gmail.com", "", user)
 
-  if (email == 'not_defined') {
-    email_clean <- 'ndef'
+  if (user == 'not_defined') {
+    user_clean <- 'ndef'
   }
 
-  path_to_delete <- sprintf("%s/%s", ee_path, email_clean)
+  path_to_delete <- sprintf("%s/%s", ee_path, user_clean)
 
   if (!dir.exists(path_to_delete)) {
     if (!quiet) {
@@ -32,7 +32,7 @@ ee_clean_credentials <- function(user='not_defined', quiet = FALSE) {
   if (!quiet && dir.exists(path_to_delete)) {
     cat(
       sprintf("Credentials in %s has been deleted.\n",
-              sprintf("%s/%s", ee_path, email_clean)))
+              sprintf("%s/%s", ee_path, user_clean)))
   }
 
   unlink(x = path_to_delete, recursive = TRUE, force = TRUE)

R/ee_install.R

@@ -224,7 +224,7 @@ ee_install <- function(py_env = "rgee",
   )
 
   reticulate::py_install(
-    packages = c("earthengine-api", "numpy", "ee_extra"),
+    packages = c("earthengine-api", "numpy"),
     envname = rgee_path
   )
 
@@ -455,8 +455,8 @@ ee_install_upgrade <- function(version = NULL,
                                earthengine_env = Sys.getenv("EARTHENGINE_ENV")) {
   if (earthengine_env == "") {
     stop(
-      "ee_install_upgrade needs that global env EARTHENGINE_ENV",
-      " is defined to work. Run ee_install_set_pyenv(py_env = \"YOUR_ENV\")",
+      "ee_install_upgrade needs to define EARTHENGINE_ENV.\n",
+      "Run ee_install_set_pyenv(py_env = \"YOUR_ENV\")",
       " to set a Python environment."
       )
   }
@@ -465,7 +465,7 @@ ee_install_upgrade <- function(version = NULL,
   }
   reticulate::py_install(
     packages = c(sprintf("earthengine-api==%s", version)),
-    envname = Sys.getenv("EARTHENGINE_ENV")
+    envname = earthengine_env
   )
   title <- paste(
     "",

R/ee_module.R

@@ -20,55 +20,3 @@
 #' }
 #' @export
 ee <- NULL
-
-
-#' Extra Earth Engine dictionary
-#'
-#' Interface to Extra Earth Engine module. Provides access to the top level
-#' classes and functions as well as sub-modules (e.g. \code{ee$Image},
-#' \code{ee$FeatureCollection$first}, etc.).
-#'
-#' @format Earth Engine module
-#'
-#' @examples
-#' \dontrun{
-#' library(rgee)
-#' library(rgeeExtra)
-#'
-#' # ee_install_extra()
-#' ee_Initialize()
-#'
-#' ee_img1 <- ee$Image(0)
-#' ee_img2 <- ee$Image(0)
-#'
-#' ee_img3 <- ee_img1 * ee_img2 +  ee_img2
-#' print(ee_img3)
-#' }
-#' @export
-.__Extra__ <- NULL
-
-
-#' Extra Earth Engine module
-#'
-#' Interface to Extra Earth Engine module. Provides access to the top level
-#' classes and functions as well as sub-modules (e.g. \code{ee$Image},
-#' \code{ee$FeatureCollection$first}, etc.).
-#'
-#' @format Earth Engine module
-#'
-#' @examples
-#' \dontrun{
-#' library(rgee)
-#' library(rgeeExtra)
-#'
-#' # ee_install_extra()
-#' ee_Initialize()
-#'
-#' ee_img1 <- ee$Image(0)
-#' ee_img2 <- ee$Image(0)
-#'
-#' ee_img3 <- ee_img1 * ee_img2 +  ee_img2
-#' print(ee_img3)
-#' }
-#' @export
-.__Extra_module__ <- NULL

R/zzz.R

@@ -9,10 +9,7 @@
   #   Sys.setenv(RETICULATE_PYTHON = earthengine_python)
 
   # delay load earthengine-api
-  #ee <<- reticulate::import("ee", delay_load = TRUE)
-  ee <<- reticulate::import("ee", delay_load = list(priority = 30))
+  ee <<- reticulate::import("ee", delay_load = TRUE)
+  #ee <<- reticulate::import("ee", delay_load = list(priority = 30))
 
-  # delay load eeExtra
-  .__Extra_module__ <<- reticulate::import("ee_extra", delay_load = list(priority = 40))
-  .__Extra__ <<- .__Extra_module__$Extra
 }