diff --git a/data_prep/R/support_fun.R b/data_prep/R/support_fun.R index 04660933..d271d68d 100644 --- a/data_prep/R/support_fun.R +++ b/data_prep/R/support_fun.R @@ -84,7 +84,7 @@ add_state_info <- function(temp_sf, column){ code_state== 28, "Sergipe", code_state== 29, "Bahia", code_state== 31, "Minas Gerais", - code_state== 32, "Espirito Santo", + code_state== 32, "Esp\u00edrito Santo", code_state== 33, "Rio de Janeiro", code_state== 35, "S\u00e3o Paulo", code_state== 41, "Paran\u00e1", diff --git a/r-package/DESCRIPTION b/r-package/DESCRIPTION index 8e0c9ec2..bf64932a 100644 --- a/r-package/DESCRIPTION +++ b/r-package/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: geobr Title: Download Official Spatial Data Sets of Brazil -Version: 1.8.109999 +Version: 1.8.999 Authors@R: c(person(given="Rafael H. M.", family="Pereira", email="rafa.pereira.br@gmail.com", role=c("aut", "cre"), comment = c(ORCID = "0000-0003-2125-7465")), person(given="Caio Nogueira", family="Goncalves", role=c("aut")), person(given="Paulo Henrique Fernandes de", family="Araujo", role=c("ctb")), diff --git a/r-package/NEWS.md b/r-package/NEWS.md index ca9837ea..c8b63f3d 100644 --- a/r-package/NEWS.md +++ b/r-package/NEWS.md @@ -1,3 +1,13 @@ +# geobr v1.8.999 dev + +**CRAN request** +- Fixed issue to nake sure geobr uses suggested packages conditionally + +**Minor changes** +- Fixed non-ASCII characters in data `geobr::grid_state_correspondence_table()` + + + # geobr v1.8.1 **CRAN request** diff --git a/r-package/R/read_comparable_areas.R b/r-package/R/read_comparable_areas.R index fab2ddd3..4c3e4488 100644 --- a/r-package/R/read_comparable_areas.R +++ b/r-package/R/read_comparable_areas.R @@ -5,8 +5,8 @@ #' municipalities, known in Portuguese as 'Areas minimas comparaveis (AMCs)'. #' The data is available for any combination of census years between 1872-2010. #' These data sets are generated based on the Stata code originally developed by -#' \doi{10.1590/0101-416147182phe}{Philipp Ehrl}, and translated -#' into `R` by the `geobr` team. +#' Ehrl (2017) \doi{10.1590/0101-416147182phe}, and translated into `R` by the +#' `geobr` team. #' #' @param start_year Numeric. Start year to the period in the YYYY format. #' Defaults TO `1970`. diff --git a/r-package/man/geobr.Rd b/r-package/man/geobr.Rd index 8f1e7d14..13d61592 100644 --- a/r-package/man/geobr.Rd +++ b/r-package/man/geobr.Rd @@ -51,6 +51,7 @@ Other contributors: \item Alessandro Samuel-Rosa [contributor] \item Daniel Ferreira [contributor] \item Marcus Saraiva [contributor] + \item Beatriz Milz (\href{https://orcid.org/0000-0002-3064-4486}{ORCID}) [contributor] \item Ipea - Institue for Applied Economic Research [copyright holder, funder] } diff --git a/r-package/man/read_comparable_areas.Rd b/r-package/man/read_comparable_areas.Rd index 6d98550c..21b2de21 100644 --- a/r-package/man/read_comparable_areas.Rd +++ b/r-package/man/read_comparable_areas.Rd @@ -35,8 +35,8 @@ This function downloads the shape file of minimum comparable area of municipalities, known in Portuguese as 'Areas minimas comparaveis (AMCs)'. The data is available for any combination of census years between 1872-2010. These data sets are generated based on the Stata code originally developed by -\doi{10.1590/0101-416147182phe}{Philipp Ehrl}, and translated -into \code{R} by the \code{geobr} team. +Ehrl (2017) \doi{10.1590/0101-416147182phe}, and translated into \code{R} by the +\code{geobr} team. } \details{ These data sets are generated based on the original Stata code developed by diff --git a/r-package/tests/tests_rafa/test_rafa.R b/r-package/tests/tests_rafa/test_rafa.R index b5d29c93..6c275a34 100644 --- a/r-package/tests/tests_rafa/test_rafa.R +++ b/r-package/tests/tests_rafa/test_rafa.R @@ -78,7 +78,7 @@ system.time( ct4 <- st_read_parquet("ct_sf.parquet") ) ### convert to ASCII characters ------------------------- -gtools::ASCIIfy('Belém') +gtools::ASCIIfy('Espírito Santo') gtools::ASCIIfy('São Paulo') gtools::ASCIIfy('Rondônia')