From afbb1e81f0a5d39dfe363e18249ca8bd83e3b4fb Mon Sep 17 00:00:00 2001 From: edzer Date: Mon, 17 Jun 2024 10:14:41 +0200 Subject: [PATCH] update test outputs --- tests/crs.Rout.save | 103 ++++++++++++++++-------------------------- tests/empty.Rout.save | 10 ++-- 2 files changed, 44 insertions(+), 69 deletions(-) diff --git a/tests/crs.Rout.save b/tests/crs.Rout.save index d117ae7e4..cb268caa7 100644 --- a/tests/crs.Rout.save +++ b/tests/crs.Rout.save @@ -1,7 +1,7 @@ -R version 4.3.1 (2023-06-16) -- "Beagle Scouts" -Copyright (C) 2023 The R Foundation for Statistical Computing -Platform: x86_64-pc-linux-gnu (64-bit) +R version 4.4.0 (2024-04-24) -- "Puppy Cup" +Copyright (C) 2024 The R Foundation for Statistical Computing +Platform: x86_64-pc-linux-gnu R is free software and comes with ABSOLUTELY NO WARRANTY. You are welcome to redistribute it under certain conditions. @@ -83,7 +83,7 @@ POINT (111319.5 111325.1) [1] "datum files installed" > > 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) @@ -95,81 +95,59 @@ POINT (111319.5 111325.1) + } GEOGCRS["WGS 84", ENSEMBLE["World Geodetic System 1984 ensemble", - MEMBER["World Geodetic System 1984 (Transit)", - ID["EPSG",1166]], - MEMBER["World Geodetic System 1984 (G730)", - ID["EPSG",1152]], - MEMBER["World Geodetic System 1984 (G873)", - ID["EPSG",1153]], - MEMBER["World Geodetic System 1984 (G1150)", - ID["EPSG",1154]], - MEMBER["World Geodetic System 1984 (G1674)", - ID["EPSG",1155]], - MEMBER["World Geodetic System 1984 (G1762)", - ID["EPSG",1156]], - MEMBER["World Geodetic System 1984 (G2139)", - ID["EPSG",1309]], + MEMBER["World Geodetic System 1984 (Transit)"], + MEMBER["World Geodetic System 1984 (G730)"], + MEMBER["World Geodetic System 1984 (G873)"], + MEMBER["World Geodetic System 1984 (G1150)"], + MEMBER["World Geodetic System 1984 (G1674)"], + MEMBER["World Geodetic System 1984 (G1762)"], + MEMBER["World Geodetic System 1984 (G2139)"], ELLIPSOID["WGS 84",6378137,298.257223563, - LENGTHUNIT["metre",1], - ID["EPSG",7030]], - ENSEMBLEACCURACY[2.0], - ID["EPSG",6326]], + LENGTHUNIT["metre",1]], + ENSEMBLEACCURACY[2.0]], PRIMEM["Greenwich",0, - ANGLEUNIT["degree",0.0174532925199433], - ID["EPSG",8901]], + ANGLEUNIT["degree",0.0174532925199433]], CS[ellipsoidal,2], - AXIS["longitude",east, + AXIS["geodetic latitude (Lat)",north, ORDER[1], - ANGLEUNIT["degree",0.0174532925199433, - ID["EPSG",9122]]], - AXIS["latitude",north, + ANGLEUNIT["degree",0.0174532925199433]], + AXIS["geodetic longitude (Lon)",east, ORDER[2], - ANGLEUNIT["degree",0.0174532925199433, - ID["EPSG",9122]]], + ANGLEUNIT["degree",0.0174532925199433]], USAGE[ - SCOPE["unknown"], + SCOPE["Horizontal component of 3D system."], AREA["World."], - BBOX[-90,-180,90,180]]] + BBOX[-90,-180,90,180]], + ID["EPSG",4326]] Coordinate Reference System: User input: WGS 84 wkt: GEOGCRS["WGS 84", ENSEMBLE["World Geodetic System 1984 ensemble", - MEMBER["World Geodetic System 1984 (Transit)", - ID["EPSG",1166]], - MEMBER["World Geodetic System 1984 (G730)", - ID["EPSG",1152]], - MEMBER["World Geodetic System 1984 (G873)", - ID["EPSG",1153]], - MEMBER["World Geodetic System 1984 (G1150)", - ID["EPSG",1154]], - MEMBER["World Geodetic System 1984 (G1674)", - ID["EPSG",1155]], - MEMBER["World Geodetic System 1984 (G1762)", - ID["EPSG",1156]], - MEMBER["World Geodetic System 1984 (G2139)", - ID["EPSG",1309]], + MEMBER["World Geodetic System 1984 (Transit)"], + MEMBER["World Geodetic System 1984 (G730)"], + MEMBER["World Geodetic System 1984 (G873)"], + MEMBER["World Geodetic System 1984 (G1150)"], + MEMBER["World Geodetic System 1984 (G1674)"], + MEMBER["World Geodetic System 1984 (G1762)"], + MEMBER["World Geodetic System 1984 (G2139)"], ELLIPSOID["WGS 84",6378137,298.257223563, - LENGTHUNIT["metre",1], - ID["EPSG",7030]], - ENSEMBLEACCURACY[2.0], - ID["EPSG",6326]], + LENGTHUNIT["metre",1]], + ENSEMBLEACCURACY[2.0]], PRIMEM["Greenwich",0, - ANGLEUNIT["degree",0.0174532925199433], - ID["EPSG",8901]], + ANGLEUNIT["degree",0.0174532925199433]], CS[ellipsoidal,2], - AXIS["longitude",east, + AXIS["geodetic latitude (Lat)",north, ORDER[1], - ANGLEUNIT["degree",0.0174532925199433, - ID["EPSG",9122]]], - AXIS["latitude",north, + ANGLEUNIT["degree",0.0174532925199433]], + AXIS["geodetic longitude (Lon)",east, ORDER[2], - ANGLEUNIT["degree",0.0174532925199433, - ID["EPSG",9122]]], + ANGLEUNIT["degree",0.0174532925199433]], USAGE[ - SCOPE["unknown"], + SCOPE["Horizontal component of 3D system."], AREA["World."], - BBOX[-90,-180,90,180]]] + BBOX[-90,-180,90,180]], + ID["EPSG",4326]] GEOGCRS["WGS 84", ENSEMBLE["World Geodetic System 1984 ensemble", MEMBER["World Geodetic System 1984 (Transit)"], @@ -196,9 +174,6 @@ GEOGCRS["WGS 84", AREA["World."], BBOX[-90,-180,90,180]], ID["EPSG",4326]] -Warning message: -In CPL_crs_from_input(x) : - GDAL Message 1: +init=epsg:XXXX syntax is deprecated. It might return a CRS with a non-EPSG compliant axis order. > > # https://github.com/r-spatial/sf/issues/1170 > g = st_as_sfc("POLYGON ((-61.66957 10.69214, -61.565 10.75728, -61.37453 10.77654, -61.40721 10.60681, -61.66957 10.69214))") @@ -216,4 +191,4 @@ In CPL_crs_from_input(x) : > > proc.time() user system elapsed - 1.344 0.669 1.160 + 0.762 1.280 0.537 diff --git a/tests/empty.Rout.save b/tests/empty.Rout.save index 76333f8de..2e71b3d50 100644 --- a/tests/empty.Rout.save +++ b/tests/empty.Rout.save @@ -1,7 +1,7 @@ -R version 4.2.2 Patched (2022-11-10 r83330) -- "Innocent and Trusting" -Copyright (C) 2022 The R Foundation for Statistical Computing -Platform: x86_64-pc-linux-gnu (64-bit) +R version 4.4.0 (2024-04-24) -- "Puppy Cup" +Copyright (C) 2024 The R Foundation for Statistical Computing +Platform: x86_64-pc-linux-gnu R is free software and comes with ABSOLUTELY NO WARRANTY. You are welcome to redistribute it under certain conditions. @@ -280,11 +280,11 @@ writing: substituting ENGCRS["Undefined Cartesian SRS with unknown unit"] for mi > # 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]] POINT EMPTY > > proc.time() user system elapsed - 1.062 0.763 0.982 + 0.649 1.324 0.466