use traittarget in application_level for fix

Author: asinghvi17

src/transformations/correction/closed_ring.jl

@@ -46,7 +46,7 @@ See also [`GeometryCorrection`](@ref).
 """
 struct ClosedRing <: GeometryCorrection end
 
-application_level(::ClosedRing) = GI.PolygonTrait
+application_level(::ClosedRing) = TraitTarget(GI.PolygonTrait())
 
 function (::ClosedRing)(::GI.PolygonTrait, polygon)
     exterior = _close_linear_ring(GI.getexterior(polygon))

src/transformations/correction/cut_at_antimeridian.jl

@@ -44,7 +44,7 @@ function Base.show(io::IO, cut::CutAtAntimeridian)
 end
 Base.show(io::IO, ::MIME"text/plain", cut::CutAtAntimeridian) = Base.show(io, cut)
 
-application_level(::CutAtAntimeridian) = Union{GI.PolygonTrait, GI.LineStringTrait, GI.MultiLineStringTrait, GI.MultiPolygonTrait}
+application_level(::CutAtAntimeridian) = TraitTarget(GI.PolygonTrait(), GI.LineStringTrait(), GI.MultiLineStringTrait(), GI.MultiPolygonTrait())
 
 function (c::CutAtAntimeridianAndPoles)(trait::GI.AbstractTrait, geom)
     return _AntimeridianHelpers.cut_at_antimeridian(trait, geom)

src/transformations/correction/geometry_correction.jl

@@ -33,8 +33,13 @@ This abstract type represents a geometry correction.
 ## Interface
 
 Any `GeometryCorrection` must implement two functions:
-    * `application_level(::GeometryCorrection)::AbstractGeometryTrait`: This function should return the `GeoInterface` trait that the correction is intended to be applied to, like `PointTrait` or `LineStringTrait` or `PolygonTrait`.
-    * `(::GeometryCorrection)(::AbstractGeometryTrait, geometry)::(some_geometry)`: This function should apply the correction to the given geometry, and return a new geometry.
+  - `application_level(::GeometryCorrection)::TraitTarget`: This function should 
+  return the `GeoInterface` trait that the correction is intended to be applied to, 
+  like `PointTrait` or `LineStringTrait` or `PolygonTrait`.  It can also return a 
+  union of traits via `TraitTarget`, but that behaviour is a bit tricky...
+  - `(::GeometryCorrection)(::AbstractGeometryTrait, geometry)::(some_geometry)`: 
+  This function should apply the correction to the given geometry, and return a new 
+  geometry.
 """
 abstract type GeometryCorrection end
 
@@ -44,15 +49,17 @@ application_level(gc::GeometryCorrection) = error("Not implemented yet for $(gc)
 
 (gc::GeometryCorrection)(trait::GI.AbstractGeometryTrait, geometry) = error("Not implemented yet for $(gc) and $(trait).")
 
-function fix(geometry; corrections = GeometryCorrection[ClosedRing(),], kwargs...)
-    traits = application_level.(corrections)
+function fix(geometry; corrections = GeometryCorrection[ClosedRing(), CutAtAntimeridianAndPoles()], kwargs...)
+    application_levels = application_level.(corrections)
     final_geometry = geometry
-    for Trait in (GI.PointTrait, GI.MultiPointTrait, GI.LineStringTrait, GI.LinearRingTrait, GI.MultiLineStringTrait, GI.PolygonTrait, GI.MultiPolygonTrait)
-        available_corrections = findall(x -> x == Trait, traits)
+    for trait in (GI.PointTrait(), GI.MultiPointTrait(), GI.LineStringTrait(), GI.LinearRingTrait(), GI.MultiLineStringTrait(), GI.PolygonTrait(), GI.MultiPolygonTrait())
+        available_corrections = findall(x -> trait in x, application_levels)
         isempty(available_corrections) && continue
-        @debug "Correcting for $(Trait)"
+        @debug "Correcting for $(trait), with corrections: " available_corrections
         net_function = reduce(∘, corrections[available_corrections])
-        final_geometry = apply(net_function, Trait, final_geometry; kwargs...)
+        # TODO: this allocates too much, because it keeps reconstructing higher level geoms.
+        # We might want some way to embed the fixes in reconstruct/rebuild, which would imply a modified apply pipeline...
+        final_geometry = apply(net_function, trait, final_geometry; kwargs...)
     end
     return final_geometry
 end

src/transformations/correction/intersecting_polygons.jl

@@ -56,7 +56,7 @@ See also [`GeometryCorrection`](@ref).
 """
 struct UnionIntersectingPolygons <: GeometryCorrection end
 
-application_level(::UnionIntersectingPolygons) = GI.MultiPolygonTrait
+application_level(::UnionIntersectingPolygons) = TraitTarget(GI.MultiPolygonTrait())
 
 function (::UnionIntersectingPolygons)(::GI.MultiPolygonTrait, multipoly)
     union_multipoly = tuples(multipoly)
@@ -99,7 +99,7 @@ See also [`GeometryCorrection`](@ref), [`UnionIntersectingPolygons`](@ref).
 """
 struct DiffIntersectingPolygons <: GeometryCorrection end
 
-application_level(::DiffIntersectingPolygons) = GI.MultiPolygonTrait
+application_level(::DiffIntersectingPolygons) = TraitTarget(GI.MultiPolygonTrait())
 
 function (::DiffIntersectingPolygons)(::GI.MultiPolygonTrait, multipoly)
     diff_multipoly = tuples(multipoly)