Merge branch 'kvl-apply-feedback' into 'main'

Apply feedback from regroup

See merge request !89

findex/_targets.R

@@ -101,8 +101,8 @@ p2 <- list(
   
   tar_target(
     p2_threat_categories,
-    p2_weights |>
-      pull(Threat_Category) |> 
+    p2_mean_weighted_threats |>
+      pull(ThreatCategory) |> 
       unique()
   ),
   tar_target(
@@ -122,11 +122,11 @@ p2 <- list(
         mutate(
           # color ramps
           pal = case_when(
-            MajorCat == "Habitat" ~ list(c("#7A562B", "#C7985F", "#E1C8AA")), 
-            MajorCat == "Exploitation" ~ list(c("#B74F49", "#E2B8B6")), 
-            MajorCat == "Invasive species" ~ list(c("#4E6D6E", "#C9D8D9")), 
-            MajorCat == "Pollution" ~ list(c("#002D5E", "#B2C0CE")), 
-            MajorCat == "Climate and weather" ~ list(c("#835192", "#DDCCE2"))
+            MajorCat == "Habitat" ~ list(c("#4E6D6E", "#C9D8D9")),#), 
+            MajorCat == "Fishing pressure" ~ list(c("#835192", "#DDCCE2")), 
+            MajorCat == "Invasive species" ~ list(c("#B74F49", "#E2B8B6")), 
+            MajorCat == "Pollution" ~ list(c("#7A562B", "#C7985F", "#E1C8AA")), 
+            MajorCat == "Climate and weather" ~ list(c("#002D5E", "#B2C0CE"))
           ),
           # file name templates
           threat_legend_raw = "out/%s_legend_raw.png",
@@ -134,21 +134,21 @@ p2 <- list(
           threat_map = "../src/assets/images/%s_map.png",
           subThreat_legend_raw = case_when(
             MajorCat %in% "Habitat" ~ "out/H_%s_legend_raw.png",
-            MajorCat %in% "Exploitation" ~ "out/E_%s_legend_raw.png",
+            MajorCat %in% "Fishing pressure" ~ "out/FP_%s_legend_raw.png",
             MajorCat %in% "Invasive species" ~ "out/IS_%s_legend_raw.png",
             MajorCat %in% "Pollution" ~ "out/P_%s_legend_raw.png",
             MajorCat %in% "Climate and weather" ~ "out/CW_%s_legend_raw.png"
           ),
           subThreat_legend = case_when(
             MajorCat %in% "Habitat" ~ "../src/assets/images/H_%s_legend.png",
-            MajorCat %in% "Exploitation" ~ "../src/assets/images/E_%s_legend.png",
+            MajorCat %in% "Fishing pressure" ~ "../src/assets/images/FP_%s_legend.png",
             MajorCat %in% "Invasive species" ~ "../src/assets/images/IS_%s_legend.png",
             MajorCat %in% "Pollution" ~ "../src/assets/images/P_%s_legend.png",
             MajorCat %in% "Climate and weather" ~ "../src/assets/images/CW_%s_legend.png"
           ),
           subThreat_map = case_when(
             MajorCat %in% "Habitat" ~ "../src/assets/images/H_%s_map.png",
-            MajorCat %in% "Exploitation" ~ "../src/assets/images/E_%s_map.png",
+            MajorCat %in% "Fishing pressure" ~ "../src/assets/images/FP_%s_map.png",
             MajorCat %in% "Invasive species" ~ "../src/assets/images/IS_%s_map.png",
             MajorCat %in% "Pollution" ~ "../src/assets/images/P_%s_map.png",
             MajorCat %in% "Climate and weather" ~ "../src/assets/images/CW_%s_map.png"

findex/src/data_utils.R

@@ -26,7 +26,9 @@ compute_weighted_threats <- function(threat_data, threat_weights,
     #                        "No Data")) |>
     left_join(select(threat_weights, ThreatCode = Threat_Code, Threat, 
                      ThreatCategory = Threat_Category, everything())) |>
-    mutate(weightedThreatMetric = ThreatMetric * Final_Weight)
+    mutate(weightedThreatMetric = ThreatMetric * Final_Weight) |> 
+    mutate(ThreatCategory = case_when(ThreatCategory == "Exploitation" ~ "Fishing pressure", 
+                                      .default = as.character(ThreatCategory)))
 }
 
 #' @description sum weighted threat scores by threat type

public/findex_total_weighted_threats.csv

@@ -17,7 +17,7 @@ Climate and weather,Change in flooding,104.22482258816949
 Pollution,Pharmaceuticals,99.44918162735365
 Pollution,Oil or gas exploration,85.99893108069402
 Pollution,Plastics,63.147615725260046
-Exploitation,Overfishing,52.569597166942
+Fishing pressure,Overfishing,52.569597166942
 Pollution,Mining,49.24546238895636
 Climate and weather,Change in wind patterns,48.12961308126547
 Climate and weather,Change in ice cover,11.453366447637002