Préparation so.ii 1.0.26.0

dev/tag-message

-so.ii Version: 1.0.25.0
+so.ii Version: 1.0.26.0
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
 **Note de version**
     * modification de map_so_ii
-    * nouvelle fonction interne adjust_terra_scale
+    * nouvelle fonction interne calculate_terra_xy
 
 **Détails**
     * La librairie terra a changé sa façon de faire la barre d'échelle avec
     sbar à partir de la version 1.7, de façon incompatible avec l'usage interne.
-    Une nouvelle fonction non exportée adjust_terra_scale est créé pour ne plus
-    dépendre des fonctionnalités de terra::sbar qui posent problème, lorsque
-    les cartes sont en "lonlat".
+    Une nouvelle fonction non exportée calculate_terra_xy est créée pour ne plus
+    dépendre des fonctionnalités de terra::sbar qui posent problème, et ne
+    permettaient plus de faire un positionnement par mots clés.
 
 # git tag -a v1.0.25.0 -F dev/tag-message
 # git push --tags

so.ii/DESCRIPTION

 Package: so.ii
 Title: Utilities very useful to share within so_ii team
-Version: 1.0.25.0
+Version: 1.0.26.0
 Authors@R:
     c(
         person(given = "Frédéric",

so.ii/R/adjust_terra_scale.R

@@ -12,7 +12,7 @@ adjust_terra_scale = function(d = NULL, lonlat = TRUE) {
         cbind(lon2, lat2)/toRad
     }
 
-    graph_box = graphics::par()$usr
+    graph_box = graphics::par()[["usr"]]
     if (lonlat) {
         lat = mean(graph_box[3:4])
         if (is.null(d)) {
@@ -34,3 +34,53 @@ adjust_terra_scale = function(d = NULL, lonlat = TRUE) {
     }
     return(c(dd, d))
 }
+
+calculate_terra_xy = function (xy, dx = 0, dy = 0, defpos = "bottomleft")
+{
+    graph_box = graphics::par()[["usr"]]
+    if (is.null(xy)) {
+        xy = defpos
+    }
+    if (!is.character(xy)) {
+        return(cbind(xy[1], xy[2]))
+    }
+    xy = tolower(xy)
+    parrange = c(graph_box[2] - graph_box[1], graph_box[4] - graph_box[3])
+    pad = c(5, 5)/100
+    if (xy == "bottom") {
+        xy = c(graph_box[1] + 0.5 * parrange[1] - 0.5 * dx, graph_box[3] + 
+            (pad[2] * parrange[2])) + c(0, dy)
+    }
+    else if (xy == "bottomleft") {
+        xy = c(graph_box[1] + (pad[1] * parrange[1]), graph_box[3] + 
+            (pad[2] * parrange[2])) + c(0, dy)
+    }
+    else if (xy == "bottomright") {
+        xy = c(graph_box[2] - (pad[1] * parrange[1]), graph_box[3] + 
+            (pad[2] * parrange[2])) - c(dx, -dy)
+    }
+    else if (xy == "topright") {
+        xy = c(graph_box[2] - (pad[1] * parrange[1]), graph_box[4] - 
+            (pad[2] * parrange[2])) - c(dx, dy)
+    }
+    else if (xy == "top") {
+        xy = c(graph_box[1] + 0.5 * parrange[1] - 0.5 * dx, graph_box[4] - 
+            (pad[2] * parrange[2])) - c(0, dy)
+    }
+    else if (xy == "topleft") {
+        xy = c(graph_box[1] + (pad[1] * parrange[1]), graph_box[4] - 
+            (pad[2] * parrange[2])) - c(0, dy)
+    }
+    else if (xy == "left") {
+        xy = c(graph_box[1] + (pad[1] * parrange[1]), graph_box[3] + 
+            0.5 * parrange[2] - 0.5 * dy)
+    }
+    else if (xy == "right") {
+        xy = c(graph_box[2] - (pad[1] * parrange[1]) - dx, graph_box[3] + 
+            0.5 * parrange[2] - 0.5 * dy)
+    }
+    else {
+        stop("xy must be a coordinate pair (two numbers) or one of \"bottomleft\", \"bottom\", \"bottomright\", topleft\", \"top\", \"topright\"")
+    }
+    xy
+}
\ No newline at end of file

so.ii/R/map_so_ii.r → so.ii/R/map_so_ii.R

@@ -297,7 +297,7 @@ map_so_ii = function(
             # area = sf::st_area(sf::st_as_sfc(sf::st_bbox(scope)))
             # d = max(pretty(units::set_units(sqrt(area) / 5, "km")))
             d = adjust_terra_scale()
-            xy = "bottomleft"
+            xy = calculate_terra_xy("bottomleft")
             # Magical adjustment when scope vary to have text readable
             # 0.4788987 should correspond to longitude range for so.ii scope
             adj = diff(graphics::par()$usr[3:4])

so.ii/man/clc_color.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{clc_color}
 \alias{clc_color}

so.ii/man/current_version.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/current_version.r
+% Please edit documentation in R/current_version.R
 \encoding{UTF-8}
 \name{current_version}
 \alias{current_version}

so.ii/man/so_ii_catchment.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_catchment}
 \alias{so_ii_catchment}

so.ii/man/so_ii_catnat.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_catnat}
 \alias{so_ii_catnat}

so.ii/man/so_ii_clc.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_clc}
 \alias{so_ii_clc}

so.ii/man/so_ii_clc_crop.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_clc_crop}
 \alias{so_ii_clc_crop}

so.ii/man/so_ii_collectivity.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_collectivity}
 \alias{so_ii_collectivity}

so.ii/man/so_ii_hydro.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_hydro}
 \alias{so_ii_hydro}

so.ii/man/so_ii_inset.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_inset}
 \alias{so_ii_inset}

so.ii/man/so_ii_limit.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_limit}
 \alias{so_ii_limit}

so.ii/man/so_ii_montpellier.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_montpellier}
 \alias{so_ii_montpellier}

so.ii/man/so_ii_onrn.Rd

 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/data.r
+% Please edit documentation in R/data.R
 \docType{data}
 \name{so_ii_onrn}
 \alias{so_ii_onrn}