Merge pull request #55 from emlab-ucsb/dev-bathy-densify

Dev bathy densify
emlab-ucsb · Jan 14, 2025 · 3ba050f · 3ba050f
2 parents 2813be8 + e3463da
commit 3ba050f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: oceandatr
 Type: Package
 Title: Ocean Data Access
-Version: 0.2.1
+Version: 0.2.1.1
 Authors@R: person(given = "Jason", family = "Flower", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6731-8182"))
 Description: For retrieving and gridding ocean related data.
 License: GPL (>= 3) + file LICENSE

diff --git a/R/get_bathymetry.R b/R/get_bathymetry.R
@@ -83,7 +83,11 @@ get_bathymetry <- function(spatial_grid = NULL, raw = FALSE, classify_bathymetry
 
   area_polygon_for_cropping <- polygon_in_4326(spatial_grid)
 
-  antimeridian <- check_antimeridian(area_polygon_for_cropping, sf::st_crs(4326))
+  antimeridian <- area_polygon_for_cropping %>%
+    terra::vect() %>% 
+    terra::densify(interval = 1e4) %>% 
+    sf::st_as_sf() %>% 
+    check_antimeridian(sf::st_crs(4326))
 
   if(is.null(bathymetry_data_filepath)){
     bathymetry <- get_etopo_bathymetry(area_polygon_for_cropping, resolution = resolution, keep = keep, path = path, download_timeout = download_timeout) %>% 

diff --git a/R/utils.R b/R/utils.R
@@ -219,5 +219,7 @@ get_kiribati_grid <- function(resolution = 50, output = "raster") {
   get_grid(boundary = get_boundary(name = "Kiribati", country_type = "sovereign"),
            crs = '+proj=laea +lon_0=-159.609375 +lat_0=0 +datum=WGS84 +units=m +no_defs', 
            resolution = resolution*1e3, 
-           output = output)
+           output = output,
+           touches = TRUE
+          )
 }
diff --git a/oceandatr.Rproj b/oceandatr.Rproj
@@ -1,5 +1,5 @@
 Version: 1.0
-ProjectId: 07412d5b-db37-48bb-9e7b-231d1cd8b6e7
+ProjectId: 44d5a628-6d1f-4926-acb1-e59e7a6de20d
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

diff --git a/tests/testthat/test-get_bathymetry.R b/tests/testthat/test-get_bathymetry.R
@@ -10,10 +10,10 @@ test_that("returns gridded Bermuda depth classes", {
   expect_s4_class(get_bathymetry(spatial_grid = get_bermuda_grid()), class = "SpatRaster")
 })
 
-# test_that("returns Kiribati gridded depth classes", {
-#   expect_s4_class(get_bathymetry(spatial_grid = kiribati_grid()),
-#                   class = "SpatRaster")
-# })
+test_that("returns Kiribati gridded depth classes", {
+  expect_s4_class(get_bathymetry(spatial_grid = get_kiribati_grid()),
+                  class = "SpatRaster")
+})
 
 test_that("returns gridded Bermuda depth classes", {
   expect_s3_class(get_bathymetry(spatial_grid = get_bermuda_grid(output = "sf_hex")), class = "sf")