Reducing duplication

traitecoevo · Jul 26, 2023 · b9af2d8 · b9af2d8
1 parent 7d4ae8f
commit b9af2d8
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/R/clean_names.R b/R/clean_names.R
@@ -569,24 +569,19 @@ get_updated_species_list <-
       aligned_data$aligned_name %>% update_taxonomy(resources = resources, output = output)
 
     if (one_to_many %in% c("return_all", "collapse_to_higher_taxon")) {
-      aligned_data %>%
-        dplyr::select(original_name, aligned_name, aligned_reason) %>%
-        dplyr::left_join(aligned_species_list_tmp,
-                         by = c("aligned_name"),
-                         multiple = "all") %>%
-        dplyr::filter(!is.na(taxonIDClean)) %>%
-        dplyr::mutate(genus = stringr::word(canonicalName, 1, 1)) %>%
-        dplyr::rename(canonical_name = canonicalName)
+      multiple = "all"
     } else {
-      aligned_data %>%
-        dplyr::select(original_name, aligned_name, aligned_reason) %>%
-        dplyr::left_join(aligned_species_list_tmp,
-                         by = c("aligned_name"),
-                         multiple = "first") %>%
-        dplyr::filter(!is.na(taxonIDClean)) %>%
-        dplyr::mutate(genus = stringr::word(canonicalName, 1, 1)) %>%
-        dplyr::rename(canonical_name = canonicalName)
+      multiple = "first"
     }
+
+    aligned_data %>%
+      dplyr::select(original_name, aligned_name, aligned_reason) %>%
+      dplyr::left_join(aligned_species_list_tmp,
+                        by = c("aligned_name"),
+                        multiple = multiple) %>%
+      dplyr::filter(!is.na(taxonIDClean)) %>%
+      dplyr::mutate(genus = stringr::word(canonicalName, 1, 1)) %>%
+      dplyr::rename(canonical_name = canonicalName)
   }