Fixed name space calls to pass cran check.

ropensci-archive · Apr 10, 2014 · 5d0b367 · 5d0b367
1 parent 34cee82
commit 5d0b367
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 22 deletions.
diff --git a/R/create_map_df.R b/R/create_map_df.R
@@ -17,7 +17,7 @@ create_map_df <- function(locator) {
   ### All error handling is done in the download_kml()
   locator <- as.character(locator)
   locator <- toupper(locator)
-  rWBclimate:::download_kml(locator)
+  download_kml(locator)
 
 
   my_path <- path.expand(getOption("kmlpath"))

diff --git a/R/date_correct.R b/R/date_correct.R
@@ -8,7 +8,7 @@
 #'@examples \dontrun{
 #'date_correct(1921,1957)
 #'}
-#'@export
+
 
 date_correct <- function(start, end){
   #basic error handling of user input

diff --git a/R/get_climate_data.R b/R/get_climate_data.R
@@ -17,7 +17,7 @@ get_climate_data <- function(locator,geo_type,type, cvar, start, end){
 
   ### Error handling
   if(geo_type == "country"){
-    rWBclimate:::check_ISO_code(locator)
+    check_ISO_code(locator)
   }
 
   if(geo_type == "basin"){

diff --git a/R/get_data_recursive.R b/R/get_data_recursive.R
@@ -18,7 +18,7 @@
 
 
 get_data_recursive <- function(locator,geo_type,type, cvar, start, end){
-  dates <- rWBclimate:::date_correct(start,end)
+  dates <- date_correct(start,end)
   data_out <- list()
   counter <- 1
   for(i in 1:length(locator)){

diff --git a/R/get_ensemble_climate_data.R b/R/get_ensemble_climate_data.R
@@ -18,7 +18,7 @@ get_ensemble_climate_data <- function(locator,geo_type,type, cvar, start, end){
 
   ### Error handling
   if(geo_type == "country"){
-    rWBclimate:::check_ISO_code(locator)
+    check_ISO_code(locator)
   }
 
   if(geo_type == "basin"){

diff --git a/R/get_ensemble_data_recursive.R b/R/get_ensemble_data_recursive.R
@@ -17,12 +17,12 @@
 
 
 get_ensemble_data_recursive <- function(locator,geo_type,type, cvar, start, end){
-  dates <- rWBclimate:::date_correct(start,end)
+  dates <- date_correct(start,end)
   data_out <- list()
   counter <- 1
   for(i in 1:length(locator)){
     for(j in 1:length(dates[,1])){
-      data_out[[counter]] <- rWBclimate:::get_ensemble_climate_data(locator[i],geo_type,type,cvar,dates[j,1],dates[j,2])
+      data_out[[counter]] <- get_ensemble_climate_data(locator[i],geo_type,type,cvar,dates[j,1],dates[j,2])
       counter <- counter + 1
     }
   }

diff --git a/R/get_ensemble_precip.R b/R/get_ensemble_precip.R
@@ -44,9 +44,9 @@ get_ensemble_precip <- function(locator,type, start, end){
 
   #Convert numeric basin numbers to strings if they were entered incorrectly
   locator <- as.character(locator)
-  geo_ref <- rWBclimate:::check_locator(locator)
+  geo_ref <- check_locator(locator)
 
 
-  output <- rWBclimate:::get_ensemble_data_recursive(locator,geo_ref,type, "pr", start, end)
+  output <- get_ensemble_data_recursive(locator,geo_ref,type, "pr", start, end)
   return(output)
 }
diff --git a/R/get_ensemble_stats.R b/R/get_ensemble_stats.R
@@ -51,7 +51,7 @@ get_ensemble_stats <- function(locator, type, stat){
   locator <- as.character(locator)
 
   ## Error handling for location input
-  geo_ref <- rWBclimate:::check_locator(locator)
+  geo_ref <- check_locator(locator)
 
 
   ### Set dates to retrieve both future scenarios.
@@ -61,7 +61,7 @@ get_ensemble_stats <- function(locator, type, stat){
   counter <- 1
   for(i in 1:length(locator)){
     for(j in 1:length(dates[,1])){
-      data_out[[counter]] <- rWBclimate:::get_ensemble_climate_data(locator[i],geo_ref,type,stat,dates[j,1],dates[j,2])
+      data_out[[counter]] <- get_ensemble_climate_data(locator[i],geo_ref,type,stat,dates[j,1],dates[j,2])
       counter <- counter + 1
     }
   }

diff --git a/R/get_ensemble_temp.R b/R/get_ensemble_temp.R
@@ -45,9 +45,9 @@ get_ensemble_temp <- function(locator,type, start, end){
   }
   #Convert numeric basin numbers to strings if they were entered incorrectly
   locator <- as.character(locator)
-  geo_ref <- rWBclimate:::check_locator(locator)
+  geo_ref <- check_locator(locator)
 
-  output <- rWBclimate:::get_ensemble_data_recursive(locator,geo_ref,type, "tas", start, end)
+  output <- get_ensemble_data_recursive(locator,geo_ref,type, "tas", start, end)
   return(output)
 }
 
diff --git a/R/get_historical_data.R b/R/get_historical_data.R
@@ -27,11 +27,11 @@ if(!time_scale%in%time_vec){
 }
 #Convert numeric basin numbers to strings if they were entered incorrectly
 locator <- as.character(locator)
-geo_type <- rWBclimate:::check_locator(locator)
+geo_type <- check_locator(locator)
 
 ### Error handling
 if(geo_type == "country"){
-  rWBclimate:::check_ISO_code(locator)
+  check_ISO_code(locator)
 }
 
 if(geo_type == "basin"){

diff --git a/R/get_historical_data_recursive.R b/R/get_historical_data_recursive.R
@@ -12,7 +12,7 @@ get_historical_data_recursive <- function(locator,cvar,time_scale){
 data_out <- list()
 counter <- 1
 for(i in 1:length(locator)){
-    data_out[[i]] <- rWBclimate:::get_historical_data(locator[i],cvar,time_scale)
+    data_out[[i]] <- get_historical_data(locator[i],cvar,time_scale)
 }
 
 dat_out <- ldply(data_out,data.frame)

diff --git a/R/get_historical_precip.R b/R/get_historical_precip.R
@@ -23,5 +23,5 @@
 
 get_historical_precip <- function(locator,time_scale){
   cvar <- "pr"
-  return(rWBclimate:::get_historical_data_recursive(locator,cvar,time_scale))
+  return(get_historical_data_recursive(locator,cvar,time_scale))
 }
diff --git a/R/get_historical_temp.R b/R/get_historical_temp.R
@@ -23,5 +23,5 @@
 
 get_historical_temp <- function(locator,time_scale){
   cvar <- "tas"
-  return(rWBclimate:::get_historical_data_recursive(locator,cvar,time_scale))
+  return(get_historical_data_recursive(locator,cvar,time_scale))
 }
diff --git a/R/get_model_precip.R b/R/get_model_precip.R
@@ -42,9 +42,9 @@ get_model_precip <- function(locator,type, start, end){
   }
   #Convert numeric basin numbers to strings if they were entered incorrectly
   locator <- as.character(locator)
-  geo_ref <- rWBclimate:::check_locator(locator)
+  geo_ref <- check_locator(locator)
 
-  output <- rWBclimate:::get_data_recursive(locator,geo_ref,type, "pr", start, end)
+  output <- get_data_recursive(locator,geo_ref,type, "pr", start, end)
   return(output)
 }
 
diff --git a/R/get_model_temp.R b/R/get_model_temp.R
@@ -42,8 +42,8 @@ get_model_temp <- function(locator,type, start, end){
   }
   #Convert numeric basin numbers to strings if they were entered incorrectly
   locator <- as.character(locator)
-  geo_ref <- rWBclimate:::check_locator(locator)
+  geo_ref <- check_locator(locator)
 
-  output <- rWBclimate:::get_data_recursive(locator,geo_ref,type, "tas", start, end)
+  output <- get_data_recursive(locator,geo_ref,type, "tas", start, end)
   return(output)
 }
diff --git a/R/rWBclimate-package.r b/R/rWBclimate-package.r
@@ -10,3 +10,8 @@ NULL
 #' @keywords datasets
 NULL
 
+#' Basin codes for Africa, used in downloading maps
+#' @name Africa_basin
+#' @docType data
+#' @keywords datasets
+NULL