Johanna modifs

R/app_ui.R

@@ -26,6 +26,13 @@ app_ui <- function(request){
           z-index: 1000; /* Make sure it's above other UI elements */
         }
 
+      /* quand l'icône est focus ou actif (sélectionné) */
+      .bi-info-circle {
+        border: 2px solid white !important;
+        border-radius: 50%;
+        outline: none !important;
+      }
+
       .navbar {
         position: relative;
       }
@@ -44,6 +51,22 @@ app_ui <- function(request){
       title =
         img(src = "www/logos_mapdo_evs_ofb.png"),
       windowTitle = "Mapd'O App",
+      header = tagList(
+        tags$head(
+          tags$style(HTML("
+        /* texte des onglets */
+        .navbar-nav > li > a {
+          font-size: 24px;       /* augmenter taille */
+          font-weight: bold;     /* mettre en gras */
+          color: #000000 !important; /* couleur texte */
+        }
+
+        /* barre du haut */
+        .navbar {
+          background-color: #DEEDFF; /* gris clair */
+        }
+      "))
+        )),
       tabPanel("Exploration & Classification", icon = icon("compass"), # find more icons here: https://fontawesome.com/search?q=info&o=r&m=free
                mod_explore_ui("explore_1")
       ),

R/fct_analysis_plots.R

@@ -293,7 +293,8 @@ analysis_plot_classes_distr <- function(df){
       yaxis = list(title = "Pourcentage", showgrid = T, showticklabels = T),
       showlegend = TRUE
       # margin = list(b = 70, autoexpand = FALSE)
-    )
+    )%>%
+    plotly::config(displaylogo = FALSE) # Remove plotly logo
 
   return(plot)
 }
@@ -389,7 +390,8 @@ create_analysis_biplot <- function(df, metric_x, metric_y, classes = FALSE, lm =
                                     metric_x_title, get(metric_x),
                                     metric_y_title, get(metric_y),
                                     measure / 1000), # Convert measure to kilometers
-                    hoverinfo = 'text')
+                    hoverinfo = 'text')%>%
+      plotly::config(displaylogo = FALSE) # Remove plotly logo
   }
 
 
@@ -415,7 +417,8 @@ create_analysis_biplot <- function(df, metric_x, metric_y, classes = FALSE, lm =
         xref = 'paper', yref = 'paper', # Use 'paper' units (relative to the plot)
         bgcolor = "#ffccd5", bordercolor = "#000", borderwidth = 1,
         font = list(size = 11)
-      ))
+      ))%>%
+      plotly::config(displaylogo = FALSE) # Remove plotly logo
   }
 
 

R/fct_analysis_tables.R

@@ -57,6 +57,7 @@ prepare_selact_stats_for_table <- function(data,
                        .names = "{.col}_{.fn}")) %>%
       mutate(scale = "Axe",
              strahler = max(axis_data$strahler))  # Add the scale and strahler column
+    #browser()
   }
 
   # default and only France-scale stats
@@ -101,6 +102,7 @@ prepare_selact_stats_for_table <- function(data,
       .default = scale
     )) %>%
     select(-scale)
+  #browser() #Go through here 3rd
 }
 
 #' Prepare metrics-statistics dataframe for reactable table for regions
@@ -120,7 +122,7 @@ prepare_regions_stats_for_table <- function(data, region_names = NULL) {
              # if_else(strahler != 0,
              #              paste0(r_names[level_name], ", Ordre ", strahler),
              #              r_names[level_name]))
-
+  #browser() #Go through here 1st
   return(df)
 }
 
@@ -187,17 +189,16 @@ create_analysis_table <- function(df, vars, scale_name = "") {
     )
   }
 
-  # Create the reactable
   table <- reactable(
     data = df,
     columns = columns_list,
-    height = 420,
+    height = "auto",
     defaultPageSize = 9,
     highlight = TRUE,  # highlight rows on hover
     compact = TRUE,
     pagination = FALSE,
     striped = TRUE
   )
-
+  #browser() ##Go through here 2nd
   return(table)
 }

R/fct_data.R

