credentials storing fixed and documentation update

NAMESPACE

@@ -15,4 +15,4 @@ export(S2_query_product)
 export(S2_query_qiData)
 export(S2_query_roi)
 export(S2_user_info)
-export(roi_to_jgeom)
+export(roi2jgeom)

R/S2_initialize_user.R

@@ -1,6 +1,3 @@
-cfgUser = '[email protected]'
-cfgPswd = 'test'
-
 #' Set login credentials for 's2.boku.eodc.eu'
 #'
 #' Set 'user' and 'password' login credentials for the current
@@ -15,13 +12,22 @@ cfgPswd = 'test'
 #'   'https://s2.boku.eodc.eu'
 #' @param password character password for 'https://s2.boku.eodc.eu'
 #' @export
-S2_initialize_user = function(user, password, permanent = TRUE) {
-  cfgUser <<- user
-  cfgPswd <<- password
+S2_initialize_user = function(user, password) {
+  assign('cfgUser', user, parent.env(environment()))
+  assign('cfgPswd', password, parent.env(environment()))
 }
 
 #' Internal function getting user credentials
 #'
 get_credentials = function() {
-  return(c(user = cfgUser, password = cfgPswd))
+  try(
+    {
+      return(c(
+        user = get('cfgUser', parent.env(environment())),
+        password = get('cfgPswd', parent.env(environment()))
+      ))
+    },
+    silent = TRUE
+  )
+  return(c(user = '[email protected]', password = 'test'))
 }

R/roi2jgeom.R

@@ -11,7 +11,7 @@
 #'   will be reprojected as necessary
 #' @return character, a json geometry string
 #' @export
-roi_to_jgeom = function(roi, projection = sp::CRS('+init=epsg:4326')){
+roi2jgeom = function(roi, projection = sp::CRS('+init=epsg:4326')){
   if (is.character(roi) && file.exists(roi)) {
     roi = gsub(pattern = '[\\]', replacement = '/', roi)
 
@@ -24,12 +24,12 @@ roi_to_jgeom = function(roi, projection = sp::CRS('+init=epsg:4326')){
     }
   } else if (is.character(roi)) {
     roi = rgdal::readOGR(roi, 'OGRGeoJSON', verbose = FALSE)
-  } else if (all(c("x", "y") %in% colnames(rbind(roi)))){
-    roi_geom = sp::SpatialPoints(xy, projection)
+  } else if (all(c("x", "y") %in% colnames(rbind(roi)))) {
+    roi_geom = sp::SpatialPoints(roi, projection)
   }
 
   roi = sp::spTransform(roi, CRSobj = sp::CRS('+init=epsg:4326'))
-  roi_geom = spat2jgeom(spat = roi, round = round)
+  roi_geom = spat2jgeom(spat = roi)
 
   return(roi_geom)
 }