Fix up the tests

Author: asinghvi17

test/utils/SpatialTreeInterface.jl

@@ -92,37 +92,47 @@ function test_dual_query_functionality(TreeType)
         dual_depth_first_search((i, j) -> push!(results, (i, j)), intersects_pred, tree1, tree2)
         @test sort(results) == [(1,1), (2,1), (2,2)]
     end
+    @testset "Dual tree query with many boundingboxes" begin
+        xs = 1:100
+        ys = 1:100
+        extent_grid = [Extents.Extent(X=(x, x+1), Y=(y, y+1)) for x in xs, y in ys] |> vec
+        point_grid = [(x + 0.5, y + 0.5) for x in xs, y in ys] |> vec
 
-    @testset "Dual query functionality - every country's polylabel against every country" begin
-
-        # Note that this is a perfectly balanced tree query - we don't yet have a test for unbalanced
-        # trees (but could easily add one, e.g. by getting polylabels of admin-1 or admin-2 regions)
-        # from Natural Earth, or by using GADM across many countries.
-
-        all_countries = NaturalEarth.naturalearth("admin_0_countries", 10)
-        all_adm0_a3 = all_countries.ADM0_A3
-        all_geoms = all_countries.geometry
-        # US minor outlying islands - bug in Polylabel.jl
-        # A lot of small geoms have this issue, that there will be an error from the queue
-        # because the cell exists in the queue already.
-        # Not sure what to do about it, I don't want to check containment every time...
-        deleteat!(all_adm0_a3, 205)
-        deleteat!(all_geoms, 205)
-
-        geom_tree = TreeType(all_geoms)
-
-        polylabels = [Polylabel.polylabel(geom; rtol = 0.019) for geom in all_geoms]
-        polylabel_tree = TreeType(polylabels)
-
-        found_countries = falses(length(polylabels))
+        extent_tree = TreeType(extent_grid)
+        point_tree = TreeType(point_grid)
 
-        dual_depth_first_search(Extents.intersects, geom_tree, polylabel_tree) do i, j
+        found_everything = falses(length(extent_grid))
+        dual_depth_first_search(Extents.intersects, extent_tree, point_tree) do i, j
             if i == j
-                found_countries[i] = true
+                found_everything[i] = true
             end
         end
+        @test all(found_everything)
+    end
+end
 
-        @test all(found_countries)
+function test_geometry_support(TreeType)
+    @testset "Geometry support" begin
+        # Create a tree with 100 points
+        points = tuple.(1:100, 1:100)
+        tree = TreeType(points)
+        
+        # Test basic interface
+        @test isspatialtree(tree)
+        @test isspatialtree(typeof(tree))
+        
+        # Test query functionality
+        all_pred = x -> true
+        results = query(tree, all_pred)
+        @test sort(results) == collect(1:100)
+
+        none_pred = x -> false
+        results = query(tree, none_pred)
+        @test isempty(results)
+
+        search_extent = Extents.Extent(X=(45.0, 55.0), Y=(45.0, 55.0))
+        results = query(tree, Base.Fix1(Extents.intersects, search_extent))
+        @test sort(results) == collect(45:55)
     end
 end
 
@@ -153,54 +163,62 @@ function test_find_point_in_all_countries(TreeType)
     end
 end
 
-function test_geometry_support(TreeType)
-    @testset "Geometry support" begin
-        # Create a tree with 100 points
-        points = tuple.(1:100, 1:100)
-        tree = TreeType(points)
-        
-        # Test basic interface
-        @test isspatialtree(tree)
-        @test isspatialtree(typeof(tree))
-        
-        # Test query functionality
-        all_pred = x -> true
-        results = query(tree, all_pred)
-        @test sort(results) == collect(1:100)
-
-        none_pred = x -> false
-        results = query(tree, none_pred)
-        @test isempty(results)
-
-        search_extent = Extents.Extent(X=(45.0, 55.0), Y=(45.0, 55.0))
-        results = query(tree, Base.Fix1(Extents.intersects, search_extent))
-        @test sort(results) == collect(45:55)
-    end
-end
-
 # Test FlatNoTree implementation
 @testset "FlatNoTree" begin
-    @testset let TreeType = FlatNoTree
-        test_basic_interface(TreeType)
-        test_child_indices_extents(TreeType)
-        test_query_functionality(TreeType)
-        test_dual_query_functionality(TreeType)
-        test_geometry_support(TreeType)
-        test_find_point_in_all_countries(TreeType)
-    end
+    test_basic_interface(FlatNoTree)
+    test_child_indices_extents(FlatNoTree)
+    test_query_functionality(FlatNoTree)
+    test_dual_query_functionality(FlatNoTree)
+    test_geometry_support(FlatNoTree)
+    test_find_point_in_all_countries(FlatNoTree)
 end
 
 # Test STRtree implementation
 @testset "STRtree" begin
-    @testset let TreeType = STRtree
-        test_basic_interface(TreeType)
-        test_child_indices_extents(TreeType)
-        test_query_functionality(TreeType)
-        test_dual_query_functionality(TreeType)
-        test_geometry_support(TreeType)
-        test_find_point_in_all_countries(TreeType)
-    end
+    test_basic_interface(STRtree)
+    test_child_indices_extents(STRtree)
+    test_query_functionality(STRtree)
+    test_dual_query_functionality(STRtree)
+    test_geometry_support(STRtree)
+    test_find_point_in_all_countries(STRtree)
 end
 
 
 
+# This testset is not used because Polylabel.jl has some issues.
+
+#=
+
+
+    @testset "Dual query functionality - every country's polylabel against every country" begin
+
+        # Note that this is a perfectly balanced tree query - we don't yet have a test for unbalanced
+        # trees (but could easily add one, e.g. by getting polylabels of admin-1 or admin-2 regions)
+        # from Natural Earth, or by using GADM across many countries.
+
+        all_countries = NaturalEarth.naturalearth("admin_0_countries", 10)
+        all_adm0_a3 = all_countries.ADM0_A3
+        all_geoms = all_countries.geometry
+        # US minor outlying islands - bug in Polylabel.jl
+        # A lot of small geoms have this issue, that there will be an error from the queue
+        # because the cell exists in the queue already.
+        # Not sure what to do about it, I don't want to check containment every time...
+        deleteat!(all_adm0_a3, 205)
+        deleteat!(all_geoms, 205)
+
+        geom_tree = TreeType(all_geoms)
+
+        polylabels = [Polylabel.polylabel(geom; rtol = 0.019) for geom in all_geoms]
+        polylabel_tree = TreeType(polylabels)
+
+        found_countries = falses(length(polylabels))
+
+        dual_depth_first_search(Extents.intersects, geom_tree, polylabel_tree) do i, j
+            if i == j
+                found_countries[i] = true
+            end
+        end
+
+        @test all(found_countries)
+    end
+=#