L'application dispose aujourd'hui d'un module d'exploration des données permettant de visualiser les différentes métriques mises à disposition pour l'analyse de bassin versant.
"), HTML(" -Contact : Louis Manière (CNRS UMR 5600, Environnement Ville Société) - louis.maniere@ens-lyon.fr
+Contact : Lise Vaudor (CNRS UMR 5600, Environnement Ville Société) - lise.vaudor@ens-lyon.fr
"), tags$a( href = "https://evs-gis.github.io/mapdowebsite/", diff --git a/R/mod_explore.R b/R/mod_explore.R index 31741e0..057b8a9 100644 --- a/R/mod_explore.R +++ b/R/mod_explore.R @@ -306,12 +306,12 @@ mod_explore_server <- function(id){ # ROE if (any(input$exploremap_groups %in% params_map_group()[["roe"]])) { map_legend_vector_overlayer(layer_label = "Référentiel des Obstacles à l'Ecoulement", - color = "orange") + color = "#323232") }, # Station hydrométrique if (any(input$exploremap_groups %in% params_map_group()[["hydro_station"]])) { map_legend_vector_overlayer(layer_label = "Station hydrométrique", - color = "blue") + color = "#33B1FF") }, style = "margin-bottom: 10px;" ) # div @@ -409,7 +409,8 @@ mod_explore_server <- function(id){ # map dgo axis when axis clicked and metric selected leafletProxy("exploremap") %>% - map_dgo_axis(selected_axis = r_val$dgo_axis, region_axis = r_val$network_region_axis) %>% + map_dgo_axis(selected_axis = r_val$dgo_axis, region_axis = r_val$network_region_axis, + main_metric = r_val$selected_metric, second_metric = r_val$selected_profile_metric) %>% map_axis_start_end(axis_start_end = r_val$axis_start_end, region_axis = r_val$network_region_axis) # create or update profile dataset with new axis @@ -508,6 +509,7 @@ mod_explore_server <- function(id){ # update profile with new metric selected if (r_val$profile_display == TRUE){ + proxy_main_axe <- lg_profile_update_main( data = r_val$selected_axis_df, @@ -537,6 +539,11 @@ mod_explore_server <- function(id){ choices = utile_get_metric_type(params_metrics_choice()), selected = utile_get_metric_type(params_metrics_choice())[1]) + # update dgo on axis to reset tooltip + leafletProxy("exploremap") %>% + map_dgo_axis(selected_axis = r_val$dgo_axis, region_axis = r_val$network_region_axis, + main_metric = r_val$selected_metric, second_metric = r_val$selected_profile_metric) + # plot single axe with metric selected r_val$plot = lg_profile_main(data = r_val$selected_axis_df, y = r_val$selected_axis_df[[r_val$selected_metric]], @@ -596,6 +603,11 @@ mod_explore_server <- function(id){ r_val$selected_profile_metric_name = params_metrics_choice()[[input$profile_metric_type]]$metric_type_values[[input$profile_metric]]$metric_title r_val$selected_profile_metric_type = params_metrics_choice()[[input$profile_metric_type]]$metric_type_title + # update map to change tooltip labels + leafletProxy("exploremap") %>% + map_dgo_axis(selected_axis = r_val$dgo_axis, region_axis = r_val$network_region_axis, + main_metric = r_val$selected_metric, second_metric = r_val$selected_profile_metric) + # create the list to add trace and layout to change second axe plot proxy_second_axe <- lg_profile_second(data = r_val$selected_axis_df, y = r_val$selected_axis_df[[r_val$selected_profile_metric]], @@ -617,6 +629,12 @@ mod_explore_server <- function(id){ updateRadioButtons(session, "profile_metric", selected = character(0)) + r_val$selected_profile_metric = NULL + # update dgo on axis to reset tooltip + leafletProxy("exploremap") %>% + map_dgo_axis(selected_axis = r_val$dgo_axis, region_axis = r_val$network_region_axis, + main_metric = r_val$selected_metric, second_metric = r_val$selected_profile_metric) + }) ### EVENT FILTER #### diff --git a/man/map_dgo_axis.Rd b/man/map_dgo_axis.Rd index c247dcf..3638951 100644 --- a/man/map_dgo_axis.Rd +++ b/man/map_dgo_axis.Rd @@ -4,7 +4,7 @@ \alias{map_dgo_axis} \title{Add DGO axis to a Leaflet map} \usage{ -map_dgo_axis(map, selected_axis, region_axis) +map_dgo_axis(map, selected_axis, region_axis, main_metric, second_metric) } \arguments{ \item{map}{A Leaflet map object.} @@ -12,6 +12,10 @@ map_dgo_axis(map, selected_axis, region_axis) \item{selected_axis}{A data frame containing selected axe to be displayed.} \item{region_axis}{A data frame containing region-specific axes to be displayed.} + +\item{main_metric}{text with the main selected metric name.} + +\item{second_metric}{text with the second axis selected metric name.} } \value{ A modified Leaflet map object with DGO axes added. @@ -33,7 +37,8 @@ selected_axes <- network_axis \%>\% filter(axis == 5) region_axes <- network_axis # Add DGO axes to the map -my_map <- map_dgo_axis(my_map, selected_axes, region_axes) +my_map <- map_dgo_axis(my_map, selected_axes, region_axes, + main_metric = "active_channel_width", second_metric = "talweg_slope") my_map } diff --git a/man/map_legend_vector_overlayer.Rd b/man/map_legend_vector_overlayer.Rd index 9061790..03565c6 100644 --- a/man/map_legend_vector_overlayer.Rd +++ b/man/map_legend_vector_overlayer.Rd @@ -8,6 +8,8 @@ map_legend_vector_overlayer(layer_label, color) } \arguments{ \item{layer_label}{A character string representing the label or name of the vector overlay layer.} + +\item{color}{text the legend marker color.} } \value{ An HTML div element representing the legend entry for the vector overlay layer. @@ -17,7 +19,7 @@ This function generates an HTML representation of a legend entry for a vector ov } \examples{ # Create a legend entry for a vector overlay layer -legend_entry <- map_legend_vector_overlayer(layer_label = "ROE") +legend_entry <- map_legend_vector_overlayer(layer_label = "ROE", color = "blue") print(legend_entry) }