Merge pull request #40 from ibarraespinosa/master

Update base_url
ropensci-archive · Mar 10, 2020 · 409629f · 409629f
2 parents 473870e + 6eeb83f
commit 409629f
Show file tree

Hide file tree

Showing 49 changed files with 737 additions and 495 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,3 +21,4 @@ Imports:
     jsonlite,
     reshape2,
     sp
+RoxygenNote: 7.0.2
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(climate_map)
 export(create_map_df)

diff --git a/R/check_ISO_code.R b/R/check_ISO_code.R
@@ -11,7 +11,12 @@
 
 
 check_ISO_code <- function(iso){
-codes <- c(NoAm_country,SoAm_country,Oceana_country,Africa_country,Asia_country,Eur_country)
+codes <- c(NoAm_country,
+           SoAm_country,
+           Oceana_country,
+           Africa_country,
+           Asia_country,
+           Eur_country)
   if(nchar(iso) != 3 && is.character(iso)){stop("Please enter a valid 3 letter country code")}
   if(is.numeric(iso)){stop("Please enter a 3 letter code, not a number")}
   if(!toupper(iso)%in%codes){stop(paste(iso,"is an invalid 3 letter country code, please refer to http://unstats.un.org/unsd/methods/m49/m49alpha.htm for a valid list",sep=" "))}

diff --git a/R/climate_map.R b/R/climate_map.R
@@ -21,7 +21,9 @@
 #'
 #'@export
 
-climate_map <- function(map_df, data_df, return_map = TRUE){
+climate_map <- function(map_df, 
+                        data_df, 
+                        return_map = TRUE){
   ### You can't plot more that one piece of data on a map
   ### so we need to check that there's not more data than regions to plot
   if(length(unique(map_df$ID)) != dim(data_df)[1]){

diff --git a/R/create_map_df.R b/R/create_map_df.R
@@ -29,6 +29,7 @@ create_map_df <- function(locator) {
 
   df_out <- list()
     map_pb <- txtProgressBar(min = 0, max = length(locator), style = 3)
+
   for(i in 1:length(locator)) {
     fName <- paste(my_path,to_plot[i], ".kml", sep = "")
     fSize <- file.info(fName)$size

diff --git a/R/download_kml.R b/R/download_kml.R
@@ -23,7 +23,7 @@ download_kml <- function(locator) {
 
   #check which kml are already downloaded
   to_download <- locator[!locator%in%kml_files]
-  base_url <- "http://api.worldbank.org/climateweb/rest/v1"
+  base_url <- "http://climatedataapi.worldbank.org/climateweb/rest/v1/"
 
   if(length(to_download) > 0){
     download_pb <- txtProgressBar(min = 0, max = length(to_download), style = 3)

diff --git a/R/get_climate_data.R b/R/get_climate_data.R
@@ -13,28 +13,34 @@
 #' 
 
 get_climate_data <- function(locator,geo_type,type, cvar, start, end){
-  base_url <- "http://api.worldbank.org/climateweb/rest/v1/"
+  base_url <- "http://climatedataapi.worldbank.org/climateweb/rest/v1/"
 
   ### Error handling
   if(geo_type == "country"){
     check_ISO_code(locator)
   }
-
+  
   if(geo_type == "basin"){
     if(is.na(as.numeric(locator))){
       stop("You must enter a valid Basin number between 1 and 468")
     }
     if(as.numeric(locator) < 1 || as.numeric(locator) > 468){
       as.numeric(locator) < 1 || as.numeric(locator) > 468
     }
-      
+
 
   }
 
   data_url <- paste(geo_type,type,cvar,start,end,locator,sep="/")
+
+#  print(data_url)
+
   extension <- ".json"
   full_url <- paste(base_url,data_url,extension,sep="")
-  res <- GET(full_url)
+
+#  print(full_url)
+
+    res <- GET(full_url)
   stop_for_status(res)
   raw_data <- try(content(res, as = "text"), silent = TRUE)
   if(sum(grep("unexpected",raw_data)) > 0){
@@ -55,17 +61,17 @@ get_climate_data <- function(locator,geo_type,type, cvar, start, end){
   if(type == "mavg" && start > 2010){
     do_list <- list()
     for( i in 1:length(unique(data_out$scenario))){
-    ### Unpack the lists
-    split_do <- subset(data_out,data_out$scenario == unique(data_out$scenario)[i])  
-    tmp <- data.frame(sapply(split_do$monthV,unlist))
-    colnames(tmp) <- split_do$gcm
-    tmp$fromYear <- rep(start,12)
-    tmp$toYear <- rep(end,12)
-    do_list[[i]] <- melt(tmp,id.vars =c("fromYear","toYear"), variable.name = c("gcm"), value.name = "data")
-    do_list[[i]]$scenario <- rep(split_do$scenario[1],dim(do_list[[i]])[1])
-    do_list[[i]]$month  <- rep(1:12,dim(do_list[[i]])[1]/12)
-  } 
-  data_out <- do.call(rbind,do_list)  
+      ### Unpack the lists
+      split_do <- subset(data_out,data_out$scenario == unique(data_out$scenario)[i])  
+      tmp <- data.frame(sapply(split_do$monthV,unlist))
+      colnames(tmp) <- split_do$gcm
+      tmp$fromYear <- rep(start,12)
+      tmp$toYear <- rep(end,12)
+      do_list[[i]] <- melt(tmp,id.vars =c("fromYear","toYear"), variable.name = c("gcm"), value.name = "data")
+      do_list[[i]]$scenario <- rep(split_do$scenario[1],dim(do_list[[i]])[1])
+      do_list[[i]]$month  <- rep(1:12,dim(do_list[[i]])[1]/12)
+    } 
+    data_out <- do.call(rbind,do_list)  
   }
 
 

diff --git a/R/get_data_recursive.R b/R/get_data_recursive.R
@@ -17,13 +17,23 @@
 
 
 
-get_data_recursive <- function(locator,geo_type,type, cvar, start, end){
+get_data_recursive <- function(locator,
+                               geo_type,
+                               type, 
+                               cvar, 
+                               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]] <- get_climate_data(locator[i],geo_type,type,cvar,dates[j,1],dates[j,2])
+      data_out[[counter]] <- get_climate_data(locator[i],
+                                              geo_type,
+                                              type,
+                                              cvar,
+                                              dates[j,1],
+                                              dates[j,2])
       counter <- counter + 1
     }
   }

diff --git a/R/get_ensemble_climate_data.R b/R/get_ensemble_climate_data.R
@@ -16,9 +16,14 @@
 #' conform to dates, the fuction will automatically round them.
 #' @param end The ending year you want data for, can be in the past or the future.
 #' Similar to the start date, dates will be rounded to the nearest end dat.
-get_ensemble_climate_data <- function(locator, geo_type, type, cvar, start, end){
-  base_url <- "http://api.worldbank.org/climateweb/rest/v1/"
-
+get_ensemble_climate_data <- function(locator, 
+                                      geo_type, 
+                                      type, 
+                                      cvar, 
+                                      start, 
+                                      end){
+  base_url <- "http://climatedataapi.worldbank.org/climateweb/rest/v1/"
+
   ### Error handling
   if(geo_type == "country"){
     check_ISO_code(locator)

diff --git a/R/get_historical_data.R b/R/get_historical_data.R
@@ -12,8 +12,8 @@
 #' @return a dataframe with historical climate data 
 #' @details The time_scale parameter returns a different number of variables depending on the input timescale. \emph{Month} will return 12 values, a historical average for that month across all years.  \emph{Year} will return yearly averages for each year, and \emph{decade} will return decade averages.
 get_historical_data <- function(locator,cvar,time_scale){
-base_url <- "http://api.worldbank.org/climateweb/rest/v1/"
-
+  base_url <- "http://climatedataapi.worldbank.org/climateweb/rest/v1/"
+  
 ### check cvar is valid
 var_vec <- c("tas","pr")
 if(!cvar%in%var_vec){

diff --git a/R/get_model_temp.R b/R/get_model_temp.R
@@ -32,7 +32,10 @@
 #'}
 #'@export
 
-get_model_temp <- function(locator,type, start, end){
+get_model_temp <- function(locator,
+                           type, 
+                           start, 
+                           end){
   ### check type is valid
   typevec <- c("mavg","annualavg","manom","annualanom")
   if(!type%in%typevec){

diff --git a/R/kml_to_sp.R b/R/kml_to_sp.R
@@ -18,7 +18,9 @@
 #'}
 #'@export
 
-kml_to_sp <- function(map_df, df = NULL, crs_string = "+proj=longlat +datum=WGS84"){
+kml_to_sp <- function(map_df, 
+                      df = NULL, 
+                      crs_string = "+proj=longlat +datum=WGS84"){
 
 
 

diff --git a/man/Africa_basin.Rd b/man/Africa_basin.Rd
diff --git a/man/Africa_country.Rd b/man/Africa_country.Rd
diff --git a/man/Asia_basin.Rd b/man/Asia_basin.Rd
diff --git a/man/Asia_country.Rd b/man/Asia_country.Rd
diff --git a/man/Eur_basin.Rd b/man/Eur_basin.Rd
diff --git a/man/Eur_country.Rd b/man/Eur_country.Rd
diff --git a/man/NoAm_basin.Rd b/man/NoAm_basin.Rd
diff --git a/man/NoAm_country.Rd b/man/NoAm_country.Rd
diff --git a/man/Oceana_basin.Rd b/man/Oceana_basin.Rd
diff --git a/man/Oceana_country.Rd b/man/Oceana_country.Rd
diff --git a/man/SoAm_basin.Rd b/man/SoAm_basin.Rd
diff --git a/man/SoAm_country.Rd b/man/SoAm_country.Rd
diff --git a/man/check_ISO_code.Rd b/man/check_ISO_code.Rd
diff --git a/man/check_locator.Rd b/man/check_locator.Rd
diff --git a/man/climate_map.Rd b/man/climate_map.Rd
diff --git a/man/codes.Rd b/man/codes.Rd