Skip to content

Commit afbb1e8

Browse files
edzeredzer
committed
update test outputs
1 parent bbc2a2f commit afbb1e8

File tree

2 files changed

+44
-69
lines changed

2 files changed

+44
-69
lines changed

‎tests/crs.Rout.save‎

Lines changed: 39 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
R version 4.3.1 (2023-06-16) -- "Beagle Scouts"
3-
Copyright (C) 2023 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu (64-bit)
2+
R version 4.4.0 (2024-04-24) -- "Puppy Cup"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
4+
Platform: x86_64-pc-linux-gnu
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
77
You are welcome to redistribute it under certain conditions.
@@ -83,7 +83,7 @@ POINT (111319.5 111325.1)
8383
[1] "datum files installed"
8484
>
8585
> if (suppressPackageStartupMessages(require(sp, quietly = TRUE))) {
86-
+ x0 = sp::CRS("+init=epsg:4326")
86+
+ x0 = sp::CRS("EPSG:4326")
8787
+ cat(sp::wkt(x0), "\n")
8888
+ x = st_crs(x0)
8989
+ print(x)
@@ -95,81 +95,59 @@ POINT (111319.5 111325.1)
9595
+ }
9696
GEOGCRS["WGS 84",
9797
ENSEMBLE["World Geodetic System 1984 ensemble",
98-
MEMBER["World Geodetic System 1984 (Transit)",
99-
ID["EPSG",1166]],
100-
MEMBER["World Geodetic System 1984 (G730)",
101-
ID["EPSG",1152]],
102-
MEMBER["World Geodetic System 1984 (G873)",
103-
ID["EPSG",1153]],
104-
MEMBER["World Geodetic System 1984 (G1150)",
105-
ID["EPSG",1154]],
106-
MEMBER["World Geodetic System 1984 (G1674)",
107-
ID["EPSG",1155]],
108-
MEMBER["World Geodetic System 1984 (G1762)",
109-
ID["EPSG",1156]],
110-
MEMBER["World Geodetic System 1984 (G2139)",
111-
ID["EPSG",1309]],
98+
MEMBER["World Geodetic System 1984 (Transit)"],
99+
MEMBER["World Geodetic System 1984 (G730)"],
100+
MEMBER["World Geodetic System 1984 (G873)"],
101+
MEMBER["World Geodetic System 1984 (G1150)"],
102+
MEMBER["World Geodetic System 1984 (G1674)"],
103+
MEMBER["World Geodetic System 1984 (G1762)"],
104+
MEMBER["World Geodetic System 1984 (G2139)"],
112105
ELLIPSOID["WGS 84",6378137,298.257223563,
113-
LENGTHUNIT["metre",1],
114-
ID["EPSG",7030]],
115-
ENSEMBLEACCURACY[2.0],
116-
ID["EPSG",6326]],
106+
LENGTHUNIT["metre",1]],
107+
ENSEMBLEACCURACY[2.0]],
117108
PRIMEM["Greenwich",0,
118-
ANGLEUNIT["degree",0.0174532925199433],
119-
ID["EPSG",8901]],
109+
ANGLEUNIT["degree",0.0174532925199433]],
120110
CS[ellipsoidal,2],
121-
AXIS["longitude",east,
111+
AXIS["geodetic latitude (Lat)",north,
122112
ORDER[1],
123-
ANGLEUNIT["degree",0.0174532925199433,
124-
ID["EPSG",9122]]],
125-
AXIS["latitude",north,
113+
ANGLEUNIT["degree",0.0174532925199433]],
114+
AXIS["geodetic longitude (Lon)",east,
126115
ORDER[2],
127-
ANGLEUNIT["degree",0.0174532925199433,
128-
ID["EPSG",9122]]],
116+
ANGLEUNIT["degree",0.0174532925199433]],
129117
USAGE[
130-
SCOPE["unknown"],
118+
SCOPE["Horizontal component of 3D system."],
131119
AREA["World."],
132-
BBOX[-90,-180,90,180]]]
120+
BBOX[-90,-180,90,180]],
121+
ID["EPSG",4326]]
133122
Coordinate Reference System:
134123
User input: WGS 84
135124
wkt:
136125
GEOGCRS["WGS 84",
137126
ENSEMBLE["World Geodetic System 1984 ensemble",
138-
MEMBER["World Geodetic System 1984 (Transit)",
139-
ID["EPSG",1166]],
140-
MEMBER["World Geodetic System 1984 (G730)",
141-
ID["EPSG",1152]],
142-
MEMBER["World Geodetic System 1984 (G873)",
143-
ID["EPSG",1153]],
144-
MEMBER["World Geodetic System 1984 (G1150)",
145-
ID["EPSG",1154]],
146-
MEMBER["World Geodetic System 1984 (G1674)",
147-
ID["EPSG",1155]],
148-
MEMBER["World Geodetic System 1984 (G1762)",
149-
ID["EPSG",1156]],
150-
MEMBER["World Geodetic System 1984 (G2139)",
151-
ID["EPSG",1309]],
127+
MEMBER["World Geodetic System 1984 (Transit)"],
128+
MEMBER["World Geodetic System 1984 (G730)"],
129+
MEMBER["World Geodetic System 1984 (G873)"],
130+
MEMBER["World Geodetic System 1984 (G1150)"],
131+
MEMBER["World Geodetic System 1984 (G1674)"],
132+
MEMBER["World Geodetic System 1984 (G1762)"],
133+
MEMBER["World Geodetic System 1984 (G2139)"],
152134
ELLIPSOID["WGS 84",6378137,298.257223563,
153-
LENGTHUNIT["metre",1],
154-
ID["EPSG",7030]],
155-
ENSEMBLEACCURACY[2.0],
156-
ID["EPSG",6326]],
135+
LENGTHUNIT["metre",1]],
136+
ENSEMBLEACCURACY[2.0]],
157137
PRIMEM["Greenwich",0,
158-
ANGLEUNIT["degree",0.0174532925199433],
159-
ID["EPSG",8901]],
138+
ANGLEUNIT["degree",0.0174532925199433]],
160139
CS[ellipsoidal,2],
161-
AXIS["longitude",east,
140+
AXIS["geodetic latitude (Lat)",north,
162141
ORDER[1],
163-
ANGLEUNIT["degree",0.0174532925199433,
164-
ID["EPSG",9122]]],
165-
AXIS["latitude",north,
142+
ANGLEUNIT["degree",0.0174532925199433]],
143+
AXIS["geodetic longitude (Lon)",east,
166144
ORDER[2],
167-
ANGLEUNIT["degree",0.0174532925199433,
168-
ID["EPSG",9122]]],
145+
ANGLEUNIT["degree",0.0174532925199433]],
169146
USAGE[
170-
SCOPE["unknown"],
147+
SCOPE["Horizontal component of 3D system."],
171148
AREA["World."],
172-
BBOX[-90,-180,90,180]]]
149+
BBOX[-90,-180,90,180]],
150+
ID["EPSG",4326]]
173151
GEOGCRS["WGS 84",
174152
ENSEMBLE["World Geodetic System 1984 ensemble",
175153
MEMBER["World Geodetic System 1984 (Transit)"],
@@ -196,9 +174,6 @@ GEOGCRS["WGS 84",
196174
AREA["World."],
197175
BBOX[-90,-180,90,180]],
198176
ID["EPSG",4326]]
199-
Warning message:
200-
In CPL_crs_from_input(x) :
201-
GDAL Message 1: +init=epsg:XXXX syntax is deprecated. It might return a CRS with a non-EPSG compliant axis order.
202177
>
203178
> # https://github.com/r-spatial/sf/issues/1170
204179
> 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) :
216191
>
217192
> proc.time()
218193
user system elapsed
219-
1.344 0.669 1.160
194+
0.762 1.280 0.537

