passing all checks

ipeaGIT · Aug 30, 2023 · 19af685 · 19af685
1 parent 388d850
commit 19af685
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 22 deletions.
diff --git a/r-package/R/read_access.R b/r-package/R/read_access.R
@@ -127,12 +127,16 @@
 #' all <- read_access(city = 'all', mode = 'walk', year = 2019, showProgress = FALSE)
 #'
 
-read_access <- function(city=NULL, mode = 'walk', peak = TRUE, year = 2019, geometry = FALSE, showProgress = TRUE){
+read_access <- function(city = NULL,
+                        mode = 'walk',
+                        peak = TRUE,
+                        year = 2019,
+                        geometry = FALSE,
+                        showProgress = TRUE){
 
   # checks
   checkmate::assert_logical(peak)
   checkmate::assert_logical(geometry)
-  checkmate::assert_logical(showProgress)
 
   # remove accents
   city <- tolower(city)
@@ -193,7 +197,7 @@ read_access <- function(city=NULL, mode = 'walk', peak = TRUE, year = 2019, geom
   file_url <- as.character(temp_meta$download_path2)
 
   # download files
-  aop_access <- download_data(file_url, progress_bar = showProgress)
+  aop_access <- download_data(url = file_url, progress_bar = showProgress)
 
   # check if download failed
   if (is.null(aop_access)) { return(invisible(NULL)) } # nocov

diff --git a/r-package/R/read_grid.R b/r-package/R/read_grid.R
@@ -53,7 +53,8 @@
 #' # all <- read_grid(city = 'all', showProgress = FALSE)
 #'
 
-read_grid <- function(city=NULL, showProgress = FALSE){
+read_grid <- function(city = NULL,
+                      showProgress = FALSE){
 
   # checks
   checkmate::assert_logical(showProgress)
@@ -68,7 +69,7 @@ read_grid <- function(city=NULL, showProgress = FALSE){
   file_url <- as.character(temp_meta$download_path2)
 
   # download files
-  aop_sf <- download_data(file_url, progress_bar = showProgress)
+  aop_sf <- download_data(url = file_url, progress_bar = showProgress)
 
   # check if download failed
   if (is.null(aop_sf)) { return(invisible(NULL)) } # nocov

diff --git a/r-package/R/read_landuse.R b/r-package/R/read_landuse.R
@@ -93,11 +93,13 @@
 #' # all cities
 #' all <- read_landuse(city = 'all', year = 2019)
 #'
-read_landuse <- function(city=NULL, year = 2019, geometry = FALSE, showProgress = TRUE){
+read_landuse <- function(city = NULL,
+                         year = 2019,
+                         geometry = FALSE,
+                         showProgress = TRUE){
 
   # checks
   checkmate::assert_logical(geometry)
-  checkmate::assert_logical(showProgress)
 
   # Get metadata with data url addresses
   temp_meta <- select_metadata(t='land_use',
@@ -113,7 +115,7 @@ read_landuse <- function(city=NULL, year = 2019, geometry = FALSE, showProgress
   file_url <- as.character(temp_meta$download_path2)
 
   # download files
-  aop_landuse <- download_data(file_url, progress_bar = showProgress)
+  aop_landuse <- download_data(url = file_url, progress_bar = showProgress)
 
   # check if download failed
   if (is.null(aop_landuse)) { return(invisible(NULL)) } # nocov

diff --git a/r-package/R/read_population.R b/r-package/R/read_population.R
@@ -75,11 +75,13 @@
 #' # all cities
 #' all <- read_population(city = 'all', year = 2010)
 #'
-read_population <- function(city=NULL, year = 2010, geometry = FALSE, showProgress = TRUE){
+read_population <- function(city=NULL,
+                            year = 2010,
+                            geometry = FALSE,
+                            showProgress = TRUE){
 
   # checks
   checkmate::assert_logical(geometry)
-  checkmate::assert_logical(showProgress)
 
   # Get metadata with data url addresses
   temp_meta <- select_metadata(t='population',
@@ -95,7 +97,7 @@ read_population <- function(city=NULL, year = 2010, geometry = FALSE, showProgre
   file_url <- as.character(temp_meta$download_path2)
 
   # download files
-  aop_population <- download_data(file_url, progress_bar = showProgress)
+  aop_population <- download_data(url = file_url, progress_bar = showProgress)
 
   # check if download failed
   if (is.null(aop_population)) { return(invisible(NULL)) }

diff --git a/r-package/R/utils.R b/r-package/R/utils.R
@@ -169,7 +169,10 @@ select_metadata <- function(t=NULL, c=NULL, y=NULL, m=NULL){
 #'
 download_data <- function(url, progress_bar = showProgress){
 
-  if (!(progress_bar %in% c(T, F))) { stop("Value to argument 'showProgress' has to be either TRUE or FALSE") }
+  # check showProgress input
+  if (!(progress_bar %in% c(TRUE, FALSE))) {
+    stop("Value to argument 'showProgress' has to be either TRUE or FALSE")
+    }
 
   # get backup links
   filenames <- basename(url)
@@ -182,7 +185,7 @@ download_data <- function(url, progress_bar = showProgress){
     # location of temp_file
     temps <- paste0(tempdir(),"/", unlist(lapply(strsplit(url,"/"),tail,n=1L)))
 
-    # check if file has not been downloaded already. If not, download it
+    # if file has not been downloaded already. If not, download it
     if (!file.exists(temps) | file.info(temps)$size == 0) {
 
       # test connection with server1
@@ -209,8 +212,8 @@ download_data <- function(url, progress_bar = showProgress){
     if (any(!file.exists(temps) | file.info(temps)$size == 0)) { return(invisible(NULL)) }
 
     # load gpkg to memory
-    temp_sf <- load_data(temps)
-    return(temp_sf)
+    temp_data <- load_data(temps)
+    return(temp_data)
   }
 
 
@@ -263,8 +266,6 @@ download_data <- function(url, progress_bar = showProgress){
     # load data
     temp_data <- load_data(temps)
     return(temp_data)
-
-
   }
 
 }
@@ -293,26 +294,31 @@ load_data <- function(temps=NULL){
     # read file
     if( fformat=='csv' ){ temp <- data.table::fread(temps) }
     if( fformat=='gpkg' ){ temp <- sf::st_read(temps, quiet=T) }
-    return(temp)
   }
 
+  ### multiple files
   else if (length(temps) > 1) {
 
-    # access csv
+    # csv
     if( fformat=='csv' ){
       files <- lapply(X=temps, FUN= data.table::fread)
       temp <- data.table::rbindlist(files, fill = TRUE)
     }
-
-    # grid geopackage
+    # geopackage
     if( fformat=='gpkg' ){
       files <- lapply(X=temps, FUN= sf::st_read, quiet=T)
       temp <- sf::st_as_sf(data.table::rbindlist(files, fill = TRUE))
     }
+  }
 
-    return(temp)
+  # check if data was read Ok
+  if (nrow(temp)==0) {
+    message("A file must have been corrupted during download. Please restart your R session and download the data again.")
+    return(invisible(NULL))
   }
 
+  return(temp)
+
   # load data to memory
   temp_data <- load_data(temps)
   return(temp_data)