From 348763c0d9deedc9399709addc7c4863f5fcf3b2 Mon Sep 17 00:00:00 2001
From: Lambert Patrick <patrick.mh.lambert@inrae.fr>
Date: Thu, 27 Apr 2023 10:00:54 +0200
Subject: [PATCH] feat: new palette and updattin popup for catcment

---
 R/mod_a_first_fct_map.R             | 9 +++++----
 data-raw/bb-page1-catch-bycatch.Rmd | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/R/mod_a_first_fct_map.R b/R/mod_a_first_fct_map.R
index 01021f2..09ff960 100644
--- a/R/mod_a_first_fct_map.R
+++ b/R/mod_a_first_fct_map.R
@@ -35,7 +35,7 @@ tm_ocean <- function(dataOcean,
     tm_polygons(
       "prevalence",
       title = paste0(title, "\n(", yearStart, "-", yearEnd, ")"),
-      palette = "Blues",
+      palette = c("#F7FBFF", "#C6DBEF", "#9ECAE1", "#4292C6", "#08519C", "#08306B"),
       n = 6,
       labels = c(
         "Not recorded in the period" %>% with_i18("absent") %>% as.character(),
@@ -45,7 +45,7 @@ tm_ocean <- function(dataOcean,
         "[10, 12]",
         "[13, 15]"
       ),
-      popup.vars = c("prevalence" = "nb_occurence")
+      popup.vars = c("prevalence: " = "nb_occurence")
     )
 }
 
@@ -72,7 +72,7 @@ tm_catchmment <- function(dataContinent) {
       "abundance_interpretation",
       title = "Status in river catchments (1951-2010)" %>% with_i18("status_in_river_catchments") %>% as.character(),
       # "<span data-i18n='status_in_river_catchments'>Status in river catchments (1951-2010)</span>",
-      palette = "Reds",
+      palette = c("#FEE0D2", "#FCBBA1", "#A50F15", "#67000D"),
       n = 4,
       textNA = "Missing" %>% with_i18("missing") %>% as.character(),
       labels = c(
@@ -80,7 +80,8 @@ tm_catchmment <- function(dataContinent) {
         "Occasional vagrants" %>% with_i18("rare") %>% as.character(),
         "Functional populations" %>% with_i18("common") %>% as.character(),
         "Abundant functional populations" %>% with_i18("abundant") %>% as.character()
-      )
+      ),
+      popup.vars = c("population status: " = "abundance_interpretation")
     )
 }
 
diff --git a/data-raw/bb-page1-catch-bycatch.Rmd b/data-raw/bb-page1-catch-bycatch.Rmd
index 9082fec..727e8ed 100644
--- a/data-raw/bb-page1-catch-bycatch.Rmd
+++ b/data-raw/bb-page1-catch-bycatch.Rmd
@@ -108,7 +108,7 @@ tm_draw(
 
 tm1 <- tm_draw(
   species_latin_name = "Chelon ramada",
-  spatial_type = "division",
+  spatial_type = "rectangle",
   con = con,
   dataCatchment = datasets$dataCatchment,
   catchment_geom = datasets$catchment_geom,