From 62b85dadb1be9116b3a353ad8e9f5c703cbbe3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Grelot?= <frederic.grelot@irstea.fr>
Date: Tue, 17 Oct 2023 16:06:18 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9paration=20de=20la=20version=201.0.30.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dev/tag-message | 12 ++++--------
script/gaspar.R | 8 ++++----
so.ii/DESCRIPTION | 2 +-
so.ii/R/data.R | 2 ++
so.ii/data/so_ii_catnat.rda | Bin 864 -> 931 bytes
so.ii/man/so_ii_catnat.Rd | 3 +++
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dev/tag-message b/dev/tag-message
index ca34e41..ac8a17d 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 07c31a5..1b217b6 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 728fd65..efc02be 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 43d4b73..ec9d264 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
GIT binary patch
literal 931
zcmV;U16=$<T4*^jL0KkKSsC)y)c^_EfB*mf$cTuL|Llwnn83d8-Wm*u0EmDLh=>RT
z3_u772#HVx7!O;TGXq_h2nq-4kYW+0LqO9;fB*mh06jxN?NEw)5So<rLqU)L0009(
z8UO$Q0Vb6)O(gYA8&EVFGH3uX4@6}3G{`gn28`4>rXwRJnKT0-qal+Z003lZk)UA=
zfh3WsnNR=$hyVj4AOHXW14GndSg?vnq*;`xDq*5#l>(ty0>uTD35F6VXoMDFlB9=?
zQYwa6RthMfut9>v6k`BUWC2J5gaw3T3gt7z(@_CJOr;$d70PJBK=d(Ln`>4vQCA6;
zS4>iZ3~fqPbV{NK+7%OpsK<}W<KZC#ov!sBD^Yqn^Qj0!-x&l5od_8WBsTkyE=rYQ
zDnPX@od{`ckO|4mSV<)BZ=``adGv&UaiAHIoTx-bMw4BVOxxMn_wjFl0000000000
z3%k3$cf1T;3xN()K{>{G-Y{;WK$513w=AsDQ8a_qQ6@r~qOPLc4Ln-i?c&^+JB+vP
z*+7P501^ZtuTq!U_3ur`BQ;$f-oD;_)H5O=76TyoK|W4{Gn3YJmp&+isnIK=uD(f|
zVzk0$+G-FMkjcaY5AM-GbkMaEM$ASzLUR!04}sBK02)uSR?fg~7L8kKIl9iIcJ-o_
zPOa0Qdeh^aFlsq?-81w;60RkAQ{r`v%aN6rW=v&i`kHz>Af)8CBH>!IdQ$q#xZqIO
zw#gD#{$gjIQd2}U$-K=BipsX5xbT7x3MtX*aNoO|ZQR^k+o{1eVv28Q$sjM#l?+=V
z#R#Fcw?s8=8U@k6wl&hEQexTif>9Jig2SM~ry>NHU`-TU(MeK34~3FLbD*pVBFF%L
z9m^p$VIs*1)93Q?>)plf`TtfixgfJBqRNF@qZQiLHki|F=WBye5K%Eo!81T0%nOFq
zY?-lz67I2cI58(k#(A@3(Co;N*4$8*>x@aGG~K^k<BPqv+#s5;(J$o!6@Zz6H1obl
z#q$r0X1JP^CP0Q@5Y8AOEG2oYS(#?T1_KEum#eXGqbad=im8$i#EaC(L$kUKR!yL=
zWXKsXcL2GCIp>2nfkCHX%_E$oK+Gak9?UN0UR=L+x|I#vv-w0q)mkG8pNi_RE(46e
zU%^gNt{(G<=ZVfKnxd7}K-M3MHN!%!4QkZNK}ilqbkIhGwIygw$jr<9UC9*TLO^HB
FTT~dEo<INq
literal 864
zcmV-m1E2gtT4*^jL0KkKS(agBA^-?wfB*mf$cT!d|Llwjn83d4-Wmdk0EmPPh=>RP
z2to=82nkRF*dAwToDI>;K?P55Qc2-8Js<!EnE(I)28N9q7-a^g$RQ;F0000ChJerj
z0001!N`xrUpa26v00ThNO#lD@8V)jGni&j?jG7t%&}3l%&}h>kh-d(jD5t6Dfv2PZ
zXwU!v13&-(00tF`5kf2$V3ieAO4@}%V#o>$76rCKRzRo<vPCvkg2J#UkyZ><MHs6W
z%*uePAr=5BB1wX{qb(qz1rewfsHIR<6%~RaRwyk5i4;Xv(xN3x6m1G1n`RSZ8+25^
zs#6jIr6!P)gaE;$4#WVs@hi<JglNwQ2_ggtHvfn~By!S#5;&kynUR^qghWJUQXv@`
zl(I#w9=&~w7HnAn0000000000001jIIZhBLHBCjaty<pKygADdHc6E8NnwzDDo+zm
zTB?##UTTx#qYO^1#`48kTtyTh1Xe%*(hvoecq1z!D>-(UO(XBmJ~}KSOhOE-TJBxV
ztjDm(beZUtr&T{ue3iSCr8pXkW%Pj25$%l{1PEF@c_J=(i!7RfKJ>1|DXM30E+^h>
zFhu3O81~GzvAnpExye@BB83v3zNbfmJXFQ4F<rQ)P^|gnuR6--g04~IABQ3-v9#{X
zhKt%&3iSD_M<zBEv56LHT}&>0&B5wn$acA9@Y&MMh1t!f=uHe&G^t>^$x>r%ixdr}
zicA=Gv)nOk3N>?P*~biMprEkGw9W}vgK=gEssfR9Su;2)ELGJ>AW!l@Abqv0ki`iW
zNew-He6}&W9X}>G=SVEc6j@NEQHt{|V`+{WGRsB8%pwXVG^`UU7aA7^BXTSQ-ti&c
z_?fziTB7;L77*5Sh$YwyD4JPPk*hjWOEo@8=d}h*(IX?l0wJJHf^*&$a}*;vt))&X
zz*sW?EEt9Z4~K<U!kGf#f^P2OTCszOc(mZ-4xXk_b9p$>!v<#}u$COX)Tt)Gvl5v@
z&U1A*xuPz>vL?#JNQ7j<BD#iFknQ(h!RUWUYkvhVJNgv7XWmsM`eOW$##L%t{c*uf
qB_ir5wA7F;W`vyzS!IO32%?UOT5!oq;36Xf{9VZu;X*=Lg^-AT)nnuU
diff --git a/so.ii/man/so_ii_catnat.Rd b/so.ii/man/so_ii_catnat.Rd
index f5fc0ba..aeb3f22 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}
--
GitLab