Move imports to main file

Co-authored-by: Rafael Schouten <[email protected]>

Author: asinghvi17

src/GeometryOps.jl

@@ -44,6 +44,9 @@ include("utils/SpatialTreeInterface/SpatialTreeInterface.jl") # Utils for spatia
 include("utils/NaturalIndexing.jl") # Utils for natural indexing
 include("utils/utils.jl") # More general utility functions
 
+# Load utility modules in
+using .NaturalIndexing, .SpatialTreeInterface, .LoopStateMachine
+
 include("methods/angles.jl")
 include("methods/area.jl")
 include("methods/barycentric.jl")

src/utils/NaturalIndexing.jl

@@ -4,6 +4,7 @@ import GeoInterface as GI
 import Extents
 
 using ..SpatialTreeInterface
+export NaturalTree, NaturallyIndexedRing, prepare_naturally
 
 """
     NaturalLevel{E <: Extents.Extent}
@@ -228,8 +229,4 @@ function prepare_naturally(geom)
     end
 end
 
-export NaturalTree, NaturallyIndexedRing, prepare_naturally
-
-end # module NaturalIndexing
-
-using .NaturalIndexing
+end # module NaturalIndexing

src/utils/SpatialTreeInterface/SpatialTreeInterface.jl

@@ -6,6 +6,9 @@ import Extents
 import GeoInterface as GI
 import AbstractTrees
 
+# public isspatialtree, getchild, nchild, child_indices_extents
+export query, do_query
+
 # ## Interface
 # Interface definition for spatial tree types.
 # There is no abstract supertype here since it's impossible to enforce,
@@ -95,7 +98,6 @@ function do_query(f::F, predicate::P, node::N) where {F, P, N}
         end
     end
 end
-
 function do_query(predicate, node)
     a = Int[]
     do_query(Base.Fix1(push!, a), predicate, node)
@@ -221,6 +223,4 @@ function child_indices_extents(tree::FlatNoTree{T}) where T
     end
 end
 
-end # module SpatialTreeInterface
-
-using .SpatialTreeInterface
+end # module SpatialTreeInterface