diff --git a/findex/_targets.R b/findex/_targets.R
index efed7eadc3190bee215b003be50435ed86f97d73..75892f897af409e9d46ef944088668bcaa312897 100644
--- a/findex/_targets.R
+++ b/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,10 +122,10 @@ 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 == "Habitat" ~ list(c("#4E6D6E", "#C9D8D9")),#),
+ MajorCat == "Fishing pressure" ~ list(c("#002D5E", "#B2C0CE")),
+ MajorCat == "Invasive species" ~ list(c("#B74F49", "#E2B8B6")),
+ MajorCat == "Pollution" ~ list(c("#7A562B", "#C7985F", "#E1C8AA")),
MajorCat == "Climate and weather" ~ list(c("#835192", "#DDCCE2"))
),
# file name templates
@@ -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"
diff --git a/findex/src/data_utils.R b/findex/src/data_utils.R
index 2f7e33cb9b36408cc23d9db3f7194ad83096fe2e..a69c509722f35955b2485832484af89f20bc25e9 100644
--- a/findex/src/data_utils.R
+++ b/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
diff --git a/src/assets/images/E_Overfishing_legend.png b/src/assets/images/E_Overfishing_legend.png
deleted file mode 100644
index 243b5dabe0f3c939681f20165e4b000838abc1dd..0000000000000000000000000000000000000000
Binary files a/src/assets/images/E_Overfishing_legend.png and /dev/null differ
diff --git a/src/assets/images/E_Overfishing_map.png b/src/assets/images/E_Overfishing_map.png
deleted file mode 100644
index b9d5a9778bf24940e8cdc477ac3b2a3e55e4b4e5..0000000000000000000000000000000000000000
Binary files a/src/assets/images/E_Overfishing_map.png and /dev/null differ
diff --git a/src/assets/images/Exploitation_legend.png b/src/assets/images/Exploitation_legend.png
deleted file mode 100644
index 243b5dabe0f3c939681f20165e4b000838abc1dd..0000000000000000000000000000000000000000
Binary files a/src/assets/images/Exploitation_legend.png and /dev/null differ
diff --git a/src/assets/images/Exploitation_map.png b/src/assets/images/Exploitation_map.png
deleted file mode 100644
index b9d5a9778bf24940e8cdc477ac3b2a3e55e4b4e5..0000000000000000000000000000000000000000
Binary files a/src/assets/images/Exploitation_map.png and /dev/null differ
diff --git a/src/assets/images/FP_Overfishing_legend.png b/src/assets/images/FP_Overfishing_legend.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33e5ef5e5ac150bca282f5e42974932f24c7f59
Binary files /dev/null and b/src/assets/images/FP_Overfishing_legend.png differ
diff --git a/src/assets/images/FP_Overfishing_map.png b/src/assets/images/FP_Overfishing_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf855b937311c95f1971186a56ac24cb86cca3d
Binary files /dev/null and b/src/assets/images/FP_Overfishing_map.png differ
diff --git a/src/assets/images/Fishing_pressure_legend.png b/src/assets/images/Fishing_pressure_legend.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33e5ef5e5ac150bca282f5e42974932f24c7f59
Binary files /dev/null and b/src/assets/images/Fishing_pressure_legend.png differ
diff --git a/src/assets/images/Fishing_pressure_map.png b/src/assets/images/Fishing_pressure_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf855b937311c95f1971186a56ac24cb86cca3d
Binary files /dev/null and b/src/assets/images/Fishing_pressure_map.png differ
diff --git a/src/assets/images/H_Agricultural_extraction_legend.png b/src/assets/images/H_Agricultural_extraction_legend.png
index c10f42350af234bce7dd91dfa23111fb0ea6a35e..1b4b7858f9af0843792a60c4429990614b109b35 100644
Binary files a/src/assets/images/H_Agricultural_extraction_legend.png and b/src/assets/images/H_Agricultural_extraction_legend.png differ
diff --git a/src/assets/images/H_Agricultural_extraction_map.png b/src/assets/images/H_Agricultural_extraction_map.png
index 6c447e085887bbcd34c70e2c916e0b019f4d7fb5..a35e1a708fd97084bd76cfbb24a6376ef5494716 100644
Binary files a/src/assets/images/H_Agricultural_extraction_map.png and b/src/assets/images/H_Agricultural_extraction_map.png differ
diff --git a/src/assets/images/H_Dams_legend.png b/src/assets/images/H_Dams_legend.png
index aa8590a529bff243242a70d8608abc93587759ef..333babaae5a7f1f15483c13968dae2ec1d169a06 100644
Binary files a/src/assets/images/H_Dams_legend.png and b/src/assets/images/H_Dams_legend.png differ
diff --git a/src/assets/images/H_Dams_map.png b/src/assets/images/H_Dams_map.png
index 8742bd398b37bfba0b98c4c5b104358469dfa244..044631722dac6afd1a7d7faf7227042f0d2a67bd 100644
Binary files a/src/assets/images/H_Dams_map.png and b/src/assets/images/H_Dams_map.png differ
diff --git a/src/assets/images/H_Deforestation_and_associated_runoff_legend.png b/src/assets/images/H_Deforestation_and_associated_runoff_legend.png
index d519b8878b5fc2a9eefd34dfc435803989adeaf7..ba9a4b8672815147d4f2472deb0ebca36b4db041 100644
Binary files a/src/assets/images/H_Deforestation_and_associated_runoff_legend.png and b/src/assets/images/H_Deforestation_and_associated_runoff_legend.png differ
diff --git a/src/assets/images/H_Deforestation_and_associated_runoff_map.png b/src/assets/images/H_Deforestation_and_associated_runoff_map.png
index 295139696f9476fd825c2744b64b72a021225c60..5ed0f19672846483635b3b470f03aa71ba536829 100644
Binary files a/src/assets/images/H_Deforestation_and_associated_runoff_map.png and b/src/assets/images/H_Deforestation_and_associated_runoff_map.png differ
diff --git a/src/assets/images/H_Industrial_extraction_legend.png b/src/assets/images/H_Industrial_extraction_legend.png
index aa99346d19b21c226026654a99810ba542a74fcf..85abdfa024cf65a83a428b8bd953c8a56f3ccbdf 100644
Binary files a/src/assets/images/H_Industrial_extraction_legend.png and b/src/assets/images/H_Industrial_extraction_legend.png differ
diff --git a/src/assets/images/H_Industrial_extraction_map.png b/src/assets/images/H_Industrial_extraction_map.png
index bd4e999df629626c7e29dea74436722166b3897d..fc95086710b5988dfa9877b13ecdb12f3d4fbe42 100644
Binary files a/src/assets/images/H_Industrial_extraction_map.png and b/src/assets/images/H_Industrial_extraction_map.png differ
diff --git a/src/assets/images/H_Riparian_degradation_legend.png b/src/assets/images/H_Riparian_degradation_legend.png
index d519b8878b5fc2a9eefd34dfc435803989adeaf7..ba9a4b8672815147d4f2472deb0ebca36b4db041 100644
Binary files a/src/assets/images/H_Riparian_degradation_legend.png and b/src/assets/images/H_Riparian_degradation_legend.png differ
diff --git a/src/assets/images/H_Riparian_degradation_map.png b/src/assets/images/H_Riparian_degradation_map.png
index ab24e29419b841f6ee137722b7c6dcc285d2ddb7..9cda0c443c2ed65c8c1b9e543c52311cf3fe8f4a 100644
Binary files a/src/assets/images/H_Riparian_degradation_map.png and b/src/assets/images/H_Riparian_degradation_map.png differ
diff --git a/src/assets/images/H_Urban_extraction_legend.png b/src/assets/images/H_Urban_extraction_legend.png
index aa99346d19b21c226026654a99810ba542a74fcf..85abdfa024cf65a83a428b8bd953c8a56f3ccbdf 100644
Binary files a/src/assets/images/H_Urban_extraction_legend.png and b/src/assets/images/H_Urban_extraction_legend.png differ
diff --git a/src/assets/images/H_Urban_extraction_map.png b/src/assets/images/H_Urban_extraction_map.png
index 8a4a36d8fe4e85707ab1ef8ee68bb13524621630..1ebda542e1e7af637b7451c60717b90e645e3593 100644
Binary files a/src/assets/images/H_Urban_extraction_map.png and b/src/assets/images/H_Urban_extraction_map.png differ
diff --git a/src/assets/images/H_Wetland_drainage_legend.png b/src/assets/images/H_Wetland_drainage_legend.png
index c04110a9e4f3ab89588c18ed293f0af6e5798b26..8f2bdb2215395bd0519d1a282f19a77a46449701 100644
Binary files a/src/assets/images/H_Wetland_drainage_legend.png and b/src/assets/images/H_Wetland_drainage_legend.png differ
diff --git a/src/assets/images/H_Wetland_drainage_map.png b/src/assets/images/H_Wetland_drainage_map.png
index 371e4ec17b645921e83232bac0d513d17f7cf585..abec81d80f1164cc367fefd5b90ac40bfbf72658 100644
Binary files a/src/assets/images/H_Wetland_drainage_map.png and b/src/assets/images/H_Wetland_drainage_map.png differ
diff --git a/src/assets/images/Habitat_legend.png b/src/assets/images/Habitat_legend.png
index 52c0174c572b6d8b39e14683eb7b6762adb72592..dd3754cd87f8d9fa51a80de0221d96a9d93a7c72 100644
Binary files a/src/assets/images/Habitat_legend.png and b/src/assets/images/Habitat_legend.png differ
diff --git a/src/assets/images/Habitat_map.png b/src/assets/images/Habitat_map.png
index a05a076bc6e42fcbe9ddaf313cd02b565020b098..d200cf1d2a7bf0a0d1296b3c63f01b633b0dcc8e 100644
Binary files a/src/assets/images/Habitat_map.png and b/src/assets/images/Habitat_map.png differ
diff --git a/src/assets/images/IS_Invasive_non-native_species_legend.png b/src/assets/images/IS_Invasive_non-native_species_legend.png
index a0b625be30df58e1d95e18e06ea111d0d1e71a7c..243b5dabe0f3c939681f20165e4b000838abc1dd 100644
Binary files a/src/assets/images/IS_Invasive_non-native_species_legend.png and b/src/assets/images/IS_Invasive_non-native_species_legend.png differ
diff --git a/src/assets/images/IS_Invasive_non-native_species_map.png b/src/assets/images/IS_Invasive_non-native_species_map.png
index 17fe12d75ccc63ab1bcc53fdb3d1399bfc3b349e..5fcc5dedca42897eb73cf48a9213cdf809d7b0d4 100644
Binary files a/src/assets/images/IS_Invasive_non-native_species_map.png and b/src/assets/images/IS_Invasive_non-native_species_map.png differ
diff --git a/src/assets/images/Invasive_species_legend.png b/src/assets/images/Invasive_species_legend.png
index a0b625be30df58e1d95e18e06ea111d0d1e71a7c..243b5dabe0f3c939681f20165e4b000838abc1dd 100644
Binary files a/src/assets/images/Invasive_species_legend.png and b/src/assets/images/Invasive_species_legend.png differ
diff --git a/src/assets/images/Invasive_species_map.png b/src/assets/images/Invasive_species_map.png
index 17fe12d75ccc63ab1bcc53fdb3d1399bfc3b349e..5fcc5dedca42897eb73cf48a9213cdf809d7b0d4 100644
Binary files a/src/assets/images/Invasive_species_map.png and b/src/assets/images/Invasive_species_map.png differ
diff --git a/src/assets/images/P_Agricultural_effluents_legend.png b/src/assets/images/P_Agricultural_effluents_legend.png
index 4ca426cd51cfe3c8a4690175afa61102ed0ac559..095f0c96fb71aeb1373f208a52a5ea25440a7e08 100644
Binary files a/src/assets/images/P_Agricultural_effluents_legend.png and b/src/assets/images/P_Agricultural_effluents_legend.png differ
diff --git a/src/assets/images/P_Agricultural_effluents_map.png b/src/assets/images/P_Agricultural_effluents_map.png
index 5fe9040faa7ad681a8bdc02ab699c6d8817b98cc..2b5537c9a6f63e31294baefc5659f5f90f1b730b 100644
Binary files a/src/assets/images/P_Agricultural_effluents_map.png and b/src/assets/images/P_Agricultural_effluents_map.png differ
diff --git a/src/assets/images/P_Aquaculture_effluents_legend.png b/src/assets/images/P_Aquaculture_effluents_legend.png
index 7740fdb05e1695ddbf3764921ae32f3edab54bb7..44fb9782402f45ebb1468534c544a650e90f8e11 100644
Binary files a/src/assets/images/P_Aquaculture_effluents_legend.png and b/src/assets/images/P_Aquaculture_effluents_legend.png differ
diff --git a/src/assets/images/P_Aquaculture_effluents_map.png b/src/assets/images/P_Aquaculture_effluents_map.png
index 2570e36de88cb6a568718bf51e0df51477f1928a..374003e407225799f9f2e64af955c8fc000692b4 100644
Binary files a/src/assets/images/P_Aquaculture_effluents_map.png and b/src/assets/images/P_Aquaculture_effluents_map.png differ
diff --git a/src/assets/images/P_Industrial_effluents_legend.png b/src/assets/images/P_Industrial_effluents_legend.png
index 3de73e4006c5697e0494552886675840bc05ce8f..aa99346d19b21c226026654a99810ba542a74fcf 100644
Binary files a/src/assets/images/P_Industrial_effluents_legend.png and b/src/assets/images/P_Industrial_effluents_legend.png differ
diff --git a/src/assets/images/P_Industrial_effluents_map.png b/src/assets/images/P_Industrial_effluents_map.png
index f0e9ca7e097b774c5fde4bcb7e54d5c699087ee4..e0cc805801cadfdaf5277627fded96454015a158 100644
Binary files a/src/assets/images/P_Industrial_effluents_map.png and b/src/assets/images/P_Industrial_effluents_map.png differ
diff --git a/src/assets/images/P_Mining_legend.png b/src/assets/images/P_Mining_legend.png
index 300225c724115c6eb8932592c401e63e219096f0..fc217658398cfe03a52b684ae43b4c4ff49a191a 100644
Binary files a/src/assets/images/P_Mining_legend.png and b/src/assets/images/P_Mining_legend.png differ
diff --git a/src/assets/images/P_Mining_map.png b/src/assets/images/P_Mining_map.png
index 390628628605acfdbf65a2ffd66c402877f53e03..f969cc96cdccf20b6089773c5eeeb178a73ac2e0 100644
Binary files a/src/assets/images/P_Mining_map.png and b/src/assets/images/P_Mining_map.png differ
diff --git a/src/assets/images/P_Oil_or_gas_exploration_legend.png b/src/assets/images/P_Oil_or_gas_exploration_legend.png
index f007c6637270df6f3109f61b7e9a73727f8d90c7..ddef580aa6c6e4f66412687313af0442aaed6114 100644
Binary files a/src/assets/images/P_Oil_or_gas_exploration_legend.png and b/src/assets/images/P_Oil_or_gas_exploration_legend.png differ
diff --git a/src/assets/images/P_Oil_or_gas_exploration_map.png b/src/assets/images/P_Oil_or_gas_exploration_map.png
index 52f745c65a4863e18824b30de3219ee1baec8575..80d677f3fd097be20912ffcb4a0783aa62178a1f 100644
Binary files a/src/assets/images/P_Oil_or_gas_exploration_map.png and b/src/assets/images/P_Oil_or_gas_exploration_map.png differ
diff --git a/src/assets/images/P_Pharmaceuticals_legend.png b/src/assets/images/P_Pharmaceuticals_legend.png
index 545f7c169d83b75fe862b088ae50b4df9e3b90e4..65ca75d4893993bf740ed7d767d972d040325ea9 100644
Binary files a/src/assets/images/P_Pharmaceuticals_legend.png and b/src/assets/images/P_Pharmaceuticals_legend.png differ
diff --git a/src/assets/images/P_Pharmaceuticals_map.png b/src/assets/images/P_Pharmaceuticals_map.png
index 724e93623c8aa18d0037e4680871a6cb256a97fd..fd77aa0454ec0533a1a95265f689e0b854c85e7f 100644
Binary files a/src/assets/images/P_Pharmaceuticals_map.png and b/src/assets/images/P_Pharmaceuticals_map.png differ
diff --git a/src/assets/images/P_Plastics_legend.png b/src/assets/images/P_Plastics_legend.png
index 545f7c169d83b75fe862b088ae50b4df9e3b90e4..65ca75d4893993bf740ed7d767d972d040325ea9 100644
Binary files a/src/assets/images/P_Plastics_legend.png and b/src/assets/images/P_Plastics_legend.png differ
diff --git a/src/assets/images/P_Plastics_map.png b/src/assets/images/P_Plastics_map.png
index 4e5f8215d9e9980d02065e6a75630d68055ea9fd..2cd42f8bec2483833ff6de70d08ad1ee9113c7dc 100644
Binary files a/src/assets/images/P_Plastics_map.png and b/src/assets/images/P_Plastics_map.png differ
diff --git a/src/assets/images/P_Urban_wastewater_legend.png b/src/assets/images/P_Urban_wastewater_legend.png
index 3de73e4006c5697e0494552886675840bc05ce8f..aa99346d19b21c226026654a99810ba542a74fcf 100644
Binary files a/src/assets/images/P_Urban_wastewater_legend.png and b/src/assets/images/P_Urban_wastewater_legend.png differ
diff --git a/src/assets/images/P_Urban_wastewater_map.png b/src/assets/images/P_Urban_wastewater_map.png
index ec882736d639874911388a71e1b6a644b32dc3f6..bae04a2c313c57d98adb1959735630780590225a 100644
Binary files a/src/assets/images/P_Urban_wastewater_map.png and b/src/assets/images/P_Urban_wastewater_map.png differ
diff --git a/src/assets/images/Pollution_legend.png b/src/assets/images/Pollution_legend.png
index 0f9da582d30541dacf61025d4b5f1f2b61546414..3ad8c414d55cf2a16e178d84dbdef2ca25be08d7 100644
Binary files a/src/assets/images/Pollution_legend.png and b/src/assets/images/Pollution_legend.png differ
diff --git a/src/assets/images/Pollution_map.png b/src/assets/images/Pollution_map.png
index b03eec34741ada3d14714ac451365ba29317cf0a..43f18c47a590d446b405908c80f9a4150bc6af1d 100644
Binary files a/src/assets/images/Pollution_map.png and b/src/assets/images/Pollution_map.png differ