Merge remote-tracking branch 'asinghvi17/as/geometryops_core' into as…

…/dd_and_cellsize

Project.toml

@@ -62,7 +62,7 @@ Flatten = "0.4"
 GRIBDatasets = "0.2, 0.3"
 GeoFormatTypes = "0.4"
 GeoInterface = "1"
-GeometryOpsCore = "0.1"
+GeometryOpsCore = "0.1.1"
 Makie = "0.19, 0.20, 0.21"
 Missings = "0.4, 1"
 NCDatasets = "0.13, 0.14"

src/Rasters.jl

@@ -54,8 +54,8 @@ using CommonDataModel: AbstractDataset, AbstractVariable
 
 using DiskArrays: @implement_diskarray
 
-using GeometryOpsCore: Linear, Spherical
-export Linear, Spherical
+using GeometryOpsCore: Planar, Spherical
+export Planar, Spherical
 
 export AbstractRaster, Raster
 export AbstractRasterStack, RasterStack

src/extensions.jl

@@ -164,9 +164,9 @@ By assuming the earth is a sphere, it approximates the true size to about 0.1%,
 
 Run `using ArchGDAL` to make this method fully available.
 
-`method` can be `Spherical(; radius)` (the default) or `Linear()`.
+`method` can be `Spherical(; radius)` (the default) or `Planar()`.
 - `Spherical` will compute cell area on the sphere, by transforming all points back to long-lat.  You can specify the radius by the `radius` keyword argument here.  By default, this is `6371008.8`, the mean radius of the Earth.
-- `Linear` will compute cell area in the plane of the CRS you have chosen.  Be warned that this will likely be incorrect for non-equal-area projections.
+- `Planar` will compute cell area in the plane of the CRS you have chosen.  Be warned that this will likely be incorrect for non-equal-area projections.
 
 ## Example
 
@@ -199,7 +199,7 @@ $EXPERIMENTAL
 cellarea(x; kw...) = cellarea(Spherical(), x; kw...)
 cellarea(method::GeometryOpsCore.Manifold, x; kw...) = cellarea(method, dims(x, (XDim, YDim)); kw...)
 
-function cellarea(method::GeometryOpsCore.Linear, dims::Tuple{<:XDim, <:YDim}; kw...)
+function cellarea(method::GeometryOpsCore.Planar, dims::Tuple{<:XDim, <:YDim}; kw...)
     isintervals(dims) || throw(ArgumentError("Cannot calculate cell size for a `Raster` with `Points` sampling."))
     areas = _planar_cellarea(dims; kw...)
     return Raster(areas; dims)

test/cellarea.jl

@@ -42,9 +42,9 @@ include(joinpath(dirname(pathof(Rasters)), "../test/test_utils.jl"))
     @test cs == cs_ras
 
     ## test with area_in_crs true
-    cs_planar = cellarea(dimz; area_in_crs = true)
-    cs_planar2 = cellarea(dimz_25832; area_in_crs = true)
-    cs_planar3 = cellarea((x, y_rev); area_in_crs = true)
+    cs_planar = cellarea(Planar(), dimz)
+    cs_planar2 = cellarea(Planar(), dimz_25832)
+    cs_planar3 = cellarea(Planar(), (x, y_rev))
     @test all(≈(0.01), cs_planar)
     @test all(≈(10_000), cs_planar2)
     @test all(≈(0.01), cs_planar3)
@@ -70,4 +70,4 @@ include(joinpath(dirname(pathof(Rasters)), "../test/test_utils.jl"))
     # test missing crs throws an error
     nocrsdimz = setcrs(dimz, nothing)
     @test_throws ArgumentError cellarea(nocrsdimz)
-end
+end