Merge branch 'main' of github.com:r-spatial/sf

Author: edzer

R/transform.R

@@ -88,7 +88,7 @@ st_transform = function(x, crs, ...) UseMethod("st_transform")
 #' @name st_transform
 #' @export
 #' @examples
-#' st_transform(st_sf(a=2:1, geom=sfc), "+init=epsg:3857")
+#' st_transform(st_sf(a=2:1, geom=sfc), "EPSG:3857")
 #' if (sf_extSoftVersion()["GDAL"] >= "3.0.0") {
 #'   st_transform(sfc, pipeline =
 #' 	  "+proj=pipeline +step +proj=axisswap +order=2,1") # reverse axes
@@ -156,7 +156,7 @@ st_transform.sf = function(x, crs = st_crs(x), ...) {
 #' @export
 #' @details The \code{st_transform} method for \code{sfg} objects assumes that the CRS of the object is available as an attribute of that name.
 #' @examples
-#' st_transform(structure(p1, proj4string = "+init=epsg:4326"), "+init=epsg:3857")
+#' st_transform(structure(p1, proj4string = "EPSG:4326"), "EPSG:3857")
 st_transform.sfg = function(x, crs = st_crs(x), ...) {
 	x = st_sfc(x, crs = attr(x, "proj4string"))
 	if (missing(crs))

man/st_transform.Rd

@@ -42,7 +42,7 @@ if (sf_extSoftVersion()["USE_PROJ_H"] == "true" || sf_proj_info("have_datum_file
 }
 
 if (suppressPackageStartupMessages(require(sp, quietly = TRUE))) {
- x0 = sp::CRS("+init=epsg:4326")
+ x0 = sp::CRS("EPSG:4326")
  cat(sp::wkt(x0), "\n")
  x = st_crs(x0)
  print(x)

tests/crs.R

@@ -101,6 +101,6 @@ all.equal(x, y)
 # https://github.com/edzer/sfr/issues/398 :
 pt = st_sfc(st_point(c(0,92)), crs = 4267)
 robin_crs <- "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
-# india_crs <- "+init=epsg:24383"  # India-centered Lambert conformal conic projection
+# india_crs <- "EPSG:24383"  # India-centered Lambert conformal conic projection
 india_crs <- "+proj=lcc +lat_1=12 +lat_0=12 +lon_0=80 +k_0=0.99878641 +x_0=2743195.5 +y_0=914398.5 +a=6377299.151 +b=6356098.145120132 +towgs84=295,736,257,0,0,0,0 +units=m +no_defs"
 st_transform(st_transform(pt, robin_crs), india_crs)[[1]]