diff --git a/dev/tag-message b/dev/tag-message index ca34e410692862b3af6d9940dc96c848a47ea6a7..ac8a17da81a04408b2bc6ea71f1e1e26fe18d8fc 100644 --- a/dev/tag-message +++ b/dev/tag-message @@ -1,18 +1,14 @@ -so.ii Version: 1.0.29.1 +so.ii Version: 1.0.30.0 0 errors ✔ | 0 warnings ✔ | 0 notes ✔ **Note de version** - * MAJ de add_bar - * MAJ de add_inset - * MAJ de map_so_ii + * MAJ de so_ii_catnat **Détails** - * add_bar: correction bug, ajout de "..." comme paramètre - * add_inset: suppression de warnings pour st_centroid - * map_so_ii: suppression de message pour st_union du scope + * so_ii_catnat intègre données de gaspar en date du 2023-10-17. Prise en compte en amont des nouveaux codes d'aléa en amont. -# git tag -a v1.0.29.1 -F dev/tag-message +# git tag -a v1.0.30.0 -F dev/tag-message # git push --tags diff --git a/script/gaspar.R b/script/gaspar.R index 07c31a5e01a90a0a3a695a5644ea25ce3456ea72..1b217b66ce17df5d97d6cdb81784f3b0bb61305f 100644 --- a/script/gaspar.R +++ b/script/gaspar.R @@ -38,8 +38,8 @@ utils::download.file( method = "wget") utils::unzip(sprintf("%s.zip", archive), exdir = archive) -unlink(archive, recursive = TRUE) catnat = rio::import(file.path(archive, "catnat_gaspar.csv"))[-c(1, 10)] +unlink(archive, recursive = TRUE) ## Formating data + scope @@ -56,10 +56,10 @@ names(catnat) = c( # write.csv2(unique(catnat[c("alea_code", "alea")]), "lib_risque_jo.csv", row.names = FALSE) # catnat = catnat[ grep("nondation", catnat[["alea"]]), ] -so_ii_scope = geau::so_ii_scope +so_ii_scope = so.ii::so_ii_scope catnat_so_ii = merge( catnat[ catnat[["commune"]] %in% so_ii_scope, ], - read.csv2("data-common/so-ii/gaspar/catnat_alea_jo.csv") + read.csv2("data-common/so-ii/gaspar/catnat_alea_jo-2023.csv") ) write.csv2( catnat_so_ii, @@ -67,7 +67,7 @@ write.csv2( row.names = FALSE ) -alea_scope = c("inondation", "nappe", "submersion") +alea_scope = c("inondation", "nappe", "submersion", "torrentiel") catnat_so_ii = catnat_so_ii[ catnat_so_ii[["alea"]] %in% alea_scope, ] catnat_so_ii[["commune"]] = factor( catnat_so_ii[["commune"]], diff --git a/so.ii/DESCRIPTION b/so.ii/DESCRIPTION index 728fd657cefda1b3a59ea4386523eb653b87a6a5..efc02be92dcd3685c6256740bd52e236e66623d9 100644 --- a/so.ii/DESCRIPTION +++ b/so.ii/DESCRIPTION @@ -1,6 +1,6 @@ Package: so.ii Title: Utilities very useful to share within so_ii team -Version: 1.0.28.1 +Version: 1.0.29.0 Authors@R: c( person(given = "Frédéric", diff --git a/so.ii/R/data.R b/so.ii/R/data.R index 43d4b7306930de3dc878e5c28a65fd1f21a0a7a2..ec9d2641eaa4baea08987329a1ceea7136be0426 100644 --- a/so.ii/R/data.R +++ b/so.ii/R/data.R @@ -29,6 +29,8 @@ #' #' A dataset containing the number of Cat Nat events (linked to flood) by year #' and so-ii municipality according to the GASPAR database. +#' +#' Last update: 2023-10-17 #' #' @format array with 3 dimensions #' \describe{ diff --git a/so.ii/data/so_ii_catnat.rda b/so.ii/data/so_ii_catnat.rda index 4083200d81d8518fd6c2633a328c1d012148d4de..23948bd9feff06b16e8aa9ccf4127f83b60d79e8 100644 Binary files a/so.ii/data/so_ii_catnat.rda and b/so.ii/data/so_ii_catnat.rda differ diff --git a/so.ii/man/so_ii_catnat.Rd b/so.ii/man/so_ii_catnat.Rd index f5fc0ba2591da74be3381ebd7cbee2065574d120..aeb3f22929ad9105f17d7fed7bb92d6d943d849c 100644 --- a/so.ii/man/so_ii_catnat.Rd +++ b/so.ii/man/so_ii_catnat.Rd @@ -22,4 +22,7 @@ so_ii_catnat A dataset containing the number of Cat Nat events (linked to flood) by year and so-ii municipality according to the GASPAR database. } +\details{ +Last update: 2023-10-17 +} \keyword{datasets}