@@ -319,28 +319,28 @@ data_get_distr_class <- function(con, class_name) {
       class_name == "class_urban" ~
         "CASE
           WHEN built_environment_pc IS NULL THEN 'unvalid'
-          WHEN built_environment_pc >= 70 THEN 'fortement urbanisé'
-          WHEN built_environment_pc >= 40 THEN 'urbanisé'
-          WHEN built_environment_pc >= 10 THEN 'modérément urbanisé'
-          WHEN built_environment_pc >= 0 THEN 'Presque pas/pas urbanisé'
+          WHEN built_environment_pc >= 70 THEN 'Fortement urbanisé'
+          WHEN built_environment_pc >= 40 THEN 'Urbanisé'
+          WHEN built_environment_pc >= 10 THEN 'Modérément urbanisé'
+          WHEN built_environment_pc >= 0 THEN 'Presque pas/Pas urbanisé'
           ELSE 'unvalid'
         END AS class_name",
       class_name == "class_agriculture" ~
         "CASE
           WHEN crops_pc IS NULL THEN 'unvalid'
-          WHEN crops_pc >= 70 THEN 'Forte impact agricole'
-          WHEN crops_pc >= 40 THEN 'Impact agricole élevé'
-          WHEN crops_pc >= 10 THEN 'Impact agricole modéré'
-          WHEN crops_pc >= 0 THEN 'Presque pas/pas d''impact agricole'
+          WHEN crops_pc >= 70 THEN 'Très Forte'
+          WHEN crops_pc >= 40 THEN 'Forte'
+          WHEN crops_pc >= 10 THEN 'Modéré'
+          WHEN crops_pc >= 0 THEN 'Basse/Absente'
           ELSE 'unvalid'
         END AS class_name",
       class_name == "class_nature" ~
         "CASE
           WHEN natural_open_pc IS NULL OR forest_pc IS NULL OR grassland_pc IS NULL THEN 'unvalid'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Utilisation naturelle modérée'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/pas naturelle'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Modérée'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/Pas naturelle'
           ELSE 'unvalid'
         END AS class_name",
       class_name == "class_gravel" ~
@@ -354,19 +354,19 @@ data_get_distr_class <- function(con, class_name) {
       class_name == "class_confinement" ~
         "CASE
           WHEN idx_confinement IS NULL THEN 'unvalid'
-          WHEN idx_confinement >= 0.7 THEN 'espace abondant'
-          WHEN idx_confinement >= 0.4 THEN 'modérement espace'
-          WHEN idx_confinement >= 0.1 THEN 'confiné'
-          WHEN idx_confinement >= 0 THEN 'très confiné'
+          WHEN idx_confinement >= 0.7 THEN 'Peu confiné'
+          WHEN idx_confinement >= 0.4 THEN 'Modérement confiné'
+          WHEN idx_confinement >= 0.1 THEN 'Confiné'
+          WHEN idx_confinement >= 0 THEN 'Très confiné'
           ELSE 'unvalid'
         END AS class_name",
       class_name == "class_habitat" ~
         "CASE
           WHEN riparian_corridor_pc IS NULL OR semi_natural_pc IS NULL THEN 'unvalid'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'très bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'moyen connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'faible / absente'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'Élevée'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'Bonne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'Moyenne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'Faible/Absente'
           ELSE 'unvalid'
         END AS class_name",
       .default = NULL
@@ -772,59 +772,59 @@ data_get_axis_dgos <- function(selected_axis_id, con) {
         -- Urban Land Use Classification
         CASE
           WHEN built_environment_pc IS NULL THEN 'unvalid'
-          WHEN built_environment_pc >= 70 THEN 'fortement urbanisé'
-          WHEN built_environment_pc >= 40 THEN 'urbanisé'
-          WHEN built_environment_pc >= 10 THEN 'modérément urbanisé'
-          WHEN built_environment_pc >= 0 THEN 'Presque pas/pas urbanisé'
+          WHEN built_environment_pc >= 70 THEN 'Fortement urbanisé'
+          WHEN built_environment_pc >= 40 THEN 'Urbanisé'
+          WHEN built_environment_pc >= 10 THEN 'Modérément urbanisé'
+          WHEN built_environment_pc >= 0 THEN 'Presque pas/Pas urbanisé'
           ELSE 'unvalid'
         END AS class_urban,
 
         -- Agricultural Land Use Classification
         CASE
           WHEN crops_pc IS NULL THEN 'unvalid'
-          WHEN crops_pc >= 70 THEN 'Forte impact agricole'
-          WHEN crops_pc >= 40 THEN 'Impact agricole élevé'
-          WHEN crops_pc >= 10 THEN 'Impact agricole modéré'
-          WHEN crops_pc >= 0 THEN 'Presque pas/pas d''impact agricole'
+          WHEN crops_pc >= 70 THEN 'Très Forte'
+          WHEN crops_pc >= 40 THEN 'Forte'
+          WHEN crops_pc >= 10 THEN 'Modéré'
+          WHEN crops_pc >= 0 THEN 'Basse/Absente'
           ELSE 'unvalid'
         END AS class_agriculture,
 
         -- Natural Land Use Classification
         CASE
           WHEN natural_open_pc IS NULL OR forest_pc IS NULL OR grassland_pc IS NULL THEN 'unvalid'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Utilisation naturelle modérée'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/pas naturelle'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Modérée'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/Pas naturelle'
           ELSE 'unvalid'
         END AS class_nature,
 
         -- Gravel Bars Classification
         CASE
           WHEN gravel_bars IS NULL OR water_channel IS NULL THEN 'unvalid'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) >= 0.5 THEN 'abundant'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) > 0 THEN 'moyennement présente'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) = 0 THEN 'absent'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) >= 0.5 THEN 'Fréquent'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) > 0 THEN 'Occasionnel'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) = 0 THEN 'Absent'
           ELSE 'unvalid'
         END AS class_gravel,
 
         -- Confinement Classification
         CASE
           WHEN idx_confinement IS NULL THEN 'unvalid'
