feat: new popup in at sea

issue #153
inrae · May 4, 2023 · c390588 · c390588
1 parent 6ddf3bf
commit c390588
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/R/mod_a_first_fct_map.R b/R/mod_a_first_fct_map.R
@@ -8,6 +8,7 @@ data_ocean <- function(ices_geom,
     filter(ices_type == spatial_type) %>%
     inner_join(
       dataALL %>%
+        select(-c(icesname, division_name)) %>%
         filter(latin_name == species_latin_name),
       by = c("ices_type", "gid")
     ) %>%
@@ -45,7 +46,7 @@ tm_ocean <- function(dataOcean,
         "[10, 12]",
         "[13, 15]"
       ),
-      popup.vars = c("prevalence: " = "nb_occurence")
+      popup.vars = c('in division:' = 'division_name', 'prevalence:' = 'nb_occurence')
     )
 }
 

diff --git a/data-raw/bb-page1-catch-bycatch.Rmd b/data-raw/bb-page1-catch-bycatch.Rmd
@@ -53,7 +53,7 @@ for (i in species$species_id) {
   cli::cat_rule(i)
   print(
     get_conservation_status(
-      6,
+      i,
       con
     )
   )
@@ -84,17 +84,6 @@ tm_draw(
   session = session
 )
 
-tm_draw(
-  species_latin_name = "Salmo trutta",
-  spatial_type = "division",
-  con = con,
-  dataCatchment = datasets$dataCatchment,
-  catchment_geom = datasets$catchment_geom,
-  dataALL = datasets$dataALL,
-  ices_geom = datasets$ices_geom,
-  session = session
-)
-
 tm_draw(
   species_latin_name = "Chelon ramada",
   spatial_type = "rectangle",