Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeoInterfaceMakie/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
20 changes: 13 additions & 7 deletions GeoInterfaceMakie/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading