From 9b50c4fcc8ac7c8558dbc0c23929d00414c7067d Mon Sep 17 00:00:00 2001 From: Felix Cremer Date: Fri, 3 Nov 2023 10:10:57 +0100 Subject: [PATCH] Upgrade to Extents 0.1.2 (#63) * Upgrade to Extents 0.1.2 * Explicitly restrict ImageMagick_jll Restrict ImageMagick_jll to 6.9.12. Fixes ImageMagick_jll dependancies causing issues #58 * Actually restrict ImageMagick_jll --- Project.toml | 4 +++- src/Tyler.jl | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index e5069669..2477d37d 100644 --- a/Project.toml +++ b/Project.toml @@ -10,6 +10,7 @@ GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" +ImageMagick_jll = "c73af94c-d91f-53ed-93a7-00f77d67a9d7" LRUCache = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" @@ -20,11 +21,12 @@ TileProviders = "263fe934-28e1-4ae9-998a-c2629c5fede6" [compat] Colors = "0.12" -Extents = "0.1" +Extents = "0.1.2" GeoInterface = "1" GeometryBasics = "0.4" HTTP = "1" ImageMagick = "1" +ImageMagick_jll = "~6.9.12" LRUCache = "1" Makie = "0.19" MapTiles = "1" diff --git a/src/Tyler.jl b/src/Tyler.jl index 24a85429..62a6f870 100644 --- a/src/Tyler.jl +++ b/src/Tyler.jl @@ -331,9 +331,9 @@ function update_tiles!(tyler::Map, area::Union{Rect,Extent}) halo_area = grow_extent(area, tyler.halo) # We don't mind that the middle tiles are the same, the OrderedSet will remove them # Define all the tiles in the order they will load in areas = if Extents.intersects(mouse_halo_area, area) - mha = Extents.intersect(mouse_halo_area, area) + mha = Extents.intersection(mouse_halo_area, area) if Extents.intersects(mouse_area, area) - [Extents.intersect(mouse_area, area), mha, area, halo_area] + [Extents.intersection(mouse_area, area), mha, area, halo_area] else [mha, area, halo_area] end