diff --git a/src/methods/geom_relations/common.jl b/src/methods/geom_relations/common.jl index b190f8f1fb..f8e1f92e9c 100644 --- a/src/methods/geom_relations/common.jl +++ b/src/methods/geom_relations/common.jl @@ -10,6 +10,18 @@ for f in (:coveredby, :crosses, :disjoint, :overlaps, :touches, :within) $_f(::GI.FeatureTrait, g1, ::GI.FeatureTrait, g2; kw...) = $f(GI.geometry(g1), GI.geometry(g2); kw...) # Extent forwarding + $_f(t1::GI.FeatureTrait, f1, ::GI.RectangleTrait, e::Extents.Extent; kw...) = + $_f(t1, f1, GI.PolygonTrait(), extent_to_polygon(e); kw...) + $_f(::GI.RectangleTrait, e1::Extents.Extent, t2::GI.FeatureTrait, f2; kw...) = + $_f(GI.PolygonTrait(), extent_to_polygon(e1), t2, f2; kw...) + $_f(t1::GI.AbstractGeometryTrait, g1, ::GI.RectangleTrait, e::Extents.Extent; kw...) = + $_f(t1, g1, GI.PolygonTrait(), extent_to_polygon(e); kw...) + $_f(::GI.RectangleTrait, e1::Extents.Extent, t2::GI.AbstractGeometryTrait, g2; kw...) = + $_f(GI.PolygonTrait(), extent_to_polygon(e1), t2, g2; kw...) + $_f(::GI.RectangleTrait, e1::Extents.Extent, ::GI.RectangleTrait, e2::Extents.Extent; kw...) = + Extents.$f(e1, e2) + + # Backwards compatibility for when Extent traits were Nothing $_f(t1::GI.FeatureTrait, f1, ::Nothing, e::Extents.Extent; kw...) = $_f(t1, f1, GI.PolygonTrait(), extent_to_polygon(e); kw...) $_f(::Nothing, e1::Extents.Extent, t2::GI.FeatureTrait, f2; kw...) = @@ -19,10 +31,10 @@ for f in (:coveredby, :crosses, :disjoint, :overlaps, :touches, :within) $_f(::Nothing, e1::Extents.Extent, t2::GI.AbstractGeometryTrait, g2; kw...) = $_f(GI.PolygonTrait(), extent_to_polygon(e1), t2, g2; kw...) $_f(::Nothing, e1::Extents.Extent, ::Nothing, e2::Extents.Extent; kw...) = - Extents.$f(e1, e2) - - # Table rows ? or error - $_f(::Nothing, g1, ::GI.FeatureTrait, f2; kw...) = $f(_geometry_or_error(g1; kw...), f2) + Extents.$f(e1, e2) + + # Table rows ? or error + $_f(::Nothing, g1, ::GI.FeatureTrait, f2; kw...) = $f(_geometry_or_error(g1; kw...), f2) $_f(::GI.FeatureTrait, f1, ::Nothing, g2; kw...) = $f(f1, _geometry_or_error(g2; kw...)) $_f(::Nothing, g1, ::GI.AbstractGeometryTrait, g2; kw...) = $f(_geometry_or_error(g1; kw...), g2) $_f(::GI.AbstractGeometryTrait, g1, ::Nothing, g2; kw...) = $f(g1, _geometry_or_error(g2; kw...))