Fix units bug in Disk parametrization function (#1255)

* Add tests for mixed-unit-contructed parametrizations

* Bugfix for disk parametrization units

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Apply suggestion from @juliohm

* Refactor Disk parametrization

---------

Co-authored-by: Júlio Hoffimann <[email protected]>

Author: mikeingold

src/geometries/primitives/disk.jl

@@ -37,10 +37,11 @@ function (d::Disk)(ρ, φ)
   if (ρ < 0 || ρ > 1) || (φ < 0 || φ > 1)
     throw(DomainError((ρ, φ), "d(ρ, φ) is not defined for ρ, φ outside [0, 1]²."))
   end
-  T = numtype(lentype(d))
+  ℒ = lentype(d)
+  T = numtype(ℒ)
   l = T(ρ) * radius(d)
   sφ, cφ = sincospi(2 * T(φ))
-  u = ustrip(l * cφ)
-  v = ustrip(l * sφ)
+  u = ustrip(unit(ℒ), l * cφ)
+  v = ustrip(unit(ℒ), l * sφ)
   plane(d)(u, v)
 end

test/primitives.jl

@@ -798,6 +798,12 @@ end
   @test cart(0, 0, 1) ∉ d
   @test boundary(d) == Circle(p, T(2))
 
+  # ensure mixed-unit construction produces correct parametrization
+  p = Plane(cart(0, 0, 0), vector(0, 0, 1))
+  r = T(1) * u"mm"
+  d = Disk(p, r)
+  @test norm(d(1, 0) - center(d)) == r
+
   p = Plane(cart(0, 0, 0), vector(0, 0, 1))
   d = Disk(p, T(2))
   equaltest(d)
@@ -842,6 +848,12 @@ end
   equaltest(c)
   isapproxtest(c)
 
+  # ensure mixed-unit construction produces correct parametrization
+  p = Plane(cart(0, 0, 0), vector(0, 0, 1))
+  r = T(1) * u"mm"
+  c = Circle(p, r)
+  @test norm(c(0) - center(c)) == r
+
   # 3D circumcircle
   p1 = cart(0, 4, 0)
   p2 = cart(0, -4, 0)