feat : Aquamaps and postive catch are not visible by default

Issue #158
inrae · May 10, 2023 · a84e173 · a84e173
1 parent 6381e59
commit a84e173
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/R/mod_a_first.R b/R/mod_a_first.R
@@ -45,7 +45,7 @@ mod_first_ui <- function(id) {
             )
           )
         ),
-        tmap::tmapOutput(ns("raster"), width = "90%", height = "750px")
+        leaflet::leafletOutput(ns("raster"), width = "90%", height = "750px")
       ),
       w3css::w3_col(
         class = "s2",
@@ -89,7 +89,7 @@ mod_first_server <- function(id, r = r) {
       r = loco
     )
 
-    output$raster <- tmap::renderTmap({
+    output$raster <- leaflet::renderLeaflet({
       req(loco$species)
 
       tm_draw(

diff --git a/R/mod_a_first_fct_map.R b/R/mod_a_first_fct_map.R
@@ -63,7 +63,7 @@ tm_ices_rectangle <- function(ices_geom) {
 #' @noRd
 tm_ices_division <- function(ices_division) {
   tm_shape(ices_division, bbox = bbox) +
-    tm_borders(col = 'grey10', lwd = 1)
+    tm_borders(col = 'grey10', lwd = 1.2)
 }
 
 #' @importFrom tmap tm_shape tm_polygons
@@ -226,7 +226,7 @@ tm_draw <- function(species_latin_name,
   )(dataContinent)
 
   # ------------------------------------------ display the map
-  tm_graticules() +
+  tm_all <- tm_graticules() +
     tm_ices_rectangle +
     tm_ices_division +
     tm_positive_catch +
@@ -240,5 +240,10 @@ tm_draw <- function(species_latin_name,
       main.title = species_latin_name, # suppress at the end
       # legend.position = c("right", "center"),
       legend.outside = TRUE
-    )
+    ) 
+
+   tm_all %>% 
+      tmap_leaflet()%>%
+      leaflet::hideGroup("AquaMaps") %>%
+      leaflet::hideGroup("positive catch of at least one species")
 }