Fix grep issue with Palmas (Las)

rOpenSpain · Feb 22, 2022 · ca34f74 · ca34f74
1 parent be70032
commit ca34f74
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/R/atom_ad_db.R b/R/atom_ad_db.R
@@ -89,7 +89,11 @@ catr_atom_get_address_db_to <- function(to,
   all <- catr_atom_get_address_db_all()
   alldist <- unique(all[, c("territorial_office", "url")])
 
-  findto <- grep(to, alldist$territorial_office, ignore.case = TRUE)[1]
+  # Escape parenthesis
+  to <- gsub("\\(|\\)", "", to)
+  allto <- gsub("\\(|\\)", "", alldist$territorial_office)
+
+  findto <- grep(to, allto, ignore.case = TRUE)[1]
 
   if (is.na(findto)) {
     message("No Territorial office found for ", to)

diff --git a/R/atom_bu_db.R b/R/atom_bu_db.R
@@ -88,7 +88,11 @@ catr_atom_get_buildings_db_to <- function(to,
   all <- catr_atom_get_buildings_db_all()
   alldist <- unique(all[, c("territorial_office", "url")])
 
-  findto <- grep(to, alldist$territorial_office, ignore.case = TRUE)[1]
+  # Escape parenthesis
+  to <- gsub("\\(|\\)", "", to)
+  allto <- gsub("\\(|\\)", "", alldist$territorial_office)
+
+  findto <- grep(to, allto, ignore.case = TRUE)[1]
 
   if (is.na(findto)) {
     message("No Territorial office found for ", to)

diff --git a/R/atom_cp_db.R b/R/atom_cp_db.R
@@ -88,7 +88,11 @@ catr_atom_get_parcels_db_to <- function(to,
   all <- catr_atom_get_parcels_db_all()
   alldist <- unique(all[, c("territorial_office", "url")])
 
-  findto <- grep(to, alldist$territorial_office, ignore.case = TRUE)[1]
+  # Escape parenthesis
+  to <- gsub("\\(|\\)", "", to)
+  allto <- gsub("\\(|\\)", "", alldist$territorial_office)
+
+  findto <- grep(to, allto, ignore.case = TRUE)[1]
 
   if (is.na(findto)) {
     message("No Territorial office found for ", to)

diff --git a/R/utils_atom.R b/R/utils_atom.R
@@ -31,9 +31,9 @@ catr_read_atom <- function(file, top = TRUE, encoding = "UTF-8") {
 
 
       tbl <- tibble::tibble(
-        title = title,
-        url = url,
-        value = value,
+        title = trimws(title),
+        url = trimws(url),
+        value = trimws(value),
         date = date
       )
 
@@ -46,8 +46,8 @@ catr_read_atom <- function(file, top = TRUE, encoding = "UTF-8") {
       date <- as.POSIXct(unlist(feed[1]$entry$updated))
 
       tbl <- tibble::tibble(
-        title = title,
-        url = url,
+        title = trimws(title),
+        url = trimws(url),
         date = date
       )