diff --git a/DESCRIPTION b/DESCRIPTION
index 4ba80af..05f3f89 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: gridpattern
Type: Package
Title: 'grid' Pattern Grobs
-Version: 1.0.1
+Version: 1.0.2
Authors@R: c(person("Mike", "FC", role = "aut", comment = "Code/docs adapted from ggpattern"),
person("Trevor L", "Davis", role=c("aut", "cre"), email="trevor.l.davis@gmail.com",
comment = c(ORCID = "0000-0001-6341-4639")),
diff --git a/NEWS.md b/NEWS.md
index f3fbc75..6194376 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,12 @@
+gridpattern v1.0.2
+==================
+
+Bug fixes and minor improvements
+--------------------------------
+
+* An internal function `convert_polygon_sf_to_polygon_df()` will now be a bit more
+ quiet (throw WARNINGs less often).
+
gridpattern v1.0.1
==================
diff --git a/R/gridpattern-package.R b/R/gridpattern-package.R
index 0cdabe7..81c48f1 100644
--- a/R/gridpattern-package.R
+++ b/R/gridpattern-package.R
@@ -21,5 +21,4 @@
#' }
#' Note to use the R v4.1.0 features one needs R be (at least) version 4.1 and not all graphic devices
#' support any/all these features. See \url{https://www.stat.auckland.ac.nz/~paul/Reports/GraphicsEngine/definitions/definitions.html} for more information on these features.
-#' @keywords internal
"_PACKAGE"
diff --git a/R/utils-polygon_df.R b/R/utils-polygon_df.R
index 2ee3a19..fd0335b 100644
--- a/R/utils-polygon_df.R
+++ b/R/utils-polygon_df.R
@@ -93,9 +93,9 @@ convert_polygon_df_to_polygon_sf <- function(polygon_df, buffer_dist = 0) {
res
}
-#' Convert a sf POLYGON/MULTIPOLYGON into a polygon_df
+#' Convert a sf GEOMETRYCOLLECTION/POLYGON/MULTIPOLYGON into a polygon_df
#'
-#' @param mp sf POLYGON or MULTIPOLYGON object
+#' @param mp sf GEOMETRYCOLLECTION, POLYGON, or MULTIPOLYGON object
#'
#' @return polygon_df data.frame object
#'
@@ -104,8 +104,13 @@ convert_polygon_sf_to_polygon_df <- function(mp) {
mat <- as.matrix(mp)
if (sf::st_is_empty(mp))
return(mat)
- if (!inherits(mp, 'POLYGON') && !inherits(mp, 'MULTIPOLYGON') && !inherits(mp, 'GEOMETRYCOLLECTION')) {
- warn(paste0("convert_polygon_sf_to_polygon_df(): Not POLYGON or MULTIPOLYGON: ", deparse(class(mp))))
+ if (!inherits(mp, c('POLYGON', 'MULTIPOLYGON', 'GEOMETRYCOLLECTION',
+ 'MULTILINESTRING', 'MULTIPOINT', 'LINESTRING', 'POINT'))) {
+ warn(paste("convert_polygon_sf_to_polygon_df():",
+ "Not GEOMETRYCOLLECTION, POLYGON, or MULTIPOLYGON:",
+ deparse(class(mp))))
+ }
+ if (!inherits(mp, c('POLYGON', 'MULTIPOLYGON', 'GEOMETRYCOLLECTION'))) {
return(NULL)
}
@@ -116,17 +121,18 @@ convert_polygon_sf_to_polygon_df <- function(mp) {
}
get_poly_lengths <- function(sf_object) {
- if (inherits(sf_object, 'POLYGON') || inherits(sf_object, 'LINESTRING') || inherits(sf_object, 'POINT')) {
+ if (inherits(sf_object, c('POLYGON', 'LINESTRING', 'POINT'))) {
nrow(as.matrix(sf_object))
- } else if (inherits(sf_object, 'MULTIPOLYGON')) {
+ } else if (inherits(sf_object, c('MULTIPOLYGON', 'MULTILINESTRING', 'MULTIPOINT'))) {
if (max(lengths(sf_object)) > 1L)
- abort("There is a MULTIPOLYGON with length greater than 1")
- vapply(sf_object, function(x) {nrow(x[[1]])}, integer(1))
+ abort("There is a MULTIPOLYGON/MULTILINESTRING/MULTIPOINT with length greater than 1")
+ vapply(sf_object, function(x) nrow(as.matrix(x[[1]])), integer(1))
} else if (inherits(sf_object, 'GEOMETRYCOLLECTION')) {
vapply(sf_object, get_poly_lengths, integer(1))
} else {
- abort(paste0("convert_polygon_sf_to_polygon_df(): Not POLYGON or MULTIPOLYGON: ",
- deparse(class(sf_object))))
+ abort(paste("convert_polygon_sf_to_polygon_df():",
+ "Not GEOMETRYCOLLECTION, POLYGON, or MULTIPOLYGON:",
+ deparse(class(sf_object))))
}
}
diff --git a/man/figures/README-circle-1.png b/man/figures/README-circle-1.png
index 15ef620..991c971 100644
Binary files a/man/figures/README-circle-1.png and b/man/figures/README-circle-1.png differ
diff --git a/man/figures/README-ggpattern-1.png b/man/figures/README-ggpattern-1.png
index e264c97..ef8b8c9 100644
Binary files a/man/figures/README-ggpattern-1.png and b/man/figures/README-ggpattern-1.png differ
diff --git a/man/figures/README-hex_ggpattern-1.png b/man/figures/README-hex_ggpattern-1.png
index 0940a03..fd23b3c 100644
Binary files a/man/figures/README-hex_ggpattern-1.png and b/man/figures/README-hex_ggpattern-1.png differ
diff --git a/man/figures/README-piecepackr-1.png b/man/figures/README-piecepackr-1.png
index ffc9700..c4d1b09 100644
Binary files a/man/figures/README-piecepackr-1.png and b/man/figures/README-piecepackr-1.png differ
diff --git a/man/figures/README-rhombitrihexagonal-1.png b/man/figures/README-rhombitrihexagonal-1.png
index 3f68f92..efbc1b9 100644
Binary files a/man/figures/README-rhombitrihexagonal-1.png and b/man/figures/README-rhombitrihexagonal-1.png differ
diff --git a/man/figures/README-rose-1.png b/man/figures/README-rose-1.png
index 8a1abc0..c7b912b 100644
Binary files a/man/figures/README-rose-1.png and b/man/figures/README-rose-1.png differ
diff --git a/man/figures/README-text-1.png b/man/figures/README-text-1.png
index 5dd4487..b019356 100644
Binary files a/man/figures/README-text-1.png and b/man/figures/README-text-1.png differ
diff --git a/man/figures/README-truncated_hexagonal-1.png b/man/figures/README-truncated_hexagonal-1.png
index ee1f5ed..09b03f7 100644
Binary files a/man/figures/README-truncated_hexagonal-1.png and b/man/figures/README-truncated_hexagonal-1.png differ
diff --git a/man/figures/README-wave-1.png b/man/figures/README-wave-1.png
index 6bad0a6..fcacc1a 100644
Binary files a/man/figures/README-wave-1.png and b/man/figures/README-wave-1.png differ
diff --git a/man/figures/README-weave-1.png b/man/figures/README-weave-1.png
index d722ea3..e3caad9 100644
Binary files a/man/figures/README-weave-1.png and b/man/figures/README-weave-1.png differ
diff --git a/man/gridpattern-package.Rd b/man/gridpattern-package.Rd
index 97675a7..aea4472 100644
--- a/man/gridpattern-package.Rd
+++ b/man/gridpattern-package.Rd
@@ -59,4 +59,3 @@ Other contributors:
}
}
-\keyword{internal}
diff --git a/tests/figs/array/placeholder.png b/tests/figs/array/placeholder.png
index b924ab4..3b86efd 100644
Binary files a/tests/figs/array/placeholder.png and b/tests/figs/array/placeholder.png differ
diff --git a/tests/testthat/_snaps/geometry/circle.svg b/tests/testthat/_snaps/geometry/circle.svg
index fc091c9..c85f279 100644
--- a/tests/testthat/_snaps/geometry/circle.svg
+++ b/tests/testthat/_snaps/geometry/circle.svg
@@ -327,39 +327,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/crosshatch.svg b/tests/testthat/_snaps/geometry/crosshatch.svg
index 66b0748..70e2ebc 100644
--- a/tests/testthat/_snaps/geometry/crosshatch.svg
+++ b/tests/testthat/_snaps/geometry/crosshatch.svg
@@ -18,49 +18,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/default.svg b/tests/testthat/_snaps/geometry/default.svg
index c7f32e1..713620a 100644
--- a/tests/testthat/_snaps/geometry/default.svg
+++ b/tests/testthat/_snaps/geometry/default.svg
@@ -18,36 +18,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/eight-sided-star.svg b/tests/testthat/_snaps/geometry/eight-sided-star.svg
index 7fcf9c1..bd13fe5 100644
--- a/tests/testthat/_snaps/geometry/eight-sided-star.svg
+++ b/tests/testthat/_snaps/geometry/eight-sided-star.svg
@@ -51,30 +51,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -107,31 +107,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/hexagon.svg b/tests/testthat/_snaps/geometry/hexagon.svg
index 49a3d87..f54a89f 100644
--- a/tests/testthat/_snaps/geometry/hexagon.svg
+++ b/tests/testthat/_snaps/geometry/hexagon.svg
@@ -126,39 +126,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -268,40 +268,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -410,38 +410,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/regular-polygon.svg b/tests/testthat/_snaps/geometry/regular-polygon.svg
index e6b3239..8c3c37d 100644
--- a/tests/testthat/_snaps/geometry/regular-polygon.svg
+++ b/tests/testthat/_snaps/geometry/regular-polygon.svg
@@ -327,37 +327,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/square.svg b/tests/testthat/_snaps/geometry/square.svg
index 1449a0d..dadd864 100644
--- a/tests/testthat/_snaps/geometry/square.svg
+++ b/tests/testthat/_snaps/geometry/square.svg
@@ -159,52 +159,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -343,51 +343,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/stripe-gpar.svg b/tests/testthat/_snaps/geometry/stripe-gpar.svg
index 6416552..4e775ab 100644
--- a/tests/testthat/_snaps/geometry/stripe-gpar.svg
+++ b/tests/testthat/_snaps/geometry/stripe-gpar.svg
@@ -18,12 +18,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/stripe.svg b/tests/testthat/_snaps/geometry/stripe.svg
index 13c7045..3ab0844 100644
--- a/tests/testthat/_snaps/geometry/stripe.svg
+++ b/tests/testthat/_snaps/geometry/stripe.svg
@@ -18,24 +18,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/two-id.svg b/tests/testthat/_snaps/geometry/two-id.svg
index 6b2daed..38ddfa0 100644
--- a/tests/testthat/_snaps/geometry/two-id.svg
+++ b/tests/testthat/_snaps/geometry/two-id.svg
@@ -18,35 +18,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/wave-sine.svg b/tests/testthat/_snaps/geometry/wave-sine.svg
index 84ad5b1..0463b05 100644
--- a/tests/testthat/_snaps/geometry/wave-sine.svg
+++ b/tests/testthat/_snaps/geometry/wave-sine.svg
@@ -18,20 +18,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/wave-triangle.svg b/tests/testthat/_snaps/geometry/wave-triangle.svg
index 1228a7e..c717d2e 100644
--- a/tests/testthat/_snaps/geometry/wave-triangle.svg
+++ b/tests/testthat/_snaps/geometry/wave-triangle.svg
@@ -18,22 +18,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/geometry/weave.svg b/tests/testthat/_snaps/geometry/weave.svg
index 010c42d..d285521 100644
--- a/tests/testthat/_snaps/geometry/weave.svg
+++ b/tests/testthat/_snaps/geometry/weave.svg
@@ -18,270 +18,270 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/pch/col-fill.svg b/tests/testthat/_snaps/pch/col-fill.svg
index 73e084d..3637e36 100644
--- a/tests/testthat/_snaps/pch/col-fill.svg
+++ b/tests/testthat/_snaps/pch/col-fill.svg
@@ -24,8 +24,8 @@
-
-
+
+
@@ -44,8 +44,8 @@
-
-
+
+
@@ -55,7 +55,7 @@
-
-
+
+
diff --git a/tests/testthat/_snaps/pch/compound.svg b/tests/testthat/_snaps/pch/compound.svg
index a61754e..8f42d3a 100644
--- a/tests/testthat/_snaps/pch/compound.svg
+++ b/tests/testthat/_snaps/pch/compound.svg
@@ -27,8 +27,8 @@
-
-
+
+
@@ -37,7 +37,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -78,16 +78,16 @@
-
+
-
+
-
+
diff --git a/tests/testthat/_snaps/pch/fill-fill.svg b/tests/testthat/_snaps/pch/fill-fill.svg
index ab4dd58..69afc5e 100644
--- a/tests/testthat/_snaps/pch/fill-fill.svg
+++ b/tests/testthat/_snaps/pch/fill-fill.svg
@@ -24,21 +24,21 @@
-
+
-
-
+
+
-
+
diff --git a/tests/testthat/_snaps/pch/simple.svg b/tests/testthat/_snaps/pch/simple.svg
index a3b1e21..0d28356 100644
--- a/tests/testthat/_snaps/pch/simple.svg
+++ b/tests/testthat/_snaps/pch/simple.svg
@@ -22,13 +22,13 @@
-
-
+
+
-
+
@@ -38,14 +38,14 @@
-
+
-
-
-
+
+
+
diff --git a/tests/testthat/_snaps/tiling/12-12-4.svg b/tests/testthat/_snaps/tiling/12-12-4.svg
index c878f02..a1abd69 100644
--- a/tests/testthat/_snaps/tiling/12-12-4.svg
+++ b/tests/testthat/_snaps/tiling/12-12-4.svg
@@ -46,25 +46,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/12-3-12-3.svg b/tests/testthat/_snaps/tiling/12-3-12-3.svg
index 200da79..514cf15 100644
--- a/tests/testthat/_snaps/tiling/12-3-12-3.svg
+++ b/tests/testthat/_snaps/tiling/12-3-12-3.svg
@@ -46,25 +46,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/18-18-3.svg b/tests/testthat/_snaps/tiling/18-18-3.svg
index 8921d47..3bcc439 100644
--- a/tests/testthat/_snaps/tiling/18-18-3.svg
+++ b/tests/testthat/_snaps/tiling/18-18-3.svg
@@ -48,33 +48,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/2-2-2-2.svg b/tests/testthat/_snaps/tiling/2-2-2-2.svg
index 6b21821..1a789d7 100644
--- a/tests/testthat/_snaps/tiling/2-2-2-2.svg
+++ b/tests/testthat/_snaps/tiling/2-2-2-2.svg
@@ -31,14 +31,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -53,12 +53,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -73,16 +73,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -95,18 +95,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,26 +133,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -179,25 +179,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/2-3-12.svg b/tests/testthat/_snaps/tiling/2-3-12.svg
index 07ceb5e..e37dc60 100644
--- a/tests/testthat/_snaps/tiling/2-3-12.svg
+++ b/tests/testthat/_snaps/tiling/2-3-12.svg
@@ -29,20 +29,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -62,29 +62,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-3-3-12-3-3-12.svg b/tests/testthat/_snaps/tiling/3-3-3-12-3-3-12.svg
index cecc0a9..f974de8 100644
--- a/tests/testthat/_snaps/tiling/3-3-3-12-3-3-12.svg
+++ b/tests/testthat/_snaps/tiling/3-3-3-12-3-3-12.svg
@@ -48,34 +48,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -105,43 +105,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-3-3-3-alt.svg b/tests/testthat/_snaps/tiling/3-3-3-3-alt.svg
index 0e54bc7..8f13e9a 100644
--- a/tests/testthat/_snaps/tiling/3-3-3-3-alt.svg
+++ b/tests/testthat/_snaps/tiling/3-3-3-3-alt.svg
@@ -42,38 +42,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-3-3-3.svg b/tests/testthat/_snaps/tiling/3-3-3-3.svg
index 26e129b..9a2b7fa 100644
--- a/tests/testthat/_snaps/tiling/3-3-3-3.svg
+++ b/tests/testthat/_snaps/tiling/3-3-3-3.svg
@@ -42,42 +42,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-3-8-3-4-3-8.svg b/tests/testthat/_snaps/tiling/3-3-8-3-4-3-8.svg
index 841bd69..4d054a4 100644
--- a/tests/testthat/_snaps/tiling/3-3-8-3-4-3-8.svg
+++ b/tests/testthat/_snaps/tiling/3-3-8-3-4-3-8.svg
@@ -46,30 +46,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -97,35 +97,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-3-8-4-8.svg b/tests/testthat/_snaps/tiling/3-3-8-4-8.svg
index 92ede85..38fb972 100644
--- a/tests/testthat/_snaps/tiling/3-3-8-4-8.svg
+++ b/tests/testthat/_snaps/tiling/3-3-8-4-8.svg
@@ -39,40 +39,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -97,30 +97,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -148,35 +148,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-4-6-3-12.svg b/tests/testthat/_snaps/tiling/3-4-6-3-12.svg
index a1c648d..12d23aa 100644
--- a/tests/testthat/_snaps/tiling/3-4-6-3-12.svg
+++ b/tests/testthat/_snaps/tiling/3-4-6-3-12.svg
@@ -19,31 +19,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,30 +77,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,35 +134,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-4-8-3-8.svg b/tests/testthat/_snaps/tiling/3-4-8-3-8.svg
index 104a360..8de53d9 100644
--- a/tests/testthat/_snaps/tiling/3-4-8-3-8.svg
+++ b/tests/testthat/_snaps/tiling/3-4-8-3-8.svg
@@ -32,16 +32,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -56,20 +56,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -84,23 +84,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/3-6-6.svg b/tests/testthat/_snaps/tiling/3-6-6.svg
index 998f2f8..4e0fa5c 100644
--- a/tests/testthat/_snaps/tiling/3-6-6.svg
+++ b/tests/testthat/_snaps/tiling/3-6-6.svg
@@ -27,22 +27,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -58,33 +58,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/4-2-4-2.svg b/tests/testthat/_snaps/tiling/4-2-4-2.svg
index b1d41aa..fa7b8c5 100644
--- a/tests/testthat/_snaps/tiling/4-2-4-2.svg
+++ b/tests/testthat/_snaps/tiling/4-2-4-2.svg
@@ -49,16 +49,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -87,24 +87,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131,24 +131,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -175,19 +175,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/4-4-4.svg b/tests/testthat/_snaps/tiling/4-4-4.svg
index fdc5418..29c1fec 100644
--- a/tests/testthat/_snaps/tiling/4-4-4.svg
+++ b/tests/testthat/_snaps/tiling/4-4-4.svg
@@ -36,41 +36,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/4-6-4-6-4-6.svg b/tests/testthat/_snaps/tiling/4-6-4-6-4-6.svg
index 176c379..c22b107 100644
--- a/tests/testthat/_snaps/tiling/4-6-4-6-4-6.svg
+++ b/tests/testthat/_snaps/tiling/4-6-4-6-4-6.svg
@@ -48,39 +48,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/4-6-4-6.svg b/tests/testthat/_snaps/tiling/4-6-4-6.svg
index 45e1647..88a81d2 100644
--- a/tests/testthat/_snaps/tiling/4-6-4-6.svg
+++ b/tests/testthat/_snaps/tiling/4-6-4-6.svg
@@ -32,16 +32,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -56,15 +56,15 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/4-8-4-8.svg b/tests/testthat/_snaps/tiling/4-8-4-8.svg
index 5113019..64c1232 100644
--- a/tests/testthat/_snaps/tiling/4-8-4-8.svg
+++ b/tests/testthat/_snaps/tiling/4-8-4-8.svg
@@ -28,24 +28,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -58,21 +58,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/6-6-6-6.svg b/tests/testthat/_snaps/tiling/6-6-6-6.svg
index 783a677..7188709 100644
--- a/tests/testthat/_snaps/tiling/6-6-6-6.svg
+++ b/tests/testthat/_snaps/tiling/6-6-6-6.svg
@@ -48,29 +48,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/8-4-8-4.svg b/tests/testthat/_snaps/tiling/8-4-8-4.svg
index bbdfe99..1aa962e 100644
--- a/tests/testthat/_snaps/tiling/8-4-8-4.svg
+++ b/tests/testthat/_snaps/tiling/8-4-8-4.svg
@@ -28,25 +28,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/9-3-9-3.svg b/tests/testthat/_snaps/tiling/9-3-9-3.svg
index da40171..8133f8b 100644
--- a/tests/testthat/_snaps/tiling/9-3-9-3.svg
+++ b/tests/testthat/_snaps/tiling/9-3-9-3.svg
@@ -19,14 +19,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -56,33 +56,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/elongated-triangular.svg b/tests/testthat/_snaps/tiling/elongated-triangular.svg
index 65c8a1b..f300de2 100644
--- a/tests/testthat/_snaps/tiling/elongated-triangular.svg
+++ b/tests/testthat/_snaps/tiling/elongated-triangular.svg
@@ -24,17 +24,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -42,38 +42,38 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/herringbone.svg b/tests/testthat/_snaps/tiling/herringbone.svg
index 399dfa5..e448f95 100644
--- a/tests/testthat/_snaps/tiling/herringbone.svg
+++ b/tests/testthat/_snaps/tiling/herringbone.svg
@@ -19,69 +19,69 @@
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/hexagonal-tiling.svg b/tests/testthat/_snaps/tiling/hexagonal-tiling.svg
index 9452c1b..4cea3ef 100644
--- a/tests/testthat/_snaps/tiling/hexagonal-tiling.svg
+++ b/tests/testthat/_snaps/tiling/hexagonal-tiling.svg
@@ -28,15 +28,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -56,24 +56,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/pythagorean.svg b/tests/testthat/_snaps/tiling/pythagorean.svg
index 55ad941..d189359 100644
--- a/tests/testthat/_snaps/tiling/pythagorean.svg
+++ b/tests/testthat/_snaps/tiling/pythagorean.svg
@@ -42,29 +42,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/rhombille.svg b/tests/testthat/_snaps/tiling/rhombille.svg
index ced5cef..7ced95c 100644
--- a/tests/testthat/_snaps/tiling/rhombille.svg
+++ b/tests/testthat/_snaps/tiling/rhombille.svg
@@ -47,29 +47,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,29 +99,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -151,28 +151,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/rhombitrihexagonal-tiling.svg b/tests/testthat/_snaps/tiling/rhombitrihexagonal-tiling.svg
index d46d2cc..281d62a 100644
--- a/tests/testthat/_snaps/tiling/rhombitrihexagonal-tiling.svg
+++ b/tests/testthat/_snaps/tiling/rhombitrihexagonal-tiling.svg
@@ -19,31 +19,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,29 +77,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/snub-square-tiling.svg b/tests/testthat/_snaps/tiling/snub-square-tiling.svg
index 7b9c9fb..d70fa61 100644
--- a/tests/testthat/_snaps/tiling/snub-square-tiling.svg
+++ b/tests/testthat/_snaps/tiling/snub-square-tiling.svg
@@ -40,36 +40,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -101,15 +101,15 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/snub-trihex-tiling.svg b/tests/testthat/_snaps/tiling/snub-trihex-tiling.svg
index d034bf9..3d4618d 100644
--- a/tests/testthat/_snaps/tiling/snub-trihex-tiling.svg
+++ b/tests/testthat/_snaps/tiling/snub-trihex-tiling.svg
@@ -42,52 +42,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121,19 +121,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/square-tiling.svg b/tests/testthat/_snaps/tiling/square-tiling.svg
index b73583b..12b33b4 100644
--- a/tests/testthat/_snaps/tiling/square-tiling.svg
+++ b/tests/testthat/_snaps/tiling/square-tiling.svg
@@ -27,24 +27,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -57,21 +57,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/tetrakis-square.svg b/tests/testthat/_snaps/tiling/tetrakis-square.svg
index 84799c4..cb22fa1 100644
--- a/tests/testthat/_snaps/tiling/tetrakis-square.svg
+++ b/tests/testthat/_snaps/tiling/tetrakis-square.svg
@@ -39,27 +39,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,29 +81,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,27 +125,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -167,29 +167,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -211,27 +211,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -253,27 +253,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -295,29 +295,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -339,28 +339,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/triangular-tiling.svg b/tests/testthat/_snaps/tiling/triangular-tiling.svg
index 5a71abd..322b175 100644
--- a/tests/testthat/_snaps/tiling/triangular-tiling.svg
+++ b/tests/testthat/_snaps/tiling/triangular-tiling.svg
@@ -48,31 +48,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/trihexagonal-tiling.svg b/tests/testthat/_snaps/tiling/trihexagonal-tiling.svg
index 417e595..71e261b 100644
--- a/tests/testthat/_snaps/tiling/trihexagonal-tiling.svg
+++ b/tests/testthat/_snaps/tiling/trihexagonal-tiling.svg
@@ -48,33 +48,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/trunc-hex-tiling.svg b/tests/testthat/_snaps/tiling/trunc-hex-tiling.svg
index 2c2941e..71249b6 100644
--- a/tests/testthat/_snaps/tiling/trunc-hex-tiling.svg
+++ b/tests/testthat/_snaps/tiling/trunc-hex-tiling.svg
@@ -29,15 +29,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -57,24 +57,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/trunc-square-tiling.svg b/tests/testthat/_snaps/tiling/trunc-square-tiling.svg
index 816121d..bef9e19 100644
--- a/tests/testthat/_snaps/tiling/trunc-square-tiling.svg
+++ b/tests/testthat/_snaps/tiling/trunc-square-tiling.svg
@@ -32,16 +32,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -56,19 +56,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/_snaps/tiling/trunc-trihex-tiling.svg b/tests/testthat/_snaps/tiling/trunc-trihex-tiling.svg
index 8f75632..29c7c48 100644
--- a/tests/testthat/_snaps/tiling/trunc-trihex-tiling.svg
+++ b/tests/testthat/_snaps/tiling/trunc-trihex-tiling.svg
@@ -19,33 +19,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,19 +79,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/testthat/test_array.R b/tests/testthat/test_array.R
index f94dfb8..dc78ad3 100644
--- a/tests/testthat/test_array.R
+++ b/tests/testthat/test_array.R
@@ -35,7 +35,6 @@ test_that("array patterns works as expected", {
skip_on_ci()
skip_on_cran()
skip_if_not(capabilities("cairo"))
- skip_if_not_installed("grid")
skip_if_not_installed("magick")
skip_if_not_installed("ragg")
@@ -146,9 +145,14 @@ test_that("array patterns works as expected", {
# ambient
skip_if_not_installed("ambient")
- set.seed(42)
- test_raster("ambient.png", function() grid.pattern_ambient(x, y, fill = "green", fill2 = "blue"))
- set.seed(42)
+ test_raster("ambient.png",
+ function() {
+ set.seed(42)
+ grid.pattern_ambient(x, y, fill = "green", fill2 = "blue")
+ })
test_raster("ambient_worley.png",
- function() grid.pattern_ambient(x, y, type = "worley", fill = "green", fill2 = "blue"))
+ function() {
+ set.seed(42)
+ grid.pattern_ambient(x, y, type = "worley", fill = "green", fill2 = "blue")
+ })
})