optimize code

global.R

@@ -7,6 +7,7 @@ library(leaflet.extras)
 library(arrow) # For reading Parquet files
 library(scales) # For color scaling
 library(plotly)
+source("utils/render_time_series_plot.R", local = T)
 
 # Read the metadata and availability data
 tavg_meta <- read.csv("www/data/tabs/tavg_meta.csv")

server.R

@@ -145,48 +145,8 @@ shinyServer(function(input, output, session) {
     station_id <- input$station_map_marker_click$id
     month <- input$month
     
-    plot_ly(data, x = ~YEAR, y = ~VALUE, type = 'scatter', mode = 'lines+markers', name = 'TAVG') %>%
-      layout(
-        title = list(
-          text = paste(station_id, tavg_meta$NAME[tavg_meta$ID == station_id]),
-          y = 0.80,
-          font = list(size = 12)  # Decrease title size here
-        ),
-        xaxis = list(
-          zeroline = FALSE, 
-          gridcolor = 'lightgray',
-          title = "",  # Remove x-axis title here,
-          fixedrange = TRUE  # Disable zoom on the y-axis
-        ),
-        yaxis = list(
-          title = list(text = paste(month, '(°C)'), font = list(size = 10)), 
-          zeroline = FALSE, 
-          gridcolor = 'lightgray',
-          fixedrange = TRUE  # Disable zoom on the y-axis
-        ),
-        showlegend = FALSE,
-        plot_bgcolor = 'rgba(255, 255, 255, 0)',  # Semi-transparent background
-        paper_bgcolor = 'rgba(255, 255, 255, 0)', # Semi-transparent background
-        margin = list(t = 60, b = 60, l = 60, r = 60), # Space for rounded corners
-        shapes = list(
-          list(
-            type = 'rect',
-            x0 = 0, x1 = 1, y0 = 0, y1 = 1,
-            xref = 'paper', yref = 'paper',
-            fillcolor = 'rgba(255, 255, 255, 0)',  # Invisible border (roundness effect)
-            line = list(width = 0)
-          ),
-          dragmode = FALSE,  # Disable dragging (pan)
-          # Other layout options...
-        )
-      ) %>%
-      add_trace(x = ~YEAR, y = fitted(lm(VALUE ~ YEAR, data = data)), mode = 'lines', name = 'Linear Trend') |>
-      config(
-        modeBarButtonsToRemove = list(
-          'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
-        ),
-        displaylogo = FALSE  # Optionally, remove the Plotly logo
-      )
+    render_time_series_plot(data, station_id, month)
+    
   })
   
 
@@ -202,46 +162,8 @@ shinyServer(function(input, output, session) {
       
       month <- input$month
       
-      plot_ly(data, x = ~YEAR, y = ~VALUE, type = 'scatter', mode = 'lines+markers', name = 'TAVG') %>%
-        layout(
-          title = list(
-            text = paste(station_id, tavg_meta$NAME[tavg_meta$ID == station_id]),
-            y = 0.80,
-            font = list(size = 12)  # Decrease title size here
-          ),
-          xaxis = list(
-            zeroline = FALSE, 
-            gridcolor = 'lightgray',
-            title = "",
-            fixedrange = TRUE  # Remove x-axis title here
-          ),
-          yaxis = list(
-            title = list(text = paste(month, '(°C)'), font = list(size = 10)), 
-            zeroline = FALSE, 
-            gridcolor = 'lightgray',
-            fixedrange = TRUE
-          ),
-          showlegend = FALSE,
-          plot_bgcolor = 'rgba(255, 255, 255, 0)',  # Semi-transparent background
-          paper_bgcolor = 'rgba(255, 255, 255, 0)', # Semi-transparent background
-          margin = list(t = 60, b = 60, l = 60, r = 60), # Space for rounded corners
-          shapes = list(
-            list(
-              type = 'rect',
-              x0 = 0, x1 = 1, y0 = 0, y1 = 1,
-              xref = 'paper', yref = 'paper',
-              fillcolor = 'rgba(255, 255, 255, 0)',  # Invisible border (roundness effect)
-              line = list(width = 0)
-            )
-          )
-        ) %>%
-        add_trace(x = ~YEAR, y = fitted(lm(VALUE ~ YEAR, data = data)), mode = 'lines', name = 'Linear Trend') |>
-        config(
-          modeBarButtonsToRemove = list(
-            'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
-          ),
-          displaylogo = FALSE  # Optionally, remove the Plotly logo
-        )
+      render_time_series_plot(data, station_id, month)
+      
     })
   })
   
