Merge pull request #2191 from MichaelChirico/startswith

Use startsWith() over substr()

Author: edzer

R/proj.R

@@ -150,7 +150,7 @@ sf_proj_pipelines = function(source_crs, target_crs, authority = character(0), A
 		as.numeric(desired_accuracy), as.logical(strict_containment), 
 		as.logical(axis_order_authority_compliant))
 	if (nrow(ret)) {
-		if (substr(ret$definition[1], 1, 1) != "+") # paste + to every word
+		if (!startsWith(ret$definition[1], "+")) # paste + to every word
 			ret$definition = 
 				sapply(strsplit(ret$definition, " "), 
 					function(x) paste0(paste0("+", x), collapse=" "))

R/wkb.R

@@ -6,7 +6,7 @@
 #
 hex_to_raw = function(y) {
 	stopifnot((nchar(y) %% 2) == 0)
-	if (substr(y, 1, 2) == "0x")
+	if (startsWith(y, "0x"))
 		y = substr(y, 3, nchar(y))
 	as.raw(as.numeric(paste0("0x", vapply(seq_len(nchar(y)/2),
 		function(x) substr(y, (x-1)*2+1, x*2), "")))) # SLOW, hence the Rcpp implementation
@@ -15,7 +15,7 @@ hex_to_raw = function(y) {
 skip0x = function(x) {
 	if (is.na(x))
 		"010700000000000000" # empty GeometryCollection, st_as_binary(st_geometrycollection())
-	else if (substr(x, 1, 2) == "0x")
+	else if (startsWith(x, "0x"))
 		substr(x, 3, nchar(x))
 	else
 		x