Fix #314

Author: thomasp85

DESCRIPTION

@@ -42,7 +42,7 @@ Imports:
     vctrs,
     systemfonts
 LinkingTo: Rcpp, RcppEigen
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.3
 Suggests:
     sessioninfo,
     concaveman,

NEWS.md

@@ -1,5 +1,7 @@
 # ggforce (development version)
 
+* Fixed a bug that would cause reordering of data in some geoms (#314)
+
 # ggforce 0.4.1
 
 * Fixed a sanitizer error in the decent calculations used for the mark geoms

R/aaa.R

@@ -26,3 +26,15 @@ combine_aes <- function(aes1, aes2) {
 empty_data <- function(x) {
   length(x) == 0 || nrow(x) == 0
 }
+
+# This function is like base::make.unique, but it
+# maintains the ordering of the original names if the values
+# are sorted.
+make_unique <- function(x, sep = '.') {
+  if (!anyDuplicated(x)) return(x)
+  groups <- match(x, unique(x))
+  suffix <- unsplit(lapply(split(x, groups), seq_along), groups)
+  max_chars <- nchar(max(suffix))
+  suffix_format <- paste0('%0', max_chars, 'd')
+  paste0(x, sep, sprintf(suffix_format, suffix))
+}

R/arc_bar.R

@@ -184,25 +184,13 @@ geom_arc_bar <- function(mapping = NULL, data = NULL, stat = 'arc_bar',
   )
 }
 
-# This function is like base::make.unique, but it
-# maintains the ordering of the original names if the values
-# are sorted.
-make_unique <- function(x, sep = '.') {
-  if (!anyDuplicated(x)) return(x)
-  groups <- match(x, unique(x))
-  suffix <- unsplit(lapply(split(x, groups), seq_along), groups)
-  max_chars <- nchar(max(suffix))
-  suffix_format <- paste0('%0', max_chars, 'd')
-  paste0(x, sep, sprintf(suffix_format, suffix))
-}
-
 arcPaths <- function(data, n) {
   trans <- radial_trans(c(0, 1), c(0, 2 * pi), pad = 0)
   data <- data[data$start != data$end, ]
   data$nControl <- ceiling(n / (2 * pi) * abs(data$end - data$start))
   data$nControl[data$nControl < 3] <- 3
   extraData <- !names(data) %in% c('r0', 'r', 'start', 'end', 'group')
-  data$group <- make_unique(as.character(data$group))
+  data$group <- make_unique(data$group)
   paths <- lapply(seq_len(nrow(data)), function(i) {
     path <- data_frame0(
       a = seq(data$start[i], data$end[i], length.out = data$nControl[i]),

R/diagonal.R

@@ -106,7 +106,7 @@ StatDiagonal <- ggproto('StatDiagonal', Stat,
   compute_panel = function(data, scales, n = 100, strength = 0.5, flipped_aes = FALSE) {
     if (empty_data(data)) return(data)
     data <- flip_data(data, flipped_aes)
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     end <- data
     end$x <- end$xend
     end$y <- end$yend
@@ -212,7 +212,7 @@ StatDiagonal0 <- ggproto('StatDiagonal0', Stat,
   compute_panel = function(data, scales, strength = 0.5, flipped_aes = FALSE) {
     if (empty_data(data)) return(data)
     data <- flip_data(data, flipped_aes)
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     end <- data
     end$x <- end$xend
     end$y <- end$yend

R/ellipse.R

@@ -69,7 +69,7 @@ StatEllip <- ggproto('StatEllip', Stat,
   },
   compute_panel = function(self, data, scales, n = 360) {
     if (empty_data(data)) return(data)
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     n_ellipses <- nrow(data)
     data <- data[rep(seq_len(n_ellipses), each = n), ]
     points <- rep(seq(0, 2 * pi, length.out = n + 1)[seq_len(n)],

R/link.R

@@ -85,7 +85,7 @@ NULL
 StatLink <- ggproto('StatLink', Stat,
   compute_panel = function(data, scales, n = 100) {
     extraCols <- !names(data) %in% c('x', 'y', 'xend', 'yend', 'group', 'PANEL')
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     data <- lapply(seq_len(nrow(data)), function(i) {
       path <- data_frame0(
         x = seq(data$x[i], data$xend[i], length.out = n),

R/regon.R

@@ -60,7 +60,7 @@ StatRegon <- ggproto('StatRegon', Stat,
       if (n %% 2 == 0) p <- p + p[2] / 2
       p * 2 * pi
     }))
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     data <- data[rep(seq_len(nrow(data)), data$sides), ]
     x_tmp <- sin(pos) * data$r
     y_tmp <- cos(pos) * data$r

R/spiro.R

@@ -68,7 +68,7 @@ StatSpiro <- ggproto('StatSpiro', Stat,
     if (is.null(data$x0)) data$x0 <- 0
     if (is.null(data$y0)) data$y0 <- 0
     n_spiro <- nrow(data)
-    data$group <- make_unique(as.character(data$group))
+    data$group <- make_unique(data$group)
     if (is.null(revolutions)) {
       revo <- attr(fractions(data$r / data$R), 'fracs')
       revo <- as.numeric(sub('/.*$', '', revo))