working version of all python scripts and r-scripts

This commit is contained in:
Martin Folkerts 2023-12-12 14:58:44 +01:00
parent c40ff0c79f
commit 36d74ed2af
4 changed files with 8 additions and 8 deletions

View file

@ -38,7 +38,7 @@ dir.create(merged_final)
# Creating weekly mosaic # Creating weekly mosaic
dates <- date_list(3) dates <- date_list(2)
#load pivot geojson #load pivot geojson
pivot_sf_q <- st_read(here( "pivot_20210625.geojson")) %>% dplyr::select(pivot, pivot_quadrant) %>% vect() pivot_sf_q <- st_read(here( "pivot_20210625.geojson")) %>% dplyr::select(pivot, pivot_quadrant) %>% vect()

View file

@ -35,7 +35,7 @@ library(CAST)
``` ```
```{r directories, message=FALSE, warning=FALSE, include=FALSE} ```{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") data_dir <- here(laravel_storage_dir, "Data")
extracted_CI_dir <- here(data_dir, "extracted_ci") extracted_CI_dir <- here(data_dir, "extracted_ci")
daily_CI_vals_dir <- here(extracted_CI_dir, "daily_vals") 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} ```{r week, message=FALSE, warning=FALSE, include=FALSE}
# week <- 5 # week <- 5
today = "2023-10-08" # today = "2023-10-08"
week <- week(today) # week <- week(today)
#today = "2022-08-18" #today = "2022-08-18"
#today = as.character(Sys.Date()) today = as.character(Sys.Date())
#week = lubridate::week(Sys.time()) week = lubridate::week(Sys.time())
## week = 26 ## week = 26
title_var <- paste0("CI dashboard week ", week, " - all pivots dashboard using 3x3 meter resolution") title_var <- paste0("CI dashboard week ", week, " - all pivots dashboard using 3x3 meter resolution")
``` ```

Binary file not shown.

View file

@ -14,9 +14,9 @@
# Kopieer de excel file met harvesting data en maak directory aan indien nodig # Kopieer de excel file met harvesting data en maak directory aan indien nodig
cd r_app cd r_app
#Rscript 1_harvest_data_EcoFarm_v2.R #Rscript 1_harvest_data_EcoFarm_v2.R
Rscript 2_CI_data_prep.R #Rscript 2_CI_data_prep.R
# #
## Runnen van Rmd bestand ## Runnen van Rmd bestand
# -e betekent "evalueren" en -i specificeert de input file # -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 .. cd ..