streamline micro, meso and muni

rafapereirabr · rafapereirabr · commit 85a13921fce1 · 2024-09-03T22:06:29.000-03:00
diff --git a/r-package/R/read_meso_region.R b/r-package/R/read_meso_region.R
@@ -43,55 +43,63 @@ read_meso_region <- function(code_meso = "all",
   # check if download failed
   if (is.null(temp_meta)) { return(invisible(NULL)) }
 
-# Verify code_meso input
-
-  # if code_meso=="all", read the entire country
-  if(code_meso=="all"){
+  # Verify code_meso input
+  if (!any(code_meso == 'all' |
+           code_meso %in% temp_meta$code |
+           substring(code_meso, 1, 2) %in% temp_meta$code |
+           code_meso %in% temp_meta$code_abbrev
+  )) {
+    stop("Error: Invalid Value to argument code_meso.")
+  }
 
-    # list paths of files to download
+  # get file url
+  if (code_meso=="all") {
     file_url <- as.character(temp_meta$download_path)
 
-    # download files
-    temp_sf <- download_gpkg(file_url = file_url,
-                             showProgress = showProgress,
-                             cache = cache)
-
-    # check if download failed
-    if (is.null(temp_sf)) { return(invisible(NULL)) }
-
-    return(temp_sf)
+  } else if (is.numeric(code_meso)) { # if using numeric code_meso
+    file_url <- as.character(subset(temp_meta, code==substr(code_meso, 1, 2))$download_path)
 
+  } else if (is.character(code_meso)) { # if using chacracter code_abbrev
+    file_url <- as.character(subset(temp_meta, code_abbrev==substr(code_meso, 1, 2))$download_path)
   }
 
-  if( !(substr(x = code_meso, 1, 2) %in% temp_meta$code) & !(substr(x = code_meso, 1, 2) %in% temp_meta$code_abbrev)){
-    stop("Error: Invalid Value to argument code_meso.")
-
-  } else{
-
-    # list paths of files to download
-    if (is.numeric(code_meso)){ file_url <- as.character(subset(temp_meta, code==substr(code_meso, 1, 2))$download_path) }
-    if (is.character(code_meso)){ file_url <- as.character(subset(temp_meta, code_abbrev==substr(code_meso, 1, 2))$download_path) }
+  # download gpkg
+  temp_sf <- download_gpkg(file_url = file_url,
+                           showProgress = showProgress,
+                           cache = cache)
 
+  # check if download failed
+  if (is.null(temp_sf)) { return(invisible(NULL)) }
 
+  # return all municipalities
+  if (code_meso =='all' ){
+    return(temp_sf)
+  }
 
-    # download files
-    temp_sf <- download_gpkg(file_url = file_url,
-                             showProgress = showProgress,
-                             cache = cache)
+  # FILTER particular region
+  x <- code_meso
 
-    # check if download failed
-    if (is.null(temp_sf)) { return(invisible(NULL)) }
+  if (!any(code_meso %in% temp_sf$code_meso |
+           code_meso %in% temp_sf$code_state |
+           code_meso %in% temp_sf$abbrev_state)) {
+    stop("Error: Invalid value to argument code_meso.")
+  }
 
+  # particular state
+  if(nchar(code_meso)==2){
 
-    if(nchar(code_meso)==2){
-      return(temp_sf)
+    if (is.numeric(code_meso)) {
+      temp_sf <- subset(temp_sf, code_state == x)
+    }
 
-    } else if(code_meso %in% temp_sf$code_meso){    # Get meso region
-      x <- code_meso
-      temp_sf <- subset(temp_sf, code_meso==x)
-      return(temp_sf)
-    } else{
-      stop("Error: Invalid Value to argument code_meso.")
+    if (is.character(code_meso)) {
+      temp_sf <- subset(temp_sf, abbrev_state == x)
     }
   }
+
+  # particular meso
+  if(nchar(code_meso)==4 & is.numeric(code_meso)){
+    temp_sf <- subset(temp_sf, code_meso == x)
+  }
+  return(temp_sf)
 }
diff --git a/r-package/R/read_micro_region.R b/r-package/R/read_micro_region.R
@@ -42,52 +42,62 @@ read_micro_region <- function(code_micro = "all",
   if (is.null(temp_meta)) { return(invisible(NULL)) }
 
   # Verify code_micro input
+  if (!any(code_micro == 'all' |
+           code_micro %in% temp_meta$code |
+           substring(code_micro, 1, 2) %in% temp_meta$code |
+           code_micro %in% temp_meta$code_abbrev
+           )) {
+    stop("Error: Invalid Value to argument code_micro.")
+    }
 
-  # if code_micro=="all", read the entire country
-  if(code_micro=="all"){
-
-    # list paths of files to download
+  # get file url
+  if (code_micro=="all") {
     file_url <- as.character(temp_meta$download_path)
 
-    # download files
-    temp_sf <- download_gpkg(file_url = file_url,
-                             showProgress = showProgress,
-                             cache = cache)
-
-    # check if download failed
-    if (is.null(temp_sf)) { return(invisible(NULL)) }
+  } else if (is.numeric(code_micro)) { # if using numeric code_micro
+    file_url <- as.character(subset(temp_meta, code==substr(code_micro, 1, 2))$download_path)
 
-    return(temp_sf)
-  }
-
-  if( !(substr(x = code_micro, 1, 2) %in% temp_meta$code) & !(substr(x = code_micro, 1, 2) %in% temp_meta$code_abbrev)){
+  } else if (is.character(code_micro)) { # if using chacracter code_abbrev
+    file_url <- as.character(subset(temp_meta, code_abbrev==substr(code_micro, 1, 2))$download_path)
+    }
 
-    stop("Error: Invalid Value to argument code_micro.")
+  # download gpkg
+  temp_sf <- download_gpkg(file_url = file_url,
+                           showProgress = showProgress,
+                           cache = cache)
 
-  } else{
+  # check if download failed
+  if (is.null(temp_sf)) { return(invisible(NULL)) }
 
-    # list paths of files to download
-    if (is.numeric(code_micro)){ file_url <- as.character(subset(temp_meta, code==substr(code_micro, 1, 2))$download_path) }
-    if (is.character(code_micro)){ file_url <- as.character(subset(temp_meta, code_abbrev==substr(code_micro, 1, 2))$download_path) }
+  # return all municipalities
+  if (code_micro =='all' ){
+    return(temp_sf)
+  }
 
+  # FILTER particular region
+  x <- code_micro
 
-    # download files
-    sf <- download_gpkg(file_url = file_url,
-                             showProgress = showProgress,
-                             cache = cache)
+  if (!any(code_micro %in% temp_sf$code_micro |
+           code_micro %in% temp_sf$code_state |
+           code_micro %in% temp_sf$abbrev_state)) {
+    stop("Error: Invalid value to argument code_micro.")
+  }
 
-    # check if download failed
-    if (is.null(sf)) { return(invisible(NULL)) }
+  # particular state
+  if(nchar(code_micro)==2){
 
-    if(nchar(code_micro)==2){
-      return(sf)
+    if (is.numeric(code_micro)) {
+      temp_sf <- subset(temp_sf, code_state == x)
+    }
 
-    } else if(code_micro %in% sf$code_micro){    # Get micro region
-      x <- code_micro
-      sf <- subset(sf, code_micro==x)
-      return(sf)
-    } else{
-      stop("Error: Invalid Value to argument code_micro. There was no micro region with this code in this year")
+    if (is.character(code_micro)) {
+      temp_sf <- subset(temp_sf, abbrev_state == x)
     }
   }
+
+  # particular micro
+  if(nchar(code_micro)==5 & is.numeric(code_micro)){
+    temp_sf <- subset(temp_sf, code_micro == x)
+    }
+  return(temp_sf)
 }
diff --git a/r-package/R/read_municipality.R b/r-package/R/read_municipality.R
@@ -100,10 +100,8 @@ read_municipality <- function(code_muni = "all",
   }
 
   # particular muni
-  if(nchar(code_muni)>2){
-    if (is.numeric(code_muni)) {
-      temp_sf <- subset(temp_sf, code_state == x)
+  if(nchar(code_muni)>2 & is.numeric(code_muni)){
+      temp_sf <- subset(temp_sf, code_muni == x)
     }
-  }
   return(temp_sf)
 }
diff --git a/r-package/tests/testthat/test-read_micro_region.R b/r-package/tests/testthat/test-read_micro_region.R
@@ -13,10 +13,9 @@ test_that("read_micro_region", {
   # expect_true(is(  read_micro_region(code_micro=11, year=2010) , "sf"))
   expect_true(is(  read_micro_region(code_micro="all", year=2010)  , "sf"))
 
-  test_micro_code <-  read_micro_region(code_micro=11008, year=2010)
-
-  # check number of micro
-  expect_equal( nrow(test_micro_code), 1)
+  # check filter
+  test_filter <-  read_micro_region(code_micro=11008, year=2010)
+  expect_equal( nrow(test_filter), 1)
 
 })
 
@@ -25,7 +24,6 @@ test_that("read_micro_region", {
 # ERRORS
 test_that("read_micro_region", {
 
-
   expect_error(read_micro_region(code_micro=9999999, year=9999999))
 
   # Wrong code
diff --git a/r-package/tests/testthat/test-read_municipality.R b/r-package/tests/testthat/test-read_municipality.R
@@ -32,6 +32,10 @@ test_that("read_municipality", {
   testthat::expect_true(is(  read_municipality(code_muni='AC', year=2010)  , "sf"))
   testthat::expect_true(is(  read_municipality(code_muni=1200179, year=2010) , "sf"))
 
+  # check filter
+  test_filter <-  read_municipality(code_muni=1200179, year=2010)
+  expect_equal( nrow(test_filter), 1)
+
 })
 
 

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,8 @@ read_municipality <- function(code_muni = "all",`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`# particular muni`
`103`		`- if(nchar(code_muni)>2){`
`104`		`- if (is.numeric(code_muni)) {`
`105`		`- temp_sf <- subset(temp_sf, code_state == x)`
	`103`	`+ if(nchar(code_muni)>2 & is.numeric(code_muni)){`
	`104`	`+ temp_sf <- subset(temp_sf, code_muni == x)`
`106`	`105`	`}`
`107`		`- }`
`108`	`106`	`return(temp_sf)`
`109`	`107`	`}`