@@ -257,46 +179,8 @@ shinyServer(function(input, output, session) {
       data <- time_series_data()  # Get the filtered time series data
       req(nrow(data) > 0)  # Ensure there is data to plot
       
-      plot_ly(data, x = ~YEAR, y = ~VALUE, type = 'scatter', mode = 'lines+markers', name = 'TAVG') %>%
-        layout(
-          title = list(
-            text = paste(station_id, tavg_meta$NAME[tavg_meta$ID == station_id]),
-            y = 0.80,
-            font = list(size = 12)  # Decrease title size here
-          ),
-          xaxis = list(
-            zeroline = FALSE, 
-            gridcolor = 'lightgray',
-            title = "",
-            fixedrange = TRUE  # Remove x-axis title here
-          ),
-          yaxis = list(
-            title = list(text = paste(month, '(°C)'), font = list(size = 10)), 
-            zeroline = FALSE, 
-            gridcolor = 'lightgray',
-            fixedrange = TRUE
-          ),
-          showlegend = FALSE,
-          plot_bgcolor = 'rgba(255, 255, 255, 0)',  # Semi-transparent background
-          paper_bgcolor = 'rgba(255, 255, 255, 0)', # Semi-transparent background
-          margin = list(t = 60, b = 60, l = 60, r = 60), # Space for rounded corners
-          shapes = list(
-            list(
-              type = 'rect',
-              x0 = 0, x1 = 1, y0 = 0, y1 = 1,
-              xref = 'paper', yref = 'paper',
-              fillcolor = 'rgba(255, 255, 255, 0)',  # Invisible border (roundness effect)
-              line = list(width = 0)
-            )
-          )
-        ) %>%
-        add_trace(x = ~YEAR, y = fitted(lm(VALUE ~ YEAR, data = data)), mode = 'lines', name = 'Linear Trend') |>
-        config(
-          modeBarButtonsToRemove = list(
-            'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
-          ),
-          displaylogo = FALSE  # Optionally, remove the Plotly logo
-        )
+     render_time_series_plot(data, station_id, month)
+
     })
   })
   

utils/render_time_series_plot.R

@@ -0,0 +1,43 @@
+# Helper function to render the time series plot
+render_time_series_plot <- function(data, station_id, month) {
+  plot_ly(data, x = ~YEAR, y = ~VALUE, type = 'scatter', mode = 'lines+markers', name = 'TAVG') %>%
+    layout(
+      title = list(
+        text = paste(station_id, tavg_meta$NAME[tavg_meta$ID == station_id]),
+        y = 0.80,
+        font = list(size = 12)  # Decrease title size here
+      ),
+      xaxis = list(
+        zeroline = FALSE, 
+        gridcolor = 'lightgray',
+        title = "",  # Remove x-axis title here
+        fixedrange = TRUE  # Disable zoom on the y-axis
+      ),
+      yaxis = list(
+        title = list(text = paste(month, '(°C)'), font = list(size = 10)), 
+        zeroline = FALSE, 
+        gridcolor = 'lightgray',
+        fixedrange = TRUE  # Disable zoom on the y-axis
+      ),
+      showlegend = FALSE,
+      plot_bgcolor = 'rgba(255, 255, 255, 0)',  # Semi-transparent background
+      paper_bgcolor = 'rgba(255, 255, 255, 0)', # Semi-transparent background
+      margin = list(t = 60, b = 60, l = 60, r = 60), # Space for rounded corners
+      shapes = list(
+        list(
+          type = 'rect',
+          x0 = 0, x1 = 1, y0 = 0, y1 = 1,
+          xref = 'paper', yref = 'paper',
+          fillcolor = 'rgba(255, 255, 255, 0)',  # Invisible border (roundness effect)
+          line = list(width = 0)
+        )
+      )
+    ) %>%
+    add_trace(x = ~YEAR, y = fitted(lm(VALUE ~ YEAR, data = data)), mode = 'lines', name = 'Linear Trend') %>%
+    config(
+      modeBarButtonsToRemove = list(
+        'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
+      ),
+      displaylogo = FALSE  # Optionally, remove the Plotly logo
+    )
+}