Use verbatim region for recs w/o municipality

luomus · Oct 1, 2024 · 56b4132 · 56b4132
1 parent c0777da
commit 56b4132
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 160 deletions.
diff --git a/R/finbif_occurrence.R b/R/finbif_occurrence.R
@@ -1406,6 +1406,8 @@ compute_region <- function(fb_occurrence_df) {
 
   region_var <- var_names[["computed_var_region", vtype]]
 
+  region_verbatim <- var_names[["gathering.province", vtype]]
+
   add <- attr(fb_occurrence_df, "include_new_cols", TRUE)
 
   if (add && region_var %in% attr(fb_occurrence_df, "column_names", TRUE)) {
@@ -1420,6 +1422,12 @@ compute_region <- function(fb_occurrence_df) {
 
     fb_occurrence_df[[region_var]] <- municipality[id, "region"]
 
+    fb_occurrence_df[[region_var]] <- ifelse(
+      is.na(fb_occurrence_df[[region_var]]),
+      fb_occurrence_df[[region_verbatim]],
+      fb_occurrence_df[[region_var]]
+    )
+
   }
 
   fb_occurrence_df

diff --git a/R/finbif_records.R b/R/finbif_records.R
@@ -645,7 +645,10 @@ infer_computed_vars <- function(fb_records_obj) {
     ),
     region = list(
       vars = c("region", "stateProvince"),
-      v_names = "gathering.interpretations.finnishMunicipality"
+      v_names = c(
+        "gathering.interpretations.finnishMunicipality",
+        "gathering.province"
+      )
     ),
     institution_code = list(
       vars = c("institution_code", "institutionCode"),