Use new inset shape helpers

Author: arcresu

DESCRIPTION

@@ -27,7 +27,7 @@ Imports:
     cartographer (>= 0.2),
     cli (>= 3.4.0),
     dplyr (>= 1.0.0),
-    ggmapinset (>= 0.3),
+    ggmapinset (> 0.4.0),
     ggplot2 (>= 3.4.2),
     packcircles (>= 0.3.4),
     rlang (>= 1.0.0),
@@ -39,7 +39,6 @@ Collate:
     'stat_automap.R'
     'stat_automap_coords.R'
     'choropleth.R'
-    'configure_inset.R'
     'coord_automap.R'
     'crs.R'
     'geom_boundaries.R'

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(coerce_centre,character)
 export(GeomSfInset)
 export(PositionCircleRepel)
 export(PositionCircleRepelSf)
@@ -22,6 +23,9 @@ export(geom_sf_label_inset)
 export(geom_sf_text_inset)
 export(position_circle_repel)
 export(position_circle_repel_sf)
+export(shape_circle)
+export(shape_rectangle)
+export(shape_sf)
 export(stat_automap)
 export(stat_automap_coords)
 export(stat_choropleth)
@@ -33,10 +37,15 @@ import(vctrs)
 importFrom(ggmapinset,GeomSfInset)
 importFrom(ggmapinset,StatSfCoordinatesInset)
 importFrom(ggmapinset,StatSfInset)
+importFrom(ggmapinset,coerce_centre)
+importFrom(ggmapinset,configure_inset)
 importFrom(ggmapinset,geom_inset_frame)
 importFrom(ggmapinset,geom_sf_inset)
 importFrom(ggmapinset,geom_sf_label_inset)
 importFrom(ggmapinset,geom_sf_text_inset)
+importFrom(ggmapinset,shape_circle)
+importFrom(ggmapinset,shape_rectangle)
+importFrom(ggmapinset,shape_sf)
 importFrom(ggmapinset,stat_sf_inset)
 importFrom(packcircles,circleRepelLayout)
 importFrom(rlang,.data)

NEWS.md

@@ -1,5 +1,9 @@
 # ggautomap (development version)
 
+* Updated to use new inset shape definition style from {ggmapinset}.
+  There is no longer a need to override the `configure_inset()` function
+  which was brittle and depended on order of package attachment to work.
+
 # ggautomap 0.3.3
 
 * Doc tweaks and housekeeping.

R/aaa.R

@@ -34,3 +34,32 @@ ggmapinset::geom_sf_text_inset
 #' @importFrom ggmapinset geom_sf_label_inset
 #' @export
 ggmapinset::geom_sf_label_inset
+
+#' @importFrom ggmapinset configure_inset
+#' @export
+ggmapinset::configure_inset
+
+#' @importFrom ggmapinset shape_circle
+#' @export
+ggmapinset::shape_circle
+
+#' @importFrom ggmapinset shape_rectangle
+#' @export
+ggmapinset::shape_rectangle
+
+#' @importFrom ggmapinset shape_sf
+#' @export
+ggmapinset::shape_sf
+
+#' @importFrom ggmapinset coerce_centre
+#' @export
+coerce_centre.character <- function(centre, feature_type = NA) {
+    feature_type <- cartographer::resolve_feature_type(feature_type, centre)
+    geom <- cartographer::map_sfc(centre, feature_type)
+    crs_orig <- sf::st_crs(geom)
+
+    crs_working <- crs_eqc_midpoint(feature_type)
+    geom <- sf::st_transform(geom, crs_working)
+    centre <- sf::st_transform(sf::st_centroid(geom), crs_orig)
+    centre
+}

R/configure_inset.R

