Commit 62b85dad authored by Grelot Frederic's avatar Grelot Frederic :swimmer_tone5:
Browse files

Préparation de la version 1.0.30.0

parent 5c2d3c81
No related merge requests found
Showing with 14 additions and 13 deletions
+14 -13
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
......@@ -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"]],
......
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",
......
......@@ -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{
......
No preview for this file type
......@@ -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}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment