address point 2. mentioned in #1310

r-spatial · Mar 20, 2020 · 05f14dc · 05f14dc
1 parent 53f4dfb
commit 05f14dc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/NAMESPACE b/NAMESPACE
@@ -257,6 +257,7 @@ S3method(st_reverse,sfc)
 S3method(st_reverse,sfg)
 S3method(st_sample,sf)
 S3method(st_sample,sfc)
+S3method(st_sample,sfg)
 S3method(st_segmentize,sf)
 S3method(st_segmentize,sfc)
 S3method(st_segmentize,sfg)

diff --git a/R/sample.R b/R/sample.R
@@ -115,6 +115,12 @@ st_sample.sfc = function(x, size, ..., type = "random", exact = TRUE) {
 	res
 }
 
+#' @export
+#' @name st_sample
+st_sample.sfg = function(x, size, ...) {
+	st_sample(st_geometry(x), size, ...)
+}
+
 st_poly_sample = function(x, size, ..., type = "random",
                           offset = st_sample(st_as_sfc(st_bbox(x)), 1)[[1]]) {
 

diff --git a/R/valid.R b/R/valid.R
@@ -53,13 +53,14 @@ st_make_valid.sfg = function(x) {
 
 #' @export
 st_make_valid.sfc = function(x) {
+	crs = st_crs(x)
 	x = if (sf_extSoftVersion()["GEOS"] < "3.8.0") {
 			if (!requireNamespace("lwgeom", quietly = TRUE))
 				stop("lwgeom required: install that first") # nocov
 			lwgeom::lwgeom_make_valid(x)
 		} else
 			CPL_geos_make_valid(x) # nocov
-	st_sfc(x, crs = st_crs(x))
+	st_sfc(x, crs = crs)
 }
 
 #' @export

diff --git a/man/st_sample.Rd b/man/st_sample.Rd
diff --git a/tests/sfc.R b/tests/sfc.R
@@ -194,6 +194,7 @@ options(digits=6)
 x = st_sfc(st_polygon(list(rbind(c(0,1),c(90,1),c(90,90),c(0,90),c(0,1)))), crs = st_crs(4326))
 #if (sf_extSoftVersion()["proj.4"] >= "4.9.0")
   (p <- st_sample(x, 10))
+  p <- st_sample(x[[1]], 10) # sfg method
 x = st_sfc(st_polygon(list(rbind(c(0,0),c(90,0),c(90,90),c(0,90),c(0,0))))) # NOT long/lat:
 p <- st_sample(x, 10)
 x = st_sfc(st_polygon(list(rbind(c(-180,-90),c(180,-90),c(180,90),c(-180,90),c(-180,-90)))),