clean up, .check_st_valid needs to be optimized

pachterlab · Jun 5, 2024 · 99eedb2 · 99eedb2
1 parent 748f6fd
commit 99eedb2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/R/read.R b/R/read.R
@@ -191,8 +191,6 @@ read10xVisiumSFE <- function(samples = "",
         img_fns2 <- file.path(if (is_VisiumHD) dirs else dirs[i],
                               if (is_VisiumHD) samples[i] else "", 
                               "spatial", img_fns)
-        scale_imgs_out <- scale_imgs
-
         img_dfs <- lapply(seq_along(img_fns), function(j) {
             .get_imgData(img_fns2[j], sample_id = sample_id[i],
                          image_id = names(img_fns)[j],
@@ -460,6 +458,7 @@ read10xVisiumSFE <- function(samples = "",
 
 # sanity on geometries to remove any self-intersection
 #' @importFrom sf st_buffer st_is_valid
+# TODO: this needs to be optimized, takes too long for real data ----
 .check_st_valid <- function(sf_df = NULL) {
     # sf_df is a single sf data frame, not a list of sf data frames
     invalid_inds <- which(!st_is_valid(sf_df))
@@ -808,6 +807,7 @@ readVizgen <- function(data_dir,
 
     if (!is.null(polys)) {
         # sanity on geometries
+        message(">>> Checking polygon validity")
         polys <- .check_st_valid(polys)
         rownames(polys) <- polys$ID
         polys$ID <- NULL
@@ -896,6 +896,7 @@ readCosMX <- function(data_dir,
                                     spatialCoordsNames = c("CenterX_global_px", "CenterY_global_px"),
                                     unit = "full_res_image_pixel")
     # sanity on geometries
+    message(">>> Checking polygon validity")
     polys <- .check_st_valid(polys)
     cellSeg(sfe) <- polys
 
@@ -1169,8 +1170,8 @@ readXenium <- function(data_dir,
                         df2sf(x, c("vertex_x", "vertex_y"), id_col = "cell_id",
                               geometryType = "POLYGON") })
             }
-            message(">>> Checking polygon validity")
             # sanity on geometries
+            message(">>> Checking polygon validity")
             polys <- lapply(polys, .check_st_valid)
 
             fn_out <- c(cell = "cell_boundaries_sf.parquet",