diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_252-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_252-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_252-1.png and /dev/null differ diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_2828-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_2828-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_2828-1.png and /dev/null differ diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_3646-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_3646-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_3646-1.png and /dev/null differ diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_3943-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_3943-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_3943-1.png and /dev/null differ diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_6395-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_6395-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_6395-1.png and /dev/null differ diff --git a/CI_report_dashboard_planet_files/figure-html/sub_chunk_7104-1.png b/CI_report_dashboard_planet_files/figure-html/sub_chunk_7104-1.png deleted file mode 100644 index c20bd47..0000000 Binary files a/CI_report_dashboard_planet_files/figure-html/sub_chunk_7104-1.png and /dev/null differ diff --git a/laravel_app/app/Jobs/ProjectReportGeneratorJob.php b/laravel_app/app/Jobs/ProjectReportGeneratorJob.php index a16c8c0..167fe25 100644 --- a/laravel_app/app/Jobs/ProjectReportGeneratorJob.php +++ b/laravel_app/app/Jobs/ProjectReportGeneratorJob.php @@ -18,7 +18,7 @@ class ProjectReportGeneratorJob implements ShouldQueue { use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - public $timeout = 220; + public $timeout = 600; private ProjectReport $projectReport; private bool $sendMail; @@ -54,7 +54,7 @@ public function handle() // Convert commands array to a single string $process = new Process($command); - $process->setTimeout(220); + $process->setTimeout(600); $currentPath = '/usr/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin/Users/mfolkerts/anaconda3/bin:/Library/Apple/usr/bin'; $process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']); diff --git a/r_app/Rplots.pdf b/r_app/Rplots.pdf index 0c309ee..1502d3f 100644 Binary files a/r_app/Rplots.pdf and b/r_app/Rplots.pdf differ diff --git a/r_app/parameters_project.R b/r_app/parameters_project.R index 88a9123..ebb8de9 100644 --- a/r_app/parameters_project.R +++ b/r_app/parameters_project.R @@ -1,7 +1,7 @@ library('readxl') #chemba -if(project_dir == "chemba"){ +if(project_dir == "chemba1"){ message("Yield data for Chemba") @@ -89,8 +89,9 @@ if(project_dir == "chemba"){ } else { field_boundaries_sf <- st_read(here(data_dir, "pivot.geojson")) + head(field_boundaries_sf) names(field_boundaries_sf) <- c("field", "sub_field", "geometry") - field_boundaries <- field_boundaries_sf %>% vect() + field_boundaries <- field_boundaries_sf %>% terra::vect() harvesting_data <- read_excel(here(data_dir, "harvest.xlsx")) %>% dplyr::select(c("field", "sub_field", "year", "season_start", "season_end", "age", "sub_area", "tonnage_ha")) %>% mutate(field = as.character(field),