diff --git a/r_app/2_CI_data_prep.R b/r_app/2_CI_data_prep.R index 30d64c6..4e88677 100644 --- a/r_app/2_CI_data_prep.R +++ b/r_app/2_CI_data_prep.R @@ -38,7 +38,7 @@ dir.create(merged_final) # Creating weekly mosaic -dates <- date_list(3) +dates <- date_list(2) #load pivot geojson pivot_sf_q <- st_read(here( "pivot_20210625.geojson")) %>% dplyr::select(pivot, pivot_quadrant) %>% vect() diff --git a/r_app/CI_report_dashboard_planet.Rmd b/r_app/CI_report_dashboard_planet.Rmd index ef577f3..9206e2b 100644 --- a/r_app/CI_report_dashboard_planet.Rmd +++ b/r_app/CI_report_dashboard_planet.Rmd @@ -35,7 +35,7 @@ library(CAST) ``` ```{r directories, message=FALSE, warning=FALSE, include=FALSE} -laravel_storage_dir <- here("laravel_app/storage/app") +laravel_storage_dir <- here("../laravel_app/storage/app") data_dir <- here(laravel_storage_dir, "Data") extracted_CI_dir <- here(data_dir, "extracted_ci") daily_CI_vals_dir <- here(extracted_CI_dir, "daily_vals") @@ -50,12 +50,12 @@ s2_dir <- "C:/Users/timon/Resilience BV/4002 CMD App - General/4002 CMD Team/400 ```{r week, message=FALSE, warning=FALSE, include=FALSE} # week <- 5 - today = "2023-10-08" - week <- week(today) +# today = "2023-10-08" +# week <- week(today) #today = "2022-08-18" -#today = as.character(Sys.Date()) -#week = lubridate::week(Sys.time()) +today = as.character(Sys.Date()) +week = lubridate::week(Sys.time()) ## week = 26 title_var <- paste0("CI dashboard week ", week, " - all pivots dashboard using 3x3 meter resolution") ``` diff --git a/r_app/Rplots.pdf b/r_app/Rplots.pdf index 61ffeb0..2672a3d 100644 Binary files a/r_app/Rplots.pdf and b/r_app/Rplots.pdf differ diff --git a/runcane.sh b/runcane.sh index 7684322..2f8c843 100755 --- a/runcane.sh +++ b/runcane.sh @@ -14,9 +14,9 @@ # Kopieer de excel file met harvesting data en maak directory aan indien nodig cd r_app #Rscript 1_harvest_data_EcoFarm_v2.R -Rscript 2_CI_data_prep.R +#Rscript 2_CI_data_prep.R # ## Runnen van Rmd bestand # -e betekent "evalueren" en -i specificeert de input file -#Rscript -e "rmarkdown::render('CI_report_dashboard_planet.Rmd', 'all')" +Rscript -e "rmarkdown::render('CI_report_dashboard_planet.Rmd', 'all')" cd ..