diff --git a/DESCRIPTION b/DESCRIPTION index 4e01ae6873fb4facc31b269546a42207731df4a6..1239d0ccdba17db7a6278953c6942b9d21508090 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -22,6 +22,7 @@ Imports: leaflet, leaflet.extras, magrittr, + markdown, pkgload, purrr, sf, diff --git a/app.R b/app.R index 2a37cb80c2f56a6b226a498516472379d27a0a9a..3bc04f1451dac86b4e5e8c34d4678563cfff2275 100644 --- a/app.R +++ b/app.R @@ -3,6 +3,7 @@ # Or use the blue button on top of this file pkgload::load_all(export_all = FALSE,helpers = FALSE,attach_testthat = FALSE) +library(markdown) options( "golem.app.prod" = TRUE) -nitrates.pdl::run_app() # add parameters here (if any) +run_app() # add parameters here (if any) # diff --git a/inst/extdata/Departement_2023.csv b/data-raw/extdata/Departement_2023.csv similarity index 100% rename from inst/extdata/Departement_2023.csv rename to data-raw/extdata/Departement_2023.csv diff --git a/inst/extdata/Departement_2024.csv b/data-raw/extdata/Departement_2024.csv similarity index 100% rename from inst/extdata/Departement_2024.csv rename to data-raw/extdata/Departement_2024.csv diff --git a/inst/extdata/ME_2023.csv b/data-raw/extdata/ME_2023.csv similarity index 100% rename from inst/extdata/ME_2023.csv rename to data-raw/extdata/ME_2023.csv diff --git a/inst/extdata/ME_2024.csv b/data-raw/extdata/ME_2024.csv similarity index 100% rename from inst/extdata/ME_2024.csv rename to data-raw/extdata/ME_2024.csv diff --git a/inst/extdata/Metadonnees_datavisualisation_pression_azotee.ods b/data-raw/extdata/Metadonnees_datavisualisation_pression_azotee.ods similarity index 100% rename from inst/extdata/Metadonnees_datavisualisation_pression_azotee.ods rename to data-raw/extdata/Metadonnees_datavisualisation_pression_azotee.ods diff --git a/inst/extdata/NSA_973_20241205_SANDRE.csv b/data-raw/extdata/NSA_973_20241205_SANDRE.csv similarity index 100% rename from inst/extdata/NSA_973_20241205_SANDRE.csv rename to data-raw/extdata/NSA_973_20241205_SANDRE.csv diff --git a/inst/extdata/SAGE_2023.csv b/data-raw/extdata/SAGE_2023.csv similarity index 100% rename from inst/extdata/SAGE_2023.csv rename to data-raw/extdata/SAGE_2023.csv diff --git a/inst/extdata/SAGE_2024.csv b/data-raw/extdata/SAGE_2024.csv similarity index 100% rename from inst/extdata/SAGE_2024.csv rename to data-raw/extdata/SAGE_2024.csv diff --git a/data-raw/prepa_pression_azotee.R b/data-raw/prepa_pression_azotee.R index 0044db74ebadb089a703524ab3e5e73e97c1233f..5e4201f41134ffcfcea4898ee46a38273f1b473a 100644 --- a/data-raw/prepa_pression_azotee.R +++ b/data-raw/prepa_pression_azotee.R @@ -26,21 +26,21 @@ rm(list=ls()) # importation des données de la DRAAF 2024 -------- -Departement_2024 <- utils::read.csv2("inst/extdata/Departement_2024.csv") +Departement_2024 <- utils::read.csv2("data-raw/extdata/Departement_2024.csv") # names(Departement_2024) # [1] "ANNEE_DECLARATION" "DEPARTEMENT" "Code" "SAU_recensee" # [5] "QTE_ORG_MIN" "QTE_N_MIN_EPAN" "ORG_EPAN_THEORIQ" "QTE_N_ORG_NON_MAITRI" # [9] "nb_occurences" "pression_azote_globale" "pression_azote_mineral" "pression_azote_orga" # [13] "pression_azote_orga_non_maitri" -ME_2024 <- utils::read.csv2("inst/extdata/ME_2024.csv") +ME_2024 <- utils::read.csv2("data-raw/extdata/ME_2024.csv") # names(ME_2024) # [1] "ANNEE_DECLARATION" "CODE_ME" "Nom" "SAU_recensee" # [5] "QTE_ORG_MIN" "QTE_N_MIN_EPAN" "ORG_EPAN_THEORIQ" "QTE_N_ORG_NON_MAITRI" # [9] "Comptage" "pression_azote_globale" "pression_azote_mineral" "pression_azote_orga" # [13] "pression_azote_orga_non_maitri" -SAGE_2024 <- utils::read.csv2("inst/extdata/SAGE_2024.csv") %>% +SAGE_2024 <- utils::read.csv2("data-raw/extdata/SAGE_2024.csv") %>% dplyr::mutate(Code = as.character(Code)) # names(SAGE_2024) # [1] "ANNEE_DECLARATION" "nom" "Code" "SAU_recensee" diff --git a/data/departement_pa_telecharger.rda b/data/departement_pa_telecharger.rda index 2e2b74365d7017994e21c08c5231ae909a0e12e3..c1a0f910bc9382ebb1b515d834beb9d11b4a2e56 100644 Binary files a/data/departement_pa_telecharger.rda and b/data/departement_pa_telecharger.rda differ diff --git a/dev/02_dev.R b/dev/02_dev.R index 0cf6fa023b1bc391539f8fa9723bf0ebf35cbd6e..758d09125c76750430597feda74261e5411f3aa9 100644 --- a/dev/02_dev.R +++ b/dev/02_dev.R @@ -17,6 +17,8 @@ ## Amend DESCRIPTION with dependencies read from package code parsing ## install.packages('attachment') # if needed. attachment::att_amend_desc() +usethis::use_package("markdown") +usethis::use_package("pkgload") ## Add modules ---- ## Create a module infrastructure in R/ diff --git a/renv/settings.json b/renv/settings.json deleted file mode 100644 index 0ecea915ad54e15d4f63d12e997f6b3b38ae635f..0000000000000000000000000000000000000000 --- a/renv/settings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "bioconductor.version": null, - "external.libraries": [], - "ignored.packages": [ - "nitrates.pdl" - ], - "package.dependency.fields": [ - "Imports", - "Depends", - "LinkingTo" - ], - "ppm.enabled": null, - "ppm.ignored.urls": [], - "r.version": null, - "snapshot.type": "implicit", - "use.cache": true, - "vcs.ignore.cellar": true, - "vcs.ignore.library": true, - "vcs.ignore.local": true, - "vcs.manage.ignores": true -}