‎tests/empty.Rout.save‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
R version 4.2.2 Patched (2022-11-10 r83330) -- "Innocent and Trusting"
3-
Copyright (C) 2022 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu (64-bit)
2+
R version 4.4.0 (2024-04-24) -- "Puppy Cup"
3+
Copyright (C) 2024 The R Foundation for Statistical Computing
4+
Platform: x86_64-pc-linux-gnu
55

66
R is free software and comes with ABSOLUTELY NO WARRANTY.
77
You are welcome to redistribute it under certain conditions.
@@ -280,11 +280,11 @@ writing: substituting ENGCRS["Undefined Cartesian SRS with unknown unit"] for mi
280280
> # https://github.com/edzer/sfr/issues/398 :
281281
> pt = st_sfc(st_point(c(0,92)), crs = 4267)
282282
> robin_crs <- "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
283-
> # india_crs <- "+init=epsg:24383" # India-centered Lambert conformal conic projection
283+
> # india_crs <- "EPSG:24383" # India-centered Lambert conformal conic projection
284284
> 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"
285285
> st_transform(st_transform(pt, robin_crs), india_crs)[[1]]
286286
POINT EMPTY
287287
>
288288
> proc.time()
289289
user system elapsed
290-
1.062 0.763 0.982
290+
0.649 1.324 0.466

0 commit comments

Comments
 (0)