@@ -75,8 +75,10 @@ covid_cases_nsw |>
   coord_automap(
     feature_type = "nswgeo.lga",
     inset = configure_inset(
-      centre = "Blacktown",
-      radius = 40,
+      shape_circle(
+        centre = "Blacktown",
+        radius = 40
+      ),
       units = "km",
       scale = 7,
       translation = c(400, -100)
@@ -96,12 +98,25 @@ covid_cases_nsw |>
   dplyr::filter(year >= 2021) |>
   ggplot(aes(location = lhd)) +
   geom_boundaries(feature_type = "nswgeo.lhd") +
-  geom_centroids(aes(colour = type), position = position_circle_repel_sf(scale = 35), size = 1) +
+  geom_centroids(
+    aes(colour = type),
+    position = position_circle_repel_sf(scale = 35),
+    size = 1
+  ) +
   geom_inset_frame() +
-  coord_automap(feature_type = "nswgeo.lhd", inset = configure_inset(
-    centre = "Sydney", radius = 80, units = "km", feature_type = "nswgeo.lhd",
-    scale = 6, translation = c(650, -100)
-  )) +
+  coord_automap(
+    feature_type = "nswgeo.lhd",
+    inset = configure_inset(
+      shape_circle(
+        centre = "Sydney",
+        radius = 80,
+        feature_type = "nswgeo.lhd"
+      ),
+      units = "km",
+      scale = 6,
+      translation = c(650, -100)
+    )
+  ) +
   facet_wrap(vars(year)) +
   labs(x = NULL, y = NULL) +
   theme_void() +
@@ -124,9 +139,16 @@ covid_cases_nsw |>
     outline.aes = list(colour = NA)
   ) +
   geom_inset_frame() +
-  coord_automap(feature_type = "nswgeo.lhd", inset = configure_inset(
-    centre = "Western Sydney", radius = 60, units = "km",
-    scale = 5, translation = c(400, -100)
+  coord_automap(
+    feature_type = "nswgeo.lhd",
+    inset = configure_inset(
+      shape_circle(
+        centre = "Western Sydney",
+        radius = 60
+      ),
+      units = "km",
+      scale = 5,
+      translation = c(400, -100)
   )) +
   scale_fill_steps(low = "#e6f9ff", high = "#00394d", n.breaks = 5, na.value = "white") +
   theme_void()
@@ -161,8 +183,10 @@ summarised_data |>
   coord_automap(
     feature_type = "nswgeo.lhd",
     inset = configure_inset(
-      centre = "Western Sydney",
-      radius = 60,
+      shape_circle(
+        centre = "Western Sydney",
+        radius = 60,
+      ),
       units = "km",
       scale = 3.5,
       translation = c(350, 0)
@@ -187,9 +211,16 @@ covid_cases_nsw |>
     stat = "automap_coords",
     data = ~ dplyr::slice_head(.x, by = lhd)
   ) +
-  coord_automap(feature_type = "nswgeo.lhd", inset = configure_inset(
-    centre = "Western Sydney", radius = 60, units = "km",
-    scale = 3.5, translation = c(350, 0)
+  coord_automap(
+    feature_type = "nswgeo.lhd",
+    inset = configure_inset(
+      shape_circle(
+        centre = "Western Sydney",
+        radius = 60
+      ),
+      units = "km",
+      scale = 3.5,
+      translation = c(350, 0)
   )) +
   labs(x = NULL, y = NULL) +
   theme_void()
@@ -226,8 +257,10 @@ covid_cases_nsw |>
   coord_automap(
     feature_type = "nswgeo.lhd",
     inset = configure_inset(
-      centre = "Western Sydney",
-      radius = 60,
+      shape_circle(
+        centre = "Western Sydney",
+        radius = 60
+      ),
       units = "km",
       scale = 3.5,
       translation = c(350, 0)
@@ -258,8 +291,10 @@ covid_cases_nsw |>
   coord_automap(
     feature_type = "nswgeo.lhd",
     inset = configure_inset(
-      centre = "Western Sydney",
-      radius = 60,
+      shape_circle(
+        centre = "Western Sydney",
+        radius = 60
+      ),
       units = "km",
       scale = 4,
       translation = c(500, 0)