closes #31

Author: rafapereirabr

r-package/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: aopdata
 Title: Data from the 'Access to Opportunities Project (AOP)'
-Version: 0.2.0
-Date: 2021-03-30
+Version: 0.2.1
+Date: 2021-04-07
 Authors@R: c(
              person(given="Rafael H. M.", family="Pereira", email="[email protected]", role=c("aut", "cre"), comment = c(ORCID = "0000-0003-2125-7465")),
              person(given="Daniel", family="Herszenhut", email="[email protected]", role="aut", comment = c(ORCID = "0000-0001-8066-1105")),

r-package/NAMESPACE

@@ -10,7 +10,6 @@ export(read_access)
 export(read_grid)
 export(read_landuse)
 export(read_population)
-export(rm_accent)
 export(select_city_input)
 export(select_metadata)
 export(select_mode_input)

r-package/NEWS.md

@@ -3,14 +3,12 @@
 -------------------------------------------------------
 
 
-# aopdata v0.3.0 (dev)
-
-**Major changes**
-* Allow for user to download data few selected cities. Closes #29
-
+# aopdata v0.2.1 (dev)
 
 **Minor changes**
+* Allow for user to download data few selected cities. Closes #29
 * Fix  progress bar even when showProgress = F. Closes #30
+* Fix  encoding issues using `base::iconv(city, to="ASCII//TRANSLIT")`. Closes #31
 
 
 -------------------------------------------------------

r-package/R/read_access.R

@@ -93,12 +93,13 @@ read_access <- function(city, mode = 'walk', peak = TRUE, year = 2019, geometry
   aop_access <- download_data(file_url, progress_bar = showProgress)
 
   # peak Vs off-peak
-  city <- tolower(city)
-  city <- rm_accent(city)
+    city <- tolower(city)
+    # remove accents
+    city <- base::iconv(city, to="ASCII//TRANSLIT")
 
   cities_with_pt <- ( all(city %in% c('for', 'rec', 'bho', 'rio', 'spo', 'cur', 'poa')) |
                     all(city %in% c('fortaleza', 'recife', 'belo horizonte',
-                                'rio de janeiro', 's\u00e3o paulo', 'sao paulo', 'curitiba', 'porto alegre')) )
+                                'rio de janeiro', 'sao paulo', 'curitiba', 'porto alegre')) )
 
   if (isFALSE(cities_with_pt) & mode == 'public_transport') {stop("One of the selected cities does not have public transport data for that year.")}
 

r-package/R/utils.R

@@ -40,7 +40,8 @@ select_city_input <- function(temp_meta=temp_meta, city=NULL){
   if (all(nchar(city)>3)) {
 
     city <- tolower(city)
-    city <- rm_accent(city)
+    # remove accents
+    city <- base::iconv(city, to="ASCII//TRANSLIT")
 
     # valid input
     if (all(city %in% temp_meta$name_muni)) { temp_meta <- temp_meta[ temp_meta$name_muni %in% city, ]
@@ -344,52 +345,6 @@ load_data <- function(file_url, temps=NULL){
 
 
 
-
-#' Remove accents from string
-#'
-#' @description Removes non-ASCII characters from a string.
-#'
-#' @param str A string
-#' @param pattern A pattern
-#'
-#' @return Returns a string with non-ASCII characters replaced with "\'uxxxx" escapes
-#'
-#' @export
-#' @family support functions
-#'
-rm_accent <- function(str, pattern="all") {
-  if(!is.character(str))
-    str <- as.character(str)
-  pattern <- unique(pattern)
-  if(any(pattern=="\u00c7"))
-    pattern[pattern=="\u00c7"] <- "\u00e7"
-  symbols <- c(
-    acute = "\u00e1\u00e9\u00ed\u00f3\u00fa\u00c1\u00c9\u00cd\u00d3\u00da\u00fd\u00dd",
-    grave = "\u00e0\u00e8\u00ec\u00f2\u00f9\u00c0\u00c8\u00cc\u00d2\u00d9",
-    circunflex = "\u00e2\u00ea\u00ee\u00f4\u00fb\u00c2\u00ca\u00ce\u00d4\u00db",
-    tilde = "\u00e3\u00f5\u00c3\u00d5\u00f1\u00d1",
-    umlaut = "\u00e4\u00eb\u00ef\u00f6\u00fc\u00c4\u00cb\u00cf\u00d6\u00dc\u00ff",
-    cedil = "\u00e7\u00c7"
-  )
-  nudeSymbols <- c(
-    acute = "aeiouAEIOUyY",
-    grave = "aeiouAEIOU",
-    circunflex = "aeiouAEIOU",
-    tilde = "aoAOnN",
-    umlaut = "aeiouAEIOUy",
-    cedil = "cC"
-  )
-  accentTypes <- c("\u00b4", "`", "^", "~", "\u00a8", "\u00e7") # c("´","`","^","~","¨","ç")
-  if(any(c("all","al","a","todos","t","to","tod","todo")%in%pattern))
-    return(chartr(paste(symbols, collapse=""), paste(nudeSymbols, collapse=""), str))
-  for(i in which(accentTypes%in%pattern))
-    str <- chartr(symbols[i],nudeSymbols[i], str)
-  return(str)
-}
-
-
-
-
 #' Spatial join of AOP data
 #'
 #' @description Merges landuse or access data with H3 grid geometries