Fix forthcoming error with rgdal 1.5-6 #299

r-lidar · Apr 1, 2020 · c8224ae · c8224ae
1 parent 2aa9d59
commit c8224ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/R/plot.r b/R/plot.r
@@ -111,7 +111,7 @@ setMethod("plot", signature(x = "LASheader", y = "missing"), function(x, y, mapv
 {
   epsg <- epsg(x)
   PHB  <- x@PHB
-  crs  <- tryCatch({sp::CRS(glue::glue("+init=epsg:{epsg}"))}, error = function(e) return(sp::CRS()))
+  crs  <- epsg2CRS(epsg)
   xmin <- PHB[["Min X"]]
   xmax <- PHB[["Max X"]]
   ymin <- PHB[["Min Y"]]

diff --git a/tests/testthat/test-LAS.R b/tests/testthat/test-LAS.R
@@ -82,12 +82,12 @@ test_that("LAS builds a LAS object with a CRS", {
 
   las2 <- LAS(data, las@header)
 
-  expect_equal(projection(las2), "+proj=utm +zone=17 +datum=NAD83 +units=m +no_defs +ellps=GRS80 +towgs84=0,0,0")
+  expect_equal(projection(las2), projection(las))
   expect_equal(epsg(las2), 26917)
 
   las2 <- LAS(data, proj4string = las@proj4string)
 
-  expect_equal(projection(las2), "+proj=utm +zone=17 +datum=NAD83 +units=m +no_defs +ellps=GRS80 +towgs84=0,0,0")
+  expect_equal(projection(las2), projection(las))
   #expect_equal(epsg(las2), 26917)
 })
 

diff --git a/tests/testthat/test-grid_canopy.R b/tests/testthat/test-grid_canopy.R
@@ -9,7 +9,7 @@ test_that("grid_canopy with p2r() returns a georeferenced RasterLayer", {
   expect_equal(raster::res(x), c(4,4))
   expect_equal(dim(x), c(25,25,1))
   expect_equal(raster::extent(x), raster::extent(0,100,0,100))
-  expect_equal(x@crs, las@proj4string)
+  expect_equal(projection(x), projection(las))
   expect_equal(names(x), "Z")
 })
 
@@ -80,7 +80,7 @@ test_that("grid_canopy tin works both with LAS and LAScatalog", {
   expect_equal(raster::res(x), c(1,1))
   expect_equal(dim(x), c(88,88,1))
   expect_equal(raster::extent(x), raster::extent(481261,481349,3812922,3813010))
-  expect_equal(x@crs, las@proj4string)
+  expect_equal(projection(x), projection(las))
   expect_equal(names(x), "Z")
   expect_equal(x, y, tolerance = 0.00065)
 })
@@ -97,7 +97,7 @@ test_that("grid_canopy pit-free works both with LAS and LAScatalog", {
   expect_equal(raster::res(x), c(1,1))
   expect_equal(dim(x), c(88,88,1))
   expect_equal(raster::extent(x), raster::extent(481261,481349,3812922,3813010))
-  expect_equal(x@crs, las@proj4string)
+  expect_equal(projection(x), projection(las))
   expect_equal(names(x), "Z")
   expect_equal(x, y, tolerance = 0.00079)
 })