Remove redundant location processing

luomus · Nov 6, 2024 · 5d6736b · 5d6736b
1 parent 63204e4
commit 5d6736b
Show file tree

Hide file tree

Showing 36 changed files with 2 additions and 44 deletions.
diff --git a/R/get_occurrences.R b/R/get_occurrences.R
@@ -60,14 +60,6 @@ get_occurrences <- function(
 
   }
 
-  verbatim_loc <- c(
-    "county" = "verbatimCounty",
-    "stateProvince" = "verbatimStateProvince",
-    "country"= "verbatimCountry"
-  )
-
-  verbatim_loc <- verbatim_loc[intersect(select, names(verbatim_loc))]
-
   media_vars <- NULL
 
   if ("associatedMedia" %in% select) {
@@ -83,8 +75,7 @@ get_occurrences <- function(
 
   }
 
-  select_vars <- unname(verbatim_loc)
-  select_vars <- c(select, oq, dk, rk, select_vars, type_vars)
+  select_vars <- c(select, oq, dk, rk, type_vars)
   select_vars <- unique(select_vars)
   select_vars <- setdiff(select_vars, "associatedMedia")
   select_vars <- c(select_vars, media_vars)
@@ -110,8 +101,6 @@ get_occurrences <- function(
 
   data <- process_occurrence_remarks(data, oq, dk, rk)
 
-  data <- process_location(data, verbatim_loc)
-
   data <- process_type_status(data, type_vars, select)
 
   data <- combine_fields(data, combine)
@@ -301,34 +290,6 @@ process_occurrence_remarks <- function(data, oq, dk, rk) {
 
 #' @noRd
 
-process_location <- function(data, verbatim_loc) {
-
-  for (i in seq_along(verbatim_loc)) {
-
-    var_name <- names(verbatim_loc)[[i]]
-
-    var <- verbatim_loc[[i]]
-
-    has_var <- var_name %in% names(data)
-
-    if (has_var) {
-
-      data[[var_name]] <- ifelse(
-        is.na(data[[var_name]]), data[[var]], data[[var_name]]
-      )
-
-    }
-
-    data[[var]] <- NULL
-
-  }
-
-  data
-
-}
-
-#' @noRd
-
 process_type_status <- function(data, type_vars, select) {
 
   if (!is.null(type_vars)) {

diff --git a/inst/tinytest/config.yml b/inst/tinytest/config.yml
@@ -28,14 +28,11 @@ default:
   - associatedMedia
   nmax: 2.5e4
   filters:
+    date_range_ymd: ["2000-01-01", ""]
   facts:
     recordNumber: MY.legID
     verbatimElevation: MY.alt
     habitat: MY.habitatDescription
   combine:
     habitat:
     - habitat
-
-test:
-  filters:
-    date_range_ymd: ["2000-01-01", ""]
diff --git a/inst/tinytest/finbif_cache_file_0828250b14bae0a6132e370c0f9c9f0e b/inst/tinytest/finbif_cache_file_0828250b14bae0a6132e370c0f9c9f0e
diff --git a/inst/tinytest/finbif_cache_file_0e3359b7535080a42ae70fb62fa5b7a6 b/inst/tinytest/finbif_cache_file_0e3359b7535080a42ae70fb62fa5b7a6
diff --git a/inst/tinytest/finbif_cache_file_0f85c5e43611549bb81d21ad9de8f860 b/inst/tinytest/finbif_cache_file_0f85c5e43611549bb81d21ad9de8f860
diff --git a/inst/tinytest/finbif_cache_file_219d9a5adf7671eb2c9993b94c6ce551 b/inst/tinytest/finbif_cache_file_219d9a5adf7671eb2c9993b94c6ce551
diff --git a/inst/tinytest/finbif_cache_file_25a0626b833603fe59365e9753bd00fe b/inst/tinytest/finbif_cache_file_25a0626b833603fe59365e9753bd00fe
diff --git a/inst/tinytest/finbif_cache_file_2fb2154276c298550219bb368c6b4046 b/inst/tinytest/finbif_cache_file_2fb2154276c298550219bb368c6b4046
diff --git a/inst/tinytest/finbif_cache_file_3131b57d1ead6947c09e78c72abbb7c1 b/inst/tinytest/finbif_cache_file_3131b57d1ead6947c09e78c72abbb7c1
diff --git a/inst/tinytest/finbif_cache_file_36664b0bba9f45a81e3131747b87fb43 b/inst/tinytest/finbif_cache_file_36664b0bba9f45a81e3131747b87fb43
diff --git a/inst/tinytest/finbif_cache_file_399e3d1349945e05ff6c9f99fcb26dd9 b/inst/tinytest/finbif_cache_file_399e3d1349945e05ff6c9f99fcb26dd9
diff --git a/inst/tinytest/finbif_cache_file_3abd792e21e4ce05e3ce1e253b1a3887 b/inst/tinytest/finbif_cache_file_3abd792e21e4ce05e3ce1e253b1a3887
diff --git a/inst/tinytest/finbif_cache_file_3bd7fb28a1b04ef8ce230bade2b38f9f b/inst/tinytest/finbif_cache_file_3bd7fb28a1b04ef8ce230bade2b38f9f
diff --git a/inst/tinytest/finbif_cache_file_3f579f402404b30b2a0ec14a69ab2a2d b/inst/tinytest/finbif_cache_file_3f579f402404b30b2a0ec14a69ab2a2d
diff --git a/inst/tinytest/finbif_cache_file_4d64f2921468e2b3cbb5cee8d4e05571 b/inst/tinytest/finbif_cache_file_4d64f2921468e2b3cbb5cee8d4e05571
diff --git a/inst/tinytest/finbif_cache_file_562f5e0d0289ce3cafb998905c49401f b/inst/tinytest/finbif_cache_file_562f5e0d0289ce3cafb998905c49401f
diff --git a/inst/tinytest/finbif_cache_file_64c1cceb20870f4bb4a8fbc8daf404d3 b/inst/tinytest/finbif_cache_file_64c1cceb20870f4bb4a8fbc8daf404d3
diff --git a/inst/tinytest/finbif_cache_file_6f6a4ed0368044f4d0732b035541b0d5 b/inst/tinytest/finbif_cache_file_6f6a4ed0368044f4d0732b035541b0d5
diff --git a/inst/tinytest/finbif_cache_file_77059d4cbc739afdd4912f061ec89a85 b/inst/tinytest/finbif_cache_file_77059d4cbc739afdd4912f061ec89a85
diff --git a/inst/tinytest/finbif_cache_file_98a7dfdf2908422cf73001a353ff40d2 b/inst/tinytest/finbif_cache_file_98a7dfdf2908422cf73001a353ff40d2
diff --git a/inst/tinytest/finbif_cache_file_9b2ec085b19c17b53facba07712b8ad8 b/inst/tinytest/finbif_cache_file_9b2ec085b19c17b53facba07712b8ad8
diff --git a/inst/tinytest/finbif_cache_file_a07045bd21d359205c2e44cb08f25e00 b/inst/tinytest/finbif_cache_file_a07045bd21d359205c2e44cb08f25e00
diff --git a/inst/tinytest/finbif_cache_file_addd7dd73cd0730e48429659a6669bb4 b/inst/tinytest/finbif_cache_file_addd7dd73cd0730e48429659a6669bb4
diff --git a/inst/tinytest/finbif_cache_file_b7e5d1404ab4498dbcda4227d6dfc4ca b/inst/tinytest/finbif_cache_file_b7e5d1404ab4498dbcda4227d6dfc4ca
diff --git a/inst/tinytest/finbif_cache_file_bfea01a741bd38c5718b19c554ea8a13 b/inst/tinytest/finbif_cache_file_bfea01a741bd38c5718b19c554ea8a13
diff --git a/inst/tinytest/finbif_cache_file_c20c8d743912af6e748f35af894d55e5 b/inst/tinytest/finbif_cache_file_c20c8d743912af6e748f35af894d55e5
diff --git a/inst/tinytest/finbif_cache_file_cc4f69affac5a9775423c145586681aa b/inst/tinytest/finbif_cache_file_cc4f69affac5a9775423c145586681aa
diff --git a/inst/tinytest/finbif_cache_file_ec37256b7085af694b2df757f477c939 b/inst/tinytest/finbif_cache_file_ec37256b7085af694b2df757f477c939
diff --git a/inst/tinytest/finbif_cache_file_ec53cbf2cee63b0c0c1cccbaf6922bff b/inst/tinytest/finbif_cache_file_ec53cbf2cee63b0c0c1cccbaf6922bff
diff --git a/inst/tinytest/finbif_cache_file_ec770aed99dbfff379de5fec1add7988 b/inst/tinytest/finbif_cache_file_ec770aed99dbfff379de5fec1add7988
diff --git a/inst/tinytest/finbif_cache_file_f05a965fe9d224c792ce875d356bc2e0 b/inst/tinytest/finbif_cache_file_f05a965fe9d224c792ce875d356bc2e0
diff --git a/inst/tinytest/finbif_cache_file_f4a8d38c7e382cd36a40ef3fcabc4bd6 b/inst/tinytest/finbif_cache_file_f4a8d38c7e382cd36a40ef3fcabc4bd6
diff --git a/inst/tinytest/finbif_cache_file_f721ebf2de6b84f6a740654ab9ce0c09 b/inst/tinytest/finbif_cache_file_f721ebf2de6b84f6a740654ab9ce0c09
diff --git a/inst/tinytest/finbif_cache_file_f738659c29d84667779925df811859b9 b/inst/tinytest/finbif_cache_file_f738659c29d84667779925df811859b9
diff --git a/inst/tinytest/finbif_cache_file_faf20ea5cdb3a52dff7d24a87e8ccfe5 b/inst/tinytest/finbif_cache_file_faf20ea5cdb3a52dff7d24a87e8ccfe5
diff --git a/inst/tinytest/finbif_cache_file_fcec08b4cad3f8294be1196b98f86f48 b/inst/tinytest/finbif_cache_file_fcec08b4cad3f8294be1196b98f86f48