Update Cartesian constructors (#77)

* Update 'Cartesian' constructors * Apply suggestions
JuliaEarth · May 10, 2024 · d9363b8 · d9363b8
1 parent 118deef
commit d9363b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/crs/basic.jl b/src/crs/basic.jl
@@ -12,6 +12,8 @@ abstract type Basic{Datum} <: CRS{Datum} end
 """
     Cartesian(x₁, x₂, ..., xₙ)
     Cartesian{Datum}(x₁, x₂, ..., xₙ)
+    Cartesian((x₁, x₂, ..., xₙ))
+    Cartesian{Datum}((x₁, x₂, ..., xₙ))
 
 N-dimensional Cartesian coordinates `x₁, x₂, ..., xₙ` in length units (default to meter)
 with a given `Datum` (default to `NoDatum`).
@@ -37,9 +39,9 @@ struct Cartesian{Datum,N,L<:Len} <: Basic{Datum}
 end
 
 Cartesian{Datum}(coords::NTuple{N,L}) where {Datum,N,L<:Len} = Cartesian{Datum,N,float(L)}(coords)
-Cartesian{Datum}(coords::L...) where {Datum,L<:Len} = Cartesian{Datum}(coords)
-Cartesian{Datum}(coords::Len...) where {Datum} = Cartesian{Datum}(promote(coords...))
-Cartesian{Datum}(coords::Number...) where {Datum} = Cartesian{Datum}(addunit.(coords, u"m")...)
+Cartesian{Datum}(coords::NTuple{N,Len}) where {Datum,N} = Cartesian{Datum}(promote(coords...))
+Cartesian{Datum}(coords::NTuple{N,Number}) where {Datum,N} = Cartesian{Datum}(addunit.(coords, u"m"))
+Cartesian{Datum}(coords::Number...) where {Datum} = Cartesian{Datum}(coords)
 
 Cartesian(args...) = Cartesian{NoDatum}(args...)
 

diff --git a/test/crs/constructors.jl b/test/crs/constructors.jl
@@ -5,6 +5,9 @@
       @test Cartesian(T(1), T(1)) == Cartesian(T(1) * u"m", T(1) * u"m")
       @test Cartesian(T(1), T(1), T(1)) == Cartesian(T(1) * u"m", T(1) * u"m", T(1) * u"m")
       @test Cartesian(T(1) * u"m", 1 * u"m") == Cartesian(T(1) * u"m", T(1) * u"m")
+      @test Cartesian((T(1), T(1))) == Cartesian((T(1) * u"m", T(1) * u"m"))
+      @test Cartesian((T(1), T(1), T(1))) == Cartesian((T(1) * u"m", T(1) * u"m", T(1) * u"m"))
+      @test Cartesian((T(1) * u"m", 1 * u"m")) == Cartesian((T(1) * u"m", T(1) * u"m"))
 
       c = Cartesian(T(1))
       @test sprint(show, c) == "Cartesian{NoDatum}(x: 1.0 m)"