Implement promote for Points & Handle -180° == 180° in latlon coordinates (#1032)

* Handle -180° == 180° in latlon coordinates

* Fix typo

* Apply suggestions

* Fix tests

* Implement promote for Points

* Remove unused code

* Fix promote

* Fix tests

* Rename variables

* Bump version

Author: eliascarv

Project.toml

@@ -31,7 +31,7 @@ MeshesMakieExt = "Makie"
 Bessels = "0.2"
 CircularArrays = "1.3"
 Colorfy = "0.1"
-CoordRefSystems = "0.12"
+CoordRefSystems = "0.13.1"
 DelaunayTriangulation = "1.0"
 Distances = "0.10"
 LinearAlgebra = "1.9"

src/geometries/primitives/point.jl

@@ -44,15 +44,34 @@ Point(coords::CRS) = Point{_manifold(coords)}(coords)
 # convenience constructor
 Point(coords...) = Point(Cartesian(coords...))
 
-# conversions
+# conversion
 Base.convert(::Type{Point{M,CRSₜ}}, p::Point{M,CRSₛ}) where {M,CRSₜ,CRSₛ} = Point{M}(convert(CRSₜ, p.coords))
 Base.convert(::Type{Point{M,CRS}}, p::Point{M,CRS}) where {M,CRS} = p
 
+# promotion
+function Base.promote(A::Point, B::Point)
+  a, b = promote(coords(A), coords(B))
+  Point(a), Point(b)
+end
+
 paramdim(::Type{<:Point}) = 0
 
-==(A::Point, B::Point) = to(A) == to(B)
+function ==(A::Point, B::Point)
+  A′, B′ = promote(A, B)
+  to(A′) == to(B′)
+end
+
+function ==(A::Point{🌐,<:LatLon}, B::Point{🌐,<:LatLon})
+  A′, B′ = promote(A, B)
+  lat₁, lon₁ = A′.coords.lat, A′.coords.lon
+  lat₂, lon₂ = B′.coords.lat, B′.coords.lon
+  lat₁ == lat₂ && lon₁ == lon₂ || (abs(lon₁) == 180u"°" && lon₁ == -lon₂)
+end
 
-Base.isapprox(A::Point, B::Point; atol=atol(lentype(A)), kwargs...) = isapprox(to(A), to(B); atol, kwargs...)
+function Base.isapprox(A::Point, B::Point; atol=atol(lentype(A)), kwargs...)
+  A′, B′ = promote(A, B)
+  isapprox(to(A′), to(B′); atol, kwargs...)
+end
 
 """
     coords(point)

test/primitives.jl

@@ -2,6 +2,9 @@
   @test embeddim(Point(1)) == 1
   @test embeddim(Point(1, 2)) == 2
   @test embeddim(Point(1, 2, 3)) == 3
+  @test paramdim(Point(1)) == 0
+  @test paramdim(Point(1, 2)) == 0
+  @test paramdim(Point(1, 2, 3)) == 0
   @test crs(cart(1, 1)) <: Cartesian{NoDatum}
   @test crs(Point(Polar(T(√2), T(π / 4)))) <: Polar{NoDatum}
   @test crs(Point(Cylindrical(T(√2), T(π / 4), T(1)))) <: Cylindrical{NoDatum}
@@ -11,13 +14,43 @@
   @test Meshes.lentype(Point((T(1), T(1)))) == ℳ
   @test Meshes.lentype(Point(T(1), T(1))) == ℳ
 
+  # conversion
+  P = typeof(cart(1, 1))
+  p1 = Point(1.0, 1.0)
+  p2 = convert(P, p1)
+  @test p2 isa P
+  p1 = Point(1.0f0, 1.0f0)
+  p2 = convert(P, p1)
+  @test p2 isa P
+
+  # promotion
+  p1 = Point(T(1), T(1))
+  p2 = Point(1.0, 1.0)
+  p3 = Point(1.0f0, 1.0f0)
+  ps = promote(p1, p2)
+  @test allequal(Meshes.lentype.(ps))
+  @test Meshes.lentype(first(ps)) == Meshes.Met{Float64}
+  ps = promote(p1, p3)
+  @test allequal(Meshes.lentype.(ps))
+  @test Meshes.lentype(first(ps)) == Meshes.Met{T}
+
   equaltest(cart(1))
   equaltest(cart(1, 2))
   equaltest(cart(1, 2, 3))
   isapproxtest(cart(1))
   isapproxtest(cart(1, 2))
   isapproxtest(cart(1, 2, 3))
 
+  # different datums
+  p1 = Point(Cartesian{WGS84{1762}}(T(1), T(1), T(1)))
+  p2 = Point(Cartesian{ITRF{2008}}(T(1), T(1), T(1)))
+  @test p1 == p2
+  @test p1 ≈ p2
+
+  # latlon special cases
+  @test latlon(45, 180) == latlon(45, -180)
+  @test latlon(45, -180) == latlon(45, 180)
+
   @test to(cart(1)) == vector(1)
   @test to(cart(1, 2)) == vector(1, 2)
   @test to(cart(1, 2, 3)) == vector(1, 2, 3)
@@ -89,15 +122,6 @@
   @test unit(Meshes.lentype(p)) == u"m"
   @test Unitful.numtype(Meshes.lentype(p)) === Float32
 
-  # conversions
-  P = typeof(cart(1, 1))
-  p1 = Point(1.0, 1.0)
-  p2 = convert(P, p1)
-  @test p2 isa P
-  p1 = Point(1.0f0, 1.0f0)
-  p2 = convert(P, p1)
-  @test p2 isa P
-
   # centroid
   @test centroid(cart(1, 1)) == cart(1, 1)
 

test/transforms.jl

@@ -1129,7 +1129,7 @@ end
   g = latlon(0, 0)
   r, c = TB.apply(f, g)
   @test manifold(r) === 🌐
-  @test r ≈ cart(6378137.0, 0, 0)
+  @test r ≈ Point(Cartesian{WGS84Latest}(T(6378137.0), T(0), T(0)))
 
   # --------
   # SEGMENT