Add support for LatLon in boundingbox (#1043)

* Add support for 'LatLon' in 'boundingbox'

* Update tests

* Update tests

Author: eliascarv

src/boundingboxes.jl

@@ -85,16 +85,51 @@ boundingbox(m::Mesh) = _pboxes(vertices(m))
 
 _bboxes(boxes) = _pboxes(point for box in boxes for point in extrema(box))
 
-function _pboxes(points)
+_pboxes(points) = _pboxes(manifold(first(points)), points)
+
+function _pboxes(::Type{𝔼{2}}, points)
+  p = first(points)
+  ℒ = lentype(p)
+  xmin, ymin = typemax(ℒ), typemax(ℒ)
+  xmax, ymax = typemin(ℒ), typemin(ℒ)
+  for p in points
+    c = convert(Cartesian, coords(p))
+    xmin = min(c.x, xmin)
+    ymin = min(c.y, ymin)
+    xmax = max(c.x, xmax)
+    ymax = max(c.y, ymax)
+  end
+  Box(withcrs(p, (xmin, ymin)), withcrs(p, (xmax, ymax)))
+end
+
+function _pboxes(::Type{𝔼{3}}, points)
   p = first(points)
   ℒ = lentype(p)
-  Dim = embeddim(p)
-  xmin = MVector(ntuple(i -> typemax(ℒ), Dim))
-  xmax = MVector(ntuple(i -> typemin(ℒ), Dim))
+  xmin, ymin, zmin = typemax(ℒ), typemax(ℒ), typemax(ℒ)
+  xmax, ymax, zmax = typemin(ℒ), typemin(ℒ), typemin(ℒ)
+  for p in points
+    c = convert(Cartesian, coords(p))
+    xmin = min(c.x, xmin)
+    ymin = min(c.y, ymin)
+    zmin = min(c.z, zmin)
+    xmax = max(c.x, xmax)
+    ymax = max(c.y, ymax)
+    zmax = max(c.z, zmax)
+  end
+  Box(withcrs(p, (xmin, ymin, zmin)), withcrs(p, (xmax, ymax, zmax)))
+end
+
+function _pboxes(::Type{🌐}, points)
+  p = first(points)
+  T = numtype(lentype(p))
+  lonmin, latmin = T(180) * u"°", T(90) * u"°"
+  lonmax, latmax = T(-180) * u"°", T(-90) * u"°"
   for p in points
-    x = to(p)
-    @. xmin = min(x, xmin)
-    @. xmax = max(x, xmax)
+    c = convert(LatLon, coords(p))
+    lonmin = min(c.lon, lonmin)
+    latmin = min(c.lat, latmin)
+    lonmax = max(c.lon, lonmax)
+    latmax = max(c.lat, latmax)
   end
-  Box(withcrs(p, xmin), withcrs(p, xmax))
+  Box(withcrs(p, (latmin, lonmin), LatLon), withcrs(p, (latmax, lonmax), LatLon))
 end

src/utils/misc.jl

@@ -262,9 +262,9 @@ function cartesianrange(grid::Grid{🌐}, limits)
   nlon, nlat = vsize(grid)
   (llonmin, llonmax), (llatmin, llatmax) = limits
 
-  a = convert(Cartesian, coords(vertex(grid, (1, 1))))
-  b = convert(Cartesian, coords(vertex(grid, (nlon, 1))))
-  c = convert(Cartesian, coords(vertex(grid, (1, nlat))))
+  a = convert(LatLon, coords(vertex(grid, (1, 1))))
+  b = convert(LatLon, coords(vertex(grid, (nlon, 1))))
+  c = convert(LatLon, coords(vertex(grid, (1, nlat))))
 
   lonmin = max(llonmin, a.lon)
   latmin = max(llatmin, a.lat)

test/boundingboxes.jl

@@ -56,8 +56,13 @@
   d = GeometrySet([b, s])
   @test boundingbox(m) == Box(cart(-3, -2), cart(2, 2))
   @test boundingbox(d) == Box(cart(-3, -2), cart(2, 2))
-  @test @allocated(boundingbox(m)) < 2500
-  @test @allocated(boundingbox(d)) < 2500
+  if Sys.iswindows() && VERSION < v"1.10"
+    @test @allocated(boundingbox(m)) < 4100
+    @test @allocated(boundingbox(d)) < 4100
+  else
+    @test @allocated(boundingbox(m)) < 2600
+    @test @allocated(boundingbox(d)) < 2600
+  end
 
   b1 = Box(cart(0, 0), cart(1, 1))
   b2 = Box(cart(-1, -1), cart(0.5, 0.5))
@@ -119,6 +124,19 @@
   p = ParaboloidSurface(cart(1, 2, 3), T(5), T(4))
   @test boundingbox(p) ≈ Box(cart(-4, -3, 3), cart(6, 7, 73 / 16))
 
+  # latlon coordinates
+  t = Triangle(latlon(0, 0), latlon(0, 2), latlon(1, 1))
+  @test boundingbox(t) == Box(latlon(0, 0), latlon(1, 2))
+  @test @allocated(boundingbox(t)) < 50
+
+  p = Pentagon(latlon(1, 6), latlon(10, 2), latlon(16, 10), latlon(10, 18), latlon(1, 14))
+  @test boundingbox(p) == Box(latlon(1, 2), latlon(16, 18))
+  @test @allocated(boundingbox(p)) < 50
+
+  d = PointSet(latlon(0, 0), latlon(2, 1), latlon(1, 2))
+  @test boundingbox(d) == Box(latlon(0, 0), latlon(2, 2))
+  @test @allocated(boundingbox(d)) < 50
+
   # CRS propagation
   r = Ray(merc(-1, 1), vector(1, -1))
   @test crs(boundingbox(r)) === crs(r)