Unified checking whether two s are geographically equal. (evetion#30)

* Unified checking whether two s are geographically equal.

* Fixed GeoStats to specific version.

* Changed from GeoStats to KrigingEstimators (same GeoStats ecosystem though).

* Also commit test that actually uses KrigingEstimators.

Author: evetion

Project.toml

@@ -1,7 +1,7 @@
 name = "GeoArrays"
 uuid = "2fb1d81b-e6a0-5fc5-82e6-8e06903437ab"
 authors = ["Maarten Pronk <git@evetion.nl>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
@@ -14,13 +14,15 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 ArchGDAL = "^0.3.0"
 CoordinateTransformations = "0.5"
 GeoStatsBase = "0.5, 0.6, 0.7"
+KrigingEstimators = "=0.3.3"
 RecipesBase = "0.7, 0.8"
 StaticArrays = "0.12"
 julia = "1"
 
 [extras]
 GeoStats = "dcc97b0b-8ce5-5539-9008-bb190f959ef6"
+KrigingEstimators = "d293930c-a38c-56c5-8ebb-12008647b47a"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "GeoStats"]
+test = ["Test", "KrigingEstimators"]

src/operations.jl

@@ -1,27 +1,25 @@
+"""Check whether two `GeoArrays`s `a` and `b` are
+geographically equal, although not necessarily in content."""
+function equals(a::GeoArray, b::GeoArray)
+    size(a) == size(b) && a.f == b.f && a.crs == b.crs
+end
+
 function Base.:-(a::GeoArray, b::GeoArray)
-    size(a) == size(b) || throw(DimensionMismatch("The sizes of a and b do not match."))
-    a.f == b.f || error("The affine information does not match")
-    a.crs == b.crs || error("The crs information does not match")
+    equals(a, b) || throw(DimensionMismatch("Can't operate on non-geographic-equal `GeoArray`s"))
     GeoArray(a.A .- b.A, a.f, a.crs)
 end
 
 function Base.:+(a::GeoArray, b::GeoArray)
-    size(a) == size(b) || throw(DimensionMismatch("The sizes of a and b do not match."))
-    a.f == b.f || error("The affine information does not match")
-    a.crs == b.crs || error("The crs information does not match")
+    equals(a, b) || throw(DimensionMismatch("Can't operate on non-geographic-equal `GeoArray`s"))
     GeoArray(a.A .+ b.A, a.f, a.crs)
 end
 
 function Base.:*(a::GeoArray, b::GeoArray)
-    size(a) == size(b) || throw(DimensionMismatch("The sizes of a and b do not match."))
-    a.f == b.f || error("The affine information does not match")
-    a.crs == b.crs || error("The crs information does not match")
+    equals(a, b) || throw(DimensionMismatch("Can't operate on non-geographic-equal `GeoArray`s"))
     GeoArray(a.A .* b.A, a.f, a.crs)
 end
 
 function Base.:/(a::GeoArray, b::GeoArray)
-    size(a) == size(b) || throw(DimensionMismatch("The sizes of a and b do not match."))
-    a.f == b.f || error("The affine information does not match")
-    a.crs == b.crs || error("The crs information does not match")
+    equals(a, b) || throw(DimensionMismatch("Can't operate on non-geographic-equal `GeoArray`s"))
     GeoArray(a.A ./ b.A, a.f, a.crs)
 end

test/test_interpolate.jl

@@ -1,4 +1,4 @@
-using GeoStats
+using KrigingEstimators
 using StaticArrays
 
 @testset "Interpolating rasters" begin

test/test_operations.jl

@@ -13,19 +13,19 @@ using CoordinateTransformations
     @testset "affine error tests" begin
     c = GeoArray(rand(5, 5, 1), AffineMap([1.0 0.0; 0.0 -1.0], [375000.03, 380000.03]),"")
     d = GeoArray(rand(5, 5, 1), AffineMap([1.0 0.0; 0.0 1.0], [0.0, 0.0]),"")
-    @test_throws ErrorException c - d
-    @test_throws ErrorException c + d
-    @test_throws ErrorException c * d
-    @test_throws ErrorException c / d
+    @test_throws DimensionMismatch c - d
+    @test_throws DimensionMismatch c + d
+    @test_throws DimensionMismatch c * d
+    @test_throws DimensionMismatch c / d
     end
 
     @testset "crs error test" begin
     e = GeoArray(rand(5, 5, 1), AffineMap([1.0 0.0; 0.0 -1.0], [375000.03, 380000.03]),"")
     f = GeoArray(rand(5, 5, 1), AffineMap([1.0 0.0; 0.0 -1.0], [375000.03, 380000.03]),"PROJCS[\"NAD27 / UTM zone 11N\",GEOGCS[\"NAD27\",DATUM[\"North_American_Datum_1927\",SPHEROID[\"Clarke 1866\",6378206.4,294.9786982138982,AUTHORITY[\"EPSG\",\"7008\"]],AUTHORITY[\"EPSG\",\"6267\"]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433],AUTHORITY[\"EPSG\",\"4267\"]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central_meridian\",-117],PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"false_northing\",0],UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],AUTHORITY[\"EPSG\",\"26711\"]]")
-    @test_throws ErrorException e - f
-    @test_throws ErrorException e + f
-    @test_throws ErrorException e * f
-    @test_throws ErrorException e / f
+    @test_throws DimensionMismatch e - f
+    @test_throws DimensionMismatch e + f
+    @test_throws DimensionMismatch e * f
+    @test_throws DimensionMismatch e / f
     end
 
     @testset "operations" begin