fixed namespace calls.

ropensci-archive · Apr 2, 2014 · 01070f8 · 01070f8
1 parent 04a35c0
commit 01070f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/R/get_climate_data.R b/R/get_climate_data.R
@@ -39,7 +39,7 @@ get_climate_data <- function(locator,geo_type,type, cvar, start, end){
     stop(paste("You entered a country for which there is no data. ",locator," is not a country with any data"))
   }
 
-  data_out <- jsonlite:::fromJSON(raw_data)
+  data_out <- jsonlite::fromJSON(raw_data)
   if( type == "mavg" && start < 2010){
     ### Unpack the lists
     tmp <- data.frame(sapply(data_out$monthV,unlist))

diff --git a/R/get_ensemble_climate_data.R b/R/get_ensemble_climate_data.R
@@ -37,7 +37,7 @@ get_ensemble_climate_data <- function(locator,geo_type,type, cvar, start, end){
   extension <- ".json"
   full_url <- paste(base_url,data_url,extension,sep="")
   raw_data <- try(content(GET(full_url),as="text"),silent=T)
-  data_out <- jsonlite:::fromJSON(raw_data)
+  data_out <- jsonlite::fromJSON(raw_data)
 
 
   if(sum(grep("unexpected",data_out)) > 0){

diff --git a/R/get_historical_data.R b/R/get_historical_data.R
@@ -52,7 +52,7 @@ if(sum(grep("unexpected",raw_data)) > 0){
   stop(paste("You entered a country for which there is no data. ",locator," is not a country with any data"))
 }
 
-data_out <- jsonlite:::fromJSON(raw_data)
+data_out <- jsonlite::fromJSON(raw_data)
 # data_out <- data.frame(do.call(rbind, parsed_data))
 
 if(time_scale == "month"){