Move imports to main file

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

Author: asinghvi17

src/GeometryOps.jl

@@ -51,6 +51,9 @@ include("utils/NaturalIndexing.jl")
 using .NaturalIndexing
 
 
+# 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

@@ -7,7 +7,7 @@ import GeoInterface as GI
 import AbstractTrees
 
 # public isspatialtree, isleaf, getchild, nchild, child_indices_extents, node_extent
-export query, do_query
+export query
 export FlatNoTree
 
 # The spatial tree interface and its implementations are defined here.