tidy before CRAN release

NEWS.md

@@ -1,5 +1,7 @@
 # version 1.0-15
 
+* add `st_perimeter()` to cover both geographic and projected coordinates; #268, #2279, by @JosiahParry
+
 * add `st_sample()` method for `bbox`, with special provisions for ellipsoidal coordinates; #2283
 
 * documentation clean-up by @olivroy; #2266, #2285

R/aggregate.R

@@ -107,7 +107,7 @@ aggregate.sf = function(x, by, FUN, ..., do_union = TRUE, simplify = TRUE,
 #' sum(a2$BIR74) / sum(nc$BIR74)
 #' a1$intensive = a1$BIR74
 #' a1$extensive = a2$BIR74
-#' plot(a1[c("intensive", "extensive")], key.pos = 4)
+#' \donttest{plot(a1[c("intensive", "extensive")], key.pos = 4)}
 #' @export
 st_interpolate_aw = function(x, to, extensive, ...) UseMethod("st_interpolate_aw")
 

R/geom-measures.R

@@ -115,27 +115,18 @@ message_longlat = function(caller) {
 #' st_perimeter(mpoly)
 st_perimeter = function(x, ...) {
 	x = st_geometry(x)
-
-	# for spherical geometries we use s2 
-	if (isTRUE(st_is_longlat(x))) {
-
-		if (!requireNamespace("s2", quietly = TRUE)) {
+	if (isTRUE(st_is_longlat(x))) { # for spherical geometries we use s2 
+		if (!requireNamespace("s2", quietly = TRUE))
 			stop("package s2 required to calculate the perimeter of spherical geometries")
-		}
-
 		# ensure units are set to meters 
 		units::set_units(
 			s2::s2_perimeter(x, ...), 
 			"m", 
 			mode = "standard"
 		)
-
-		# non-spherical geometries use lwgeom	
-	} else {
-		if (!requireNamespace("lwgeom", quietly = TRUE)) {
+	} else { # non-spherical geometries use lwgeom:
+		if (!requireNamespace("lwgeom", quietly = TRUE))
 			stop("package lwgeom required, please install it first")
-		}
-
 		# note that units are handled appropriately by lwgeom
 		lwgeom::st_perimeter(x)
 	}