load update

commfish · Oct 15, 2024 · 8180815 · 8180815
1 parent 6fef05d
commit 8180815
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/R/load_crab_dump.R b/R/load_crab_dump.R
@@ -76,8 +76,11 @@ load_crab_dump <- function(path, stock, database_pull = F, clean = T) {
     if(stock %in% c("AIGKC", "EAG", "WAG")) {
       ## data mgmt specific to gkc
       out %>%
-        # make XE fisheries EAG
-        mutate(subdistrict = ifelse(substring(fishery, 1, 2) == "XE", "EAG", subdistrict),
+        clean_lat_lon() %>%
+        mutate(subdistrict = ifelse(fishery == "OB08" & longitude < -174, "WAG", subdistrict),
+               subdistrict = ifelse(substring(fishery, 1, 2) == "XE", "EAG", subdistrict),
+               fishery = ifelse(fishery == "OB08" & longitude < -174, "RB08", fishery),
+               fishery = gsub("XE", "OB", fishery),
                fishery = paste0(substring(fishery, 1, 2), substring(crab_year, 3, 4))) %>%
         # fill in legal
         add_legal(., stock = stock) %>%

diff --git a/R/load_pot_dump.R b/R/load_pot_dump.R
@@ -66,7 +66,11 @@ load_pot_dump <- function(path, stock, database_pull = F, clean = T) {
       ## data mgmt specific to gkc
       out %>%
         clean_lat_lon() %>%
-        mutate(subdistrict = ifelse(fishery == "OB08" & longitude < -174, "WAG", subdistrict)) %>%
+        mutate(subdistrict = ifelse(fishery == "OB08" & longitude < -174, "WAG", subdistrict),
+               subdistrict = ifelse(substring(fishery, 1, 2) == "XE", "EAG", subdistrict),
+               fishery = ifelse(fishery == "OB08" & longitude < -174, "RB08", fishery),
+               fishery = gsub("XE", "OB", fishery),
+               fishery = paste0(substring(fishery, 1, 2), substring(crab_year, 3, 4))) %>%
         # remove pots without district info
         filter(subdistrict != "-") -> out
     }