clean check diffs

r-spatial · Sep 5, 2024 · ee49bb4 · ee49bb4
1 parent ac1797d
commit ee49bb4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 108 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -23,4 +23,8 @@ vignettes.awk
 _pkgdown.yml
 docs
 pkgdown
-^changes*txt
+changes0.txt
+changes1.txt
+changes2.txt
+changes3.txt
+changes.txt
diff --git a/tests/crs.R b/tests/crs.R
@@ -41,18 +41,6 @@ if (sf_extSoftVersion()["USE_PROJ_H"] == "true" || sf_proj_info("have_datum_file
  "datum files not installed"
 }
 
-if (suppressPackageStartupMessages(require(sp, quietly = TRUE))) {
- x0 = sp::CRS("EPSG:4326")
- cat(sp::wkt(x0), "\n")
- x = st_crs(x0)
- print(x)
-
- y0 = st_crs(4326)
- y0
- y = as(y0, "CRS")
- cat(sp::wkt(y), "\n")
-}
-
 # 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))")
 d = st_as_sf(data.frame(id=1, geometry=g), crs=4326)

diff --git a/tests/crs.Rout.save b/tests/crs.Rout.save
@@ -1,5 +1,5 @@
 
-R version 4.4.0 (2024-04-24) -- "Puppy Cup"
+R version 4.4.1 (2024-06-14) -- "Race for Your Life"
 Copyright (C) 2024 The R Foundation for Statistical Computing
 Platform: x86_64-pc-linux-gnu
 
@@ -82,99 +82,6 @@ POINT (111319.5 111325.1)
 + }
 [1] "datum files installed"
 > 
-> if (suppressPackageStartupMessages(require(sp, quietly = TRUE))) {
-+ x0 = sp::CRS("EPSG:4326")
-+ cat(sp::wkt(x0), "\n")
-+ x = st_crs(x0)
-+ print(x)
-+ 
-+ y0 = st_crs(4326)
-+ y0
-+ y = as(y0, "CRS")
-+ cat(sp::wkt(y), "\n")
-+ }
-GEOGCRS["WGS 84",
- ENSEMBLE["World Geodetic System 1984 ensemble",
- 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]],
- ENSEMBLEACCURACY[2.0]],
- PRIMEM["Greenwich",0,
- ANGLEUNIT["degree",0.0174532925199433]],
- CS[ellipsoidal,2],
- AXIS["geodetic latitude (Lat)",north,
- ORDER[1],
- ANGLEUNIT["degree",0.0174532925199433]],
- AXIS["geodetic longitude (Lon)",east,
- ORDER[2],
- ANGLEUNIT["degree",0.0174532925199433]],
- USAGE[
- SCOPE["Horizontal component of 3D system."],
- AREA["World."],
- 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)"],
- 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]],
- ENSEMBLEACCURACY[2.0]],
- PRIMEM["Greenwich",0,
- ANGLEUNIT["degree",0.0174532925199433]],
- CS[ellipsoidal,2],
- AXIS["geodetic latitude (Lat)",north,
- ORDER[1],
- ANGLEUNIT["degree",0.0174532925199433]],
- AXIS["geodetic longitude (Lon)",east,
- ORDER[2],
- ANGLEUNIT["degree",0.0174532925199433]],
- USAGE[
- SCOPE["Horizontal component of 3D system."],
- AREA["World."],
- BBOX[-90,-180,90,180]],
- ID["EPSG",4326]]
-GEOGCRS["WGS 84",
- ENSEMBLE["World Geodetic System 1984 ensemble",
- 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]],
- ENSEMBLEACCURACY[2.0]],
- PRIMEM["Greenwich",0,
- ANGLEUNIT["degree",0.0174532925199433]],
- CS[ellipsoidal,2],
- AXIS["geodetic latitude (Lat)",north,
- ORDER[1],
- ANGLEUNIT["degree",0.0174532925199433]],
- AXIS["geodetic longitude (Lon)",east,
- ORDER[2],
- ANGLEUNIT["degree",0.0174532925199433]],
- USAGE[
- SCOPE["Horizontal component of 3D system."],
- AREA["World."],
- BBOX[-90,-180,90,180]],
- ID["EPSG",4326]] 
-> 
 > # 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))")
 > d = st_as_sf(data.frame(id=1, geometry=g), crs=4326)
@@ -191,4 +98,4 @@ GEOGCRS["WGS 84",
 > 
 > proc.time()
  user system elapsed 
- 0.762 1.280 0.537 
+ 0.632 1.210 0.580