From 5c2d3c8160c64bc7e43768ff55e3b8d37162bddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Grelot?= <frederic.grelot@irstea.fr>
Date: Thu, 27 Jul 2023 14:52:36 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9paration=20v1.0.29.1=20de=20so.ii?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dev/tag-message | 15 ++++++++-------
so.ii/DESCRIPTION | 2 +-
so.ii/R/add_bar.R | 4 +++-
so.ii/R/add_inset.R | 2 +-
so.ii/R/map_so_ii.R | 10 ++++++----
so.ii/man/add_bar.Rd | 4 +++-
6 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/dev/tag-message b/dev/tag-message
index 88fecd1..ca34e41 100644
--- a/dev/tag-message
+++ b/dev/tag-message
@@ -1,17 +1,18 @@
-so.ii Version: 1.0.29.0
+so.ii Version: 1.0.29.1
0 errors ✔ | 0 warnings ✔ | 0 notes ✔
**Note de version**
- * MAJ de map_so_ii
* MAJ de add_bar
+ * MAJ de add_inset
+ * MAJ de map_so_ii
**Détails**
- * map_so_ii ajustement de l'appel de add_bar pour permettre de définir
- directement depuis l'appel les paramètres de add_bar
- * add_bar: changement des noms des paramètres pour plus de clarté dans appel
- dans map_so_ii
+ * 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
+
-# git tag -a v1.0.29.0 -F dev/tag-message
+# git tag -a v1.0.29.1 -F dev/tag-message
# git push --tags
diff --git a/so.ii/DESCRIPTION b/so.ii/DESCRIPTION
index 1dc34ba..728fd65 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.0
+Version: 1.0.28.1
Authors@R:
c(
person(given = "Frédéric",
diff --git a/so.ii/R/add_bar.R b/so.ii/R/add_bar.R
index 5f94c95..a69de31 100644
--- a/so.ii/R/add_bar.R
+++ b/so.ii/R/add_bar.R
@@ -9,6 +9,7 @@
#' @param bar_adj numeric of length 2, adjustment for text placement.
#' @param bar_lon numeric of length 1, may be adjusted for some plots with
#' trial-and-error strategy.
+#' @param ... some unused parameters.
#'
#' @return NULL.
#'
@@ -29,7 +30,8 @@ add_bar = function(
bar_d = NULL,
bar_xy = NULL,
bar_adj = NULL,
- bar_lon = 0.4788987
+ bar_lon = 0.4788987,
+ ...
) {
d = adjust_terra_scale(bar_d)
xy = calculate_terra_xy(bar_xy)
diff --git a/so.ii/R/add_inset.R b/so.ii/R/add_inset.R
index b6a5297..6f3f0b0 100644
--- a/so.ii/R/add_inset.R
+++ b/so.ii/R/add_inset.R
@@ -43,7 +43,7 @@ add_inset = function(x, y, ratio = 1/5, add = TRUE, ...) {
diff(ext_y[c("xmin", "xmax")]) / diff(ext_x[c("xmin", "xmax")]),
diff(ext_y[c("ymin", "ymax")]) / diff(ext_x[c("ymin", "ymax")])
))
- centroid = sf::st_centroid(x)
+ centroid = suppressWarnings(sf::st_centroid(x))
x = (x - centroid) * ratio
ext_x = sf::st_bbox(x)
ratio_real = stats::setNames(c(
diff --git a/so.ii/R/map_so_ii.R b/so.ii/R/map_so_ii.R
index 303e127..94a8753 100644
--- a/so.ii/R/map_so_ii.R
+++ b/so.ii/R/map_so_ii.R
@@ -240,10 +240,12 @@ map_so_ii = function(
warnings("Nothing pertinent found in scope, default value is used.")
scope = so.ii::so_ii_limit
} else {
- scope = sf::st_union(
- so.ii::so_ii_collectivity[
- so.ii::so_ii_collectivity[["commune"]] %in% scope,
- ]
+ scope = suppressMessages(
+ sf::st_union(
+ so.ii::so_ii_collectivity[
+ so.ii::so_ii_collectivity[["commune"]] %in% scope,
+ ]
+ )
)
}
}
diff --git a/so.ii/man/add_bar.Rd b/so.ii/man/add_bar.Rd
index 6762b08..17f457f 100644
--- a/so.ii/man/add_bar.Rd
+++ b/so.ii/man/add_bar.Rd
@@ -5,7 +5,7 @@
\alias{add_bar}
\title{Add a bar to a map}
\usage{
-add_bar(bar_d = NULL, bar_xy = NULL, bar_adj = NULL, bar_lon = 0.4788987)
+add_bar(bar_d = NULL, bar_xy = NULL, bar_adj = NULL, bar_lon = 0.4788987, ...)
}
\arguments{
\item{bar_d}{integer, size of the bar in km.}
@@ -17,6 +17,8 @@ the plot.}
\item{bar_lon}{numeric of length 1, may be adjusted for some plots with
trial-and-error strategy.}
+
+\item{...}{some unused parameters.}
}
\value{
NULL.
--
GitLab