-          WHEN idx_confinement >= 0.7 THEN 'espace abondant'
-          WHEN idx_confinement >= 0.4 THEN 'modérement espace'
-          WHEN idx_confinement >= 0.1 THEN 'confiné'
-          WHEN idx_confinement >= 0 THEN 'très confiné'
+          WHEN idx_confinement >= 0.7 THEN 'Peu confiné'
+          WHEN idx_confinement >= 0.4 THEN 'Modérément confiné'
+          WHEN idx_confinement >= 0.1 THEN 'Confiné'
+          WHEN idx_confinement >= 0 THEN 'Très confiné'
           ELSE 'unvalid'
         END AS class_confinement,
 
         -- Habitat Classification
         CASE
           WHEN riparian_corridor_pc IS NULL OR semi_natural_pc IS NULL THEN 'unvalid'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'très bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'moyen connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'faible / absente'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'Élevée'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'Bonne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'Moyenne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'Faible/Absente'
           ELSE 'unvalid'
         END AS class_habitat
       FROM network_metrics
@@ -916,59 +916,59 @@ data_get_axis_dgos_from_region <- function(selected_region_id, con) {
         -- Urban Land Use Classification
         CASE
           WHEN built_environment_pc IS NULL THEN 'unvalid'
-          WHEN built_environment_pc >= 70 THEN 'fortement urbanisé'
-          WHEN built_environment_pc >= 40 THEN 'urbanisé'
-          WHEN built_environment_pc >= 10 THEN 'modérément urbanisé'
-          WHEN built_environment_pc >= 0 THEN 'Presque pas/pas urbanisé'
+          WHEN built_environment_pc >= 70 THEN 'Fortement urbanisé'
+          WHEN built_environment_pc >= 40 THEN 'Urbanisé'
+          WHEN built_environment_pc >= 10 THEN 'Modérément urbanisé'
+          WHEN built_environment_pc >= 0 THEN 'Presque pas/Pas urbanisé'
           ELSE 'unvalid'
         END AS class_urban,
 
         -- Agricultural Land Use Classification
         CASE
           WHEN crops_pc IS NULL THEN 'unvalid'
-          WHEN crops_pc >= 70 THEN 'Forte impact agricole'
-          WHEN crops_pc >= 40 THEN 'Impact agricole élevé'
-          WHEN crops_pc >= 10 THEN 'Impact agricole modéré'
-          WHEN crops_pc >= 0 THEN 'Presque pas/pas d''impact agricole'
+          WHEN crops_pc >= 70 THEN 'Très Forte'
+          WHEN crops_pc >= 40 THEN 'Forte'
+          WHEN crops_pc >= 10 THEN 'Modéré'
+          WHEN crops_pc >= 0 THEN 'Basse/Absente'
           ELSE 'unvalid'
         END AS class_agriculture,
 
         -- Natural Land Use Classification
         CASE
           WHEN natural_open_pc IS NULL OR forest_pc IS NULL OR grassland_pc IS NULL THEN 'unvalid'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte utilisation naturelle'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Utilisation naturelle modérée'
-          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/pas naturelle'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 70 THEN 'Très forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 40 THEN 'Forte'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 10 THEN 'Modérée'
+          WHEN (natural_open_pc + forest_pc + grassland_pc) >= 0 THEN 'Presque pas/Pas naturelle'
           ELSE 'unvalid'
         END AS class_nature,
 
         -- Gravel Bars Classification
         CASE
           WHEN gravel_bars IS NULL OR water_channel IS NULL THEN 'unvalid'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) >= 0.5 THEN 'abundant'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) > 0 THEN 'moyennement présente'
