fix #243

slowkow · Jan 5, 2024 · ee13920 · ee13920
1 parent fc0733b
commit ee13920
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/R/geom-label-repel.R b/R/geom-label-repel.R
@@ -494,7 +494,7 @@ makeLabelRepelGrobs <- function(
     !point_inside_text &&
     d > 0 &&
     # Distance from label to point edge is greater than minimum.
-    euclid(int, point_int) > min.segment.length &&
+    (!is.na(min.segment.length) && euclid(int, point_int) > min.segment.length) &&
     # Distance from label to point edge is less than from label to point center.
     euclid(int, point_int) < euclid(int, point_pos) &&
     # Distance from label to point center is greater than point size.

diff --git a/R/geom-text-repel.R b/R/geom-text-repel.R
@@ -635,7 +635,7 @@ makeTextRepelGrobs <- function(
     !point_inside_text &&
     d > 0 &&
     # Distance from label to point edge is greater than minimum.
-    euclid(int, point_int) > min.segment.length &&
+    (!is.na(min.segment.length) && euclid(int, point_int) > min.segment.length) &&
     # Distance from label to point edge is less than from label to point center.
     euclid(int, point_int) < euclid(int, point_pos) &&
     # Distance from label to point center is greater than point size.

diff --git a/src/repel_boxes.cpp b/src/repel_boxes.cpp
@@ -675,6 +675,10 @@ DataFrame repel_boxes2(
     force_pull = 1e-6;
   }
 
+  if (force_push == 0) {
+    max_iter = 0;
+  }
+
   // Try to catch errors.
   if (n_texts > n_points) {
     Rcerr << "n_texts is " << n_texts << std::endl;