@@ -49,6 +49,7 @@ render_season_ui <- function(season_name) {
4949 ),
5050 tabPanel(' Map' ,
5151 div(class = ' map-container push-out' ,
52+ p(class = ' map-message' , ' Showing data from latest recorded observation date' ),
5253 leafletOutput(paste0(' site_map_' , season_name ), width = ' 750px' , height = ' 1000px' )
5354 )
5455 )
@@ -93,21 +94,25 @@ render_trait_plot <- function(season_name, input, output, full_cache_data) {
9394 plot_data <- selected_season_data [[ ' trait_data' ]][[ selected_variable ]][[ ' traits' ]]
9495 data_max <- max(plot_data [[ ' mean' ]])
9596
97+ title <- selected_variable
9698 units <- selected_season_data [[ ' trait_data' ]][[ selected_variable ]][[ ' units' ]]
99+ if (units != ' ' )
100+ title <- paste0(selected_variable , ' (' , units , ' )' )
97101
98102 # generate timeseries of boxplots from mean value
99103 ggplot(plot_data , aes(as.Date(date ), mean )) +
100104 geom_boxplot(aes(group = cut_width(as.Date(date ), 1 )), outlier.alpha = 0.1 ) +
101105
102106 {
103107 if (selected_cultivar != ' None' ) {
104- geom_point(data = subset(plot_data , cultivar_name == selected_cultivar ),
105- size = 1 , color = " red" , aes(x = as.Date(date ), y = mean ))
108+ title <- paste0(title , ' for ' , selected_cultivar )
109+ geom_line(data = subset(plot_data , cultivar_name == selected_cultivar ),
110+ size = 0.5 , color = " #00C49F" , aes(x = as.Date(date ), y = mean , group = site_id ))
106111 }
107112 } +
108113
109114 labs(
110- title = paste0(selected_variable , ' \n ' ),
115+ title = paste0(title , ' \n ' ),
111116 x = " Observation Dates" ,
112117 y = units
113118 ) +
@@ -194,11 +199,22 @@ render_map <- function(season_name, input, output, full_cache_data) {
194199 output [[ paste0(' site_map_' , season_name ) ]] <- renderLeaflet({
195200
196201 req(input [[ paste0(' selected_variable_' , season_name ) ]])
202+ req(input [[ paste0(' selected_cultivar_' , season_name ) ]])
203+
197204 selected_variable <- input [[ paste0(' selected_variable_' , season_name ) ]]
205+ selected_cultivar <- input [[ paste0(' selected_cultivar_' , season_name ) ]]
198206
199207 traits <- full_cache_data [[ season_name ]][[ ' trait_data' ]][[ selected_variable ]][[ ' traits' ]]
200208
201- render_site_map(traits )
209+ if (selected_cultivar != ' None' )
210+ traits <- subset(traits , cultivar_name == selected_cultivar )
211+
212+ units <- full_cache_data [[ season_name ]][[ ' trait_data' ]][[ selected_variable ]][[ ' units' ]]
213+ if (units != ' ' )
214+ units <- paste0(' (' , units , ' )' )
215+ legend_title <- paste0(selected_variable , ' ' , units )
216+
217+ render_site_map(traits , legend_title )
202218 })
203219}
204220
0 commit comments