diff --git a/GeoInterfaceMakie/Project.toml b/GeoInterfaceMakie/Project.toml index 8435df9..e4c52d9 100644 --- a/GeoInterfaceMakie/Project.toml +++ b/GeoInterfaceMakie/Project.toml @@ -11,7 +11,7 @@ MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b" [compat] GeoInterface = "1" GeometryBasics = "0.4.4, 0.5" -MakieCore = "0.5.1, 0.6, 0.7.1, 0.8" +MakieCore = "0.5.1, 0.6, 0.7.1, 0.8, 0.9" julia = "1.6" [extras] diff --git a/GeoInterfaceMakie/test/runtests.jl b/GeoInterfaceMakie/test/runtests.jl index 9e4001e..e95b2f4 100644 --- a/GeoInterfaceMakie/test/runtests.jl +++ b/GeoInterfaceMakie/test/runtests.jl @@ -34,18 +34,24 @@ end ] fig = Figure() for (i, geom) in enumerate(geoms) - Makie.plot!(Axis(fig[i, 1], title="$(GI.geomtrait(geom))"), geom) - if geom == multipoint - # `plot!` wont even work with the GeometryBasics version of this - continue - elseif geom == multipolygon + # Even the GeometryBasics version of this will fail + # though the conversion succeeds, so we skip this + geom == multipoint && continue + # Construct a plot inside an axis + Makie.plot(fig[i, 1], geom; axis = (; type = Axis, title = "$(GI.geomtrait(geom))")) + + if geom == multipolygon # `plot!` wont work with the GeometryBasics version of this either # But `poly!` does - @test_nowarn Makie.poly!(Axis(fig[i, 2], title="Vector of $(GI.geomtrait(geom))"), [geom, geom]) + @test_nowarn Makie.poly(fig[i, 2], [geom, geom]; axis = (; type = Axis, title = "Vector of $(GI.geomtrait(geom))")) else - @test_nowarn Makie.plot!(Axis(fig[i, 2], title="Vector of $(GI.geomtrait(geom))"), [geom, geom]) + @test_nowarn Makie.plot(fig[i, 2], [geom, geom]; axis = (; type = Axis, title = "Vector of $(GI.geomtrait(geom))")) end end + + @test_nowarn Makie.update_state_before_display!(fig) + @test_nowarn Makie.colorbuffer(fig.scene) + fig end