-          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) = 0 THEN 'absent'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) >= 0.5 THEN 'Fréquent'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) > 0 THEN 'Occasionnel'
+          WHEN (gravel_bars / NULLIF(water_channel + gravel_bars, 0)) = 0 THEN 'Absent'
           ELSE 'unvalid'
         END AS class_gravel,
 
         -- Confinement Classification
         CASE
           WHEN idx_confinement IS NULL THEN 'unvalid'
-          WHEN idx_confinement >= 0.7 THEN 'espace abondant'
-          WHEN idx_confinement >= 0.4 THEN 'modérement espace'
-          WHEN idx_confinement >= 0.1 THEN 'confiné'
-          WHEN idx_confinement >= 0 THEN 'très confiné'
+          WHEN idx_confinement >= 0.7 THEN 'Peu confiné'
+          WHEN idx_confinement >= 0.4 THEN 'Modérément confiné'
+          WHEN idx_confinement >= 0.1 THEN 'Confiné'
+          WHEN idx_confinement >= 0 THEN 'Très confiné'
           ELSE 'unvalid'
         END AS class_confinement,
 
         -- Habitat Classification
         CASE
           WHEN riparian_corridor_pc IS NULL OR semi_natural_pc IS NULL THEN 'unvalid'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'très bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'bien connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'moyen connecté'
-          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'faible / absente'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 70 THEN 'Élevée'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 40 THEN 'Bonne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 10 THEN 'Moyenne'
+          WHEN (riparian_corridor_pc + semi_natural_pc) >= 0 THEN 'Faible/Absente'
           ELSE 'unvalid'
         END AS class_habitat
       FROM network_metrics

R/fct_map.R

@@ -521,11 +521,11 @@ map_add_axes <- function(map, data_axis, group, selected_axis_id = NULL) {
 #'
 #' @return An updated Leaflet map with axis data added.
 #' @export
-map_add_axis_dgos <- function(map, axis_data, group) {
-
+map_add_axis_dgos <- function(map, axis_data, Proposed_class, group) {
   # create HTML conditional tooltip labels
   tooltip_label <- lapply(paste0('<span style="color:#212529;"> <b>', axis_data$toponyme, '</b> </span> <br/>',
-                                 '<span style="color:#495057;"> <b>', round(axis_data$measure/1000, 2), ' km depuis l\'exutoire', '</b> </span>'),
+                                 '<span style="color:#495057;"> <b>', round(axis_data$measure/1000, 2), ' km depuis l\'exutoire', '</b> </span> <br/>',
+                                 '<span style="color:#495057;"> Classe : <b>', axis_data[[Proposed_class]], '</b> </span>'),
                           htmltools::HTML)
 
   map %>%