Bump Makie compat to v0.21 (#90)

* Bump Makie compat to v0.21 * Try to make Tyler GeoMakie compatible This is not working at the moment because there are some strange interactions. Maybe it would be better to simply use a GeoAxis and let GeoMakie handle the conversion logic, that is currently done in Tyler. * Fix debug_tiles! * Allow Makie 0.21 * Remove show statements * REVERT LATER - let Tyler use any layoutable that can be plotted to * Fix debug tiles * Z-fighting happens more when z axis is scaled to 0 * Remove ImageMagick Compat is a pain and we can do the file type check using the magic bits from FileIO. * Fix tests (`scale` needs to be a float) --------- Co-authored-by: Felix Cremer <[email protected]>
MakieOrg · Jul 9, 2024 · ec0d356 · ec0d356
1 parent 866b8fe
commit ec0d356
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/Project.toml b/Project.toml
@@ -9,7 +9,6 @@ Extents = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 LRUCache = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
@@ -26,12 +25,11 @@ GeometryBasics = "0.4"
 HTTP = "1"
 LRUCache = "1"
 LinearAlgebra = "1"
-Makie = "0.20"
+Makie = "0.20, 0.21"
 MapTiles = "1"
 OrderedCollections = "1"
 ThreadSafeDicts = "0.1"
 TileProviders = "0.1"
-ImageMagick = "1.3"
 julia = "1"
 
 [extras]

diff --git a/src/Tyler.jl b/src/Tyler.jl
@@ -5,10 +5,10 @@ using Extents: Extents, Extent
 using GeoInterface: GeoInterface
 using GeometryBasics: GeometryBasics, GLTriangleFace, Point2f, Vec2f, Rect2f, Rect2, Rect, decompose, decompose_uv
 using HTTP: HTTP
-using ImageMagick: ImageMagick
 using LRUCache: LRUCache, LRU
 using MapTiles: MapTiles, Tile, TileGrid, web_mercator, wgs84, CoordinateReferenceSystemFormat
-using Makie: Makie, Observable, Figure, Axis, RGBAf, on, isopen, meta, mesh!, translate!, scale!
+using Makie: Makie, Observable, Figure, Axis, RGBAf, on, isopen, linesegments!, meta, mesh!, translate!, scale!
+using Makie: FileIO, ImageIO
 using OrderedCollections: OrderedCollections, OrderedSet
 using ThreadSafeDicts: ThreadSafeDicts, ThreadSafeDict
 using TileProviders: TileProviders, AbstractProvider, geturl, min_zoom, max_zoom
@@ -46,15 +46,15 @@ downloading and plotting more tiles as you zoom and pan.
 -`scale`: a tile scaling factor. Low number decrease the downloads but reduce the resolution.
     The default is `1.0`.
 """
-struct Map
+struct Map{A<:Makie.AbstractAxis}
     provider::AbstractProvider
     crs::CoordinateReferenceSystemFormat
     zoom::Observable{Int}
     figure::Figure
-    axis::Axis
+    axis::A
     displayed_tiles::OrderedSet{Tile}
     plots::Dict{Tile,Any}
-    free_tiles::Vector{Makie.Combined}
+    free_tiles::Vector{Makie.Plot}
     fetched_tiles::LRU{Tile,TileImage}
     max_parallel_downloads::Int
     # TODO, use Channel here
@@ -151,9 +151,15 @@ function Map(extent, extent_crs=wgs84;
     ext_target = MapTiles.project_extent(extent, extent_crs, crs)
     X = ext_target.X
     Y = ext_target.Y
-    axis.autolimitaspect = 1
-    Makie.limits!(axis, (X[1], X[2]), (Y[1], Y[2]))
-
+    if axis isa Makie.Axis3
+        Makie.xlims!(axis, X[1], X[2])
+        Makie.ylims!(axis, Y[1], Y[2])
+    elseif axis isa Makie.LScene
+        # do nothing
+    else # any other axis is 2d
+        axis.autolimitaspect = 1
+        Makie.limits!(axis, (X[1], X[2]), (Y[1], Y[2]))
+    end
     plots = Dict{Tile,Any}()
     tyler = Map(
         provider, crs,
@@ -163,7 +169,7 @@ function Map(extent, extent_crs=wgs84;
         max_parallel_downloads, OrderedSet{Tile}(),
         tiles_being_added, downloaded_tiles,
         display_task, download_task,
-        depth, halo, scale, max_zoom
+        depth, Float64(halo), Float64(scale), max_zoom
     )
     tyler.zoom[] = get_zoom(tyler, extent)
     download_task[] = @async begin
@@ -204,16 +210,21 @@ function Map(extent, extent_crs=wgs84;
     # Queue tiles to be downloaded & displayed
     update_tiles!(tyler, ext_target)
 
-    on(axis.scene, axis.finallimits) do extent
-        stopped_displaying(figure) && return
-        update_tiles!(tyler, extent)
-        return
+    if axis isa Union{Makie.Axis, Makie.Axis3} 
+        on(axis.scene, axis.finallimits) do extent
+            stopped_displaying(figure) && return
+            update_tiles!(tyler, extent)
+            return
+        end
+    else
+        # we can't hook it up so don't do anything.
+        # the user can zoom manually using `update_tiles!`.
     end
     return tyler
 end
 
 GeoInterface.crs(tyler::Map) = tyler.crs
-Extents.extent(tyler::Map) = Extents.extent(tyler.axis.finallimits[])
+Extents.extent(tyler::Map) = Extents.extent(Makie.Rect2d(tyler.axis.finallimits[]))
 
 function stop_download!(map::Map, tile::Tile)
     # delete!(map.tiles_being_added, tile)
@@ -261,7 +272,7 @@ function place_tile!(tile::Tile, plot, crs)
     xmin, xmax = bounds.X
     ymin, ymax = bounds.Y
     translate!(plot, xmin, ymin, tile.z - 100)
-    scale!(plot, xmax - xmin, ymax - ymin, 0)
+    scale!(plot, xmax - xmin, ymax - ymin, 1)
     return
 end
 
@@ -283,14 +294,17 @@ function create_tile_plot!(tyler::Map, tile::Tile, image::TileImage)
 end
 
 function fetch_tile(tyler::Map, tile::Tile)
+    #println("Fetching Tile")
     return get!(tyler.fetched_tiles, tile) do
         fetch_tile(tyler.provider, tile)
     end
 end
 function fetch_tile(provider::AbstractProvider, tile::Tile)
     url = TileProviders.geturl(provider, tile.x, tile.y, tile.z)
     result = HTTP.get(url; retry=false, readtimeout=4, connect_timeout=4)
-    return ImageMagick.readblob(result.body)
+    io = IOBuffer(result.body) # this wraps the byte data in an IO-like type
+    format = FileIO.query(io)  # this interrogates the magic bits to see what file format it is (JPEG, PNG, etc)
+    return FileIO.load(format) # this actually loads the data using ImageIO.jl or whatever other FileIO loader exists
 end
 
 function queue_tile!(tyler::Map, tile)
@@ -412,13 +426,13 @@ function grow_extent(area::Union{Rect,Extent}, factor)
 end
 
 function debug_tile!(map::Tyler.Map, tile::Tile)
-    plot = linesegments!(map.axis, Rect2f(0, 0, 1, 1), color=:red, linewidth=1)
+    plot = Makie.linesegments!(map.axis, Rect2f(0, 0, 1, 1), color=:red, linewidth=1)
     Tyler.place_tile!(tile, plot, web_mercator)
 end
 
 function debug_tiles!(map::Tyler.Map)
-    for tile in m.displayed_tiles
-        debug_tile!(m, tile)
+    for tile in map.displayed_tiles
+        debug_tile!(map, tile)
     end
 end