commit to download

Author: fpirotti

inst/app/functions_server.R

@@ -0,0 +1,96 @@
+
+plotPostProcess <- function(simulations){
+ 
+  r <-  currentRasterStack[[1]]
+  # 2. Extract X and Y coordinates using the cell IDs
+  coords <- terra::xyFromCell(r, simulations$ignition_cell)
+ 
+  # Bind the coordinates back to the data frame
+  df_coords <- cbind(simulations, coords)
+   
+  df_sf <- st_as_sf(df_coords, coords = c("x", "y"), crs = terra::crs(r)) %>%
+    st_transform(4326) # Leaflet strictly requires EPSG:4326 (Lat/Lon)
+  bbox <- st_bbox(df_sf)
+  print(bbox)
+ 
+  # 4. Add to the existing Leaflet map
+  # Replace "fireMap" with the actual ID of your leafletOutput in the UI
+  leafletProxy("map") |>
+    clearGroup("Simulation Ignition Points") |>
+    addMapPane(name = "ignition_points_pane", zIndex = 650) |>
+    # clearGroup("Simulation Output") %>% # Optional: remove previous run's markers
+    addCircleMarkers(group = "Simulation Ignition Points",
+      data = df_sf,
+      radius = 12,
+      options = pathOptions(pane = "ignition_points_pane"),
+      color = "#e74c3c", # Red for fire
+      # stroke = FALSE,
+      fillOpacity = 0.8,
+      popup = ~paste0(
+        "<div style='font-family: sans-serif;'>",
+        "<b>Simulation:</b> ", simulation, "<br>",
+        "<b>Ignition Cell:</b> ", ignition_cell, "<br>",
+        "<b>Burnt Cells:</b> ", burnt_cells,
+        "</div>"
+      ) 
+      ) |>
+        leaflet::fitBounds( lng1 = bbox[["xmin"]], lat1 = bbox[["ymin"]],
+                            lng2 = bbox[["xmax"]], lat2 = bbox[["ymax"]]
+        )   
+    
+}
+
+runPostProcess <- function(resDir){
+ 
+  fl <- list.files(resDir, pattern = "simLog.log", recursive = T, full.names = T)
+ 
+  if(length(fl)!=1){
+    print(fl)
+    print(resDir)
+    showNotification("Output simLog.log file not found!", type="warning", duration=19)
+    return(NA)
+  }
+  simout <- parse_fire_log(readLines(fl ) )
+  plotPostProcess(simout)
+}
+
+
+
+
+checkIgnitionFile <- function(ignfile){
+  ip <- read.csv(ignfile)
+ 
+  if(nrow(ip)!=0){ 
+    ncell <- grep("ncell", names(ip), ignore.case = T )
+    if(length(ncell)==0){
+      showNotification(
+        paste0("In file ", basename(ignfile) , "   invalid ignition points found! please check file format and remove"),
+        type = "error",
+        duration = 20
+      )
+      return(FALSE)
+    }
+    ## DOES NOT HAVE coordinates -> get THEM FROM Cell index IP
+    if(!is.element("X", names(ip)) ){
+      ncell <- ip$Ncell
+      r2 <- terra::rast(rasters$FUEL)
+      cr <- terra::xyFromCell(r2, ncell)
+      crv <- terra::vect(cr)
+      terra::crs(crv) <- terra::crs(r2) 
+      crv2 <- crv |> terra::project("EPSG:4326")
+      crvc <-  as.data.frame(crv2@pntr$coordinates())
+      names(crvc) <- c("X","Y")
+      ignitionPointsCoords(cbind(ip, crvc) )
+    } else{
+      ignitionPointsCoords(ip )
+    } 
+  }
+  if(anyNA(ip$Ncell)){
+    showNotification(
+      paste0("In file ", ignitionFiles[[1]] , " some invalid ignition points found, please check file format."),
+      type = "warning",
+      duration = 15
+    )
+  } 
+  return(TRUE)
+}

inst/app/helperFunctions.R

@@ -9,6 +9,7 @@
 #' @examples
 center <- function(r){
   e <- terra::ext(r)
+ 
   list(
     lng = (e$xmin + e$xmax) / 2,
     lat = (e$ymin + e$ymax) / 2

inst/app/server.R

@@ -794,7 +794,24 @@ and raster %s",
   })
 
   ## TABLE IGNITION and edits  ----
+  ## 
+  observeEvent(input$chooseIgnitionFile, {
+    req(input$chooseIgnitionFile)
+    df <-tryCatch({
+      read.csv(input$chooseIgnitionFile)
+      }, warning=function(e){
+        showNotification(e$message, type="warning", duration = 19)
+        NULL
+      }, error=function(e){
+        showNotification(e$message, type="error", duration = 19)
+        NULL
+      })
+    req(df)
+    ignitionPointsCoords(df)
+  })
+  
   output$ignitionInfo <- renderDT({
+    print(input$chooseIgnitionFile)
     # req(ignitionPointsCoords())
     ip <- ignitionPointsCoords()
     if(is.null(ip)){
@@ -843,6 +860,7 @@ and raster %s",
 
   save_table_ignition_final <- function(overwrite=F){
     df <- isolate(ignitionPointsCoords())
+    print(df)
     if(overwrite && isTruthy(input$chooseIgnitionFile)) {
       write.csv(df, input$chooseIgnitionFile, quote=FALSE, row.names = F)
     } else {
@@ -1082,24 +1100,26 @@ and raster %s",
       loadInstances()
 
   })
-  ## download dataset -----
-  observeEvent(input$downloadfolder, {
-    req(input$inputfolder)
-    fp <- file.path("data", input$inputfolder )
-    req(fp!="data")
-    zip(sprintf("%s.zip", fp), list.files(fp, full.names = T) )
-  })
-  
-
+  ## download dataset ----- 
+  output$downloadfolder_dataset <- downloadHandler(
+    filename = function() { 
+      sprintf("%s.zip", basename(input$inputfolder))
+    },
+    content = function(file) { 
+      req(input$inputfolder)
+      zip(file, 
+          list.files(input$inputfolder, full.names = T) )
+    }
+  )
 
-  ## upload dataset -----
-  observeEvent(input$zipfileload, {
-    req(input$zipfileload)
+   ## upload dataset -----
+  observeEvent(input$zipfileload_dataset, {
+    req(input$zipfileload_dataset)
 
 
-    path <- file.path("data", tools::file_path_sans_ext(input$zipfileload$name) )
+    path <- file.path("data", tools::file_path_sans_ext(input$zipfileload_dataset$name) )
     if(dir.exists(path)){
-      showNotification(paste("Directory ", input$zipfileload$name, " exists, please delete it first or change the name of the zip file!"),
+      showNotification(paste("Directory ", input$zipfileload_dataset$name, " exists, please delete it first or change the name of the zip file!"),
                        type = "error",duration = 15
       )
       return(NULL)

inst/app/ui.R

@@ -153,8 +153,10 @@ ui <-  shinydashboardPlus::dashboardPage(
                                                                                  class="btn-sm", title="Remove file (cannot be undone)"),
                                                                     downloadButton("download_table_ignition", label = NULL, icon = icon("download"), class="btn-sm", 
                                                                                    title="Download table in CSV file format"),
-                                                                    actionButton("upload_table_ignition", label = NULL, icon = icon("upload"), class="btn-sm", title="Upload your table(make sure it is in the same format as the required input format for Cell2Fire)"),
-                                                                    div(style="display:none;", fileInput("upload_table_ignition_input", label = NULL, buttonLabel = NULL, width = 10,  accept = c(".csv", ".xlsx", ".xls")  ) )
+                                                                    # actionButton("upload_table_ignition", label = NULL, icon = icon("upload"), class="btn-sm", title="Upload your table(make sure it is in the same format as the required input format for Cell2Fire)"),
+                                                                    div(style="display:inline;", fileInput("upload_table_ignition_input", 
+                                                                                                           label = NULL, buttonLabel = icon("upload"), 
+                                                                                                           width = 20,  accept = c(".csv", ".xlsx", ".xls")  ) )
                                                                   ),
                                                                   div( style = "overflow-x: auto;",  DTOutput("ignitionInfo")  )
                                                                   # ,# collapsible=TRUE, collapsed = TRUE,
@@ -283,11 +285,11 @@ ui <-  shinydashboardPlus::dashboardPage(
         shiny::fluidRow(
 
           shiny::column(4,    div(
-            shiny::fileInput("zipfileload", label=NULL, buttonLabel =  icon("upload") ), 
+            shiny::fileInput("zipfileload_dataset", label=NULL, buttonLabel =  icon("upload") ), 
             title="add a zip file with all necessary files - please see <a href=https://github.com/fpirotti/Cell2FireR/blob/master/README.md target=_blank> 📖 documentation HERE</a> on how to prepare it"
           ) ), 
           shiny::column(3,   div(
-            shiny::actionButton("downloadfolder" ,   NULL,
+            shiny::downloadButton("downloadfolder_dataset" ,   NULL,
                                 icon = icon("download") ),  title="Download dataset") ),
           shiny::column(3, div(
             shiny::actionButton("deletefolder", NULL,