use new uv transform

MakieOrg · Aug 14, 2024 · 18260e2 · 18260e2
1 parent c6c38f9
commit 18260e2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -41,7 +41,7 @@ HTTP = "1"
 ImageIO = "0.6"
 LRUCache = "1"
 LinearAlgebra = "1"
-Makie = "0.21"
+Makie = "0.21.6"
 MapTiles = "1"
 OrderedCollections = "1"
 Proj = "1"

diff --git a/docs/src/map-3d.md b/docs/src/map-3d.md
@@ -24,7 +24,7 @@ delta = 0.3
 ext = Rect2f(lon - delta / 2, lat - delta / 2, delta, delta)
 cfg = Tyler.PlotConfig(
     preprocess=pc -> map(p -> p .* 2, pc),
-    shading=FastShading,
+    shading=FastShading, colorrange=(2000, 5000),
     colormap=:alpine
 )
 m = Tyler.Map3D(ext; provider=ElevationProvider(nothing), plot_config=cfg)

diff --git a/src/provider/elevation/elevation-provider.jl b/src/provider/elevation/elevation-provider.jl
@@ -43,13 +43,13 @@ function fetch_tile(provider::ElevationProvider, dl::PathDownloader, tile::Tile)
     mini = -450
     maxi = 8700
     elevation_img = collect(reverse(band; dims=2))
-    elevation_img .= Float32.(elevation_img) # .* (maxi - mini) .+ mini
+    elevation_img .= Float32.(elevation_img)
     if isnothing(provider.color_provider)
         return Tyler.ElevationData(elevation_img, Matrix{RGBf}(undef, 0, 0), Vec2d(mini, maxi))
     end
     foto_img = get!(provider.tile_cache, path) do
         dl = provider.downloader[Threads.threadid()]
         fetch_tile(provider.color_provider, dl, tile)
     end
-    return Tyler.ElevationData(elevation_img, rotr90(foto_img), Vec2d(mini, maxi))
+    return Tyler.ElevationData(elevation_img, foto_img, Vec2d(mini, maxi))
 end
diff --git a/src/tile-plotting.jl b/src/tile-plotting.jl
@@ -197,10 +197,12 @@ function create_tileplot!(config::PlotConfig, axis::AbstractAxis, data::Elevatio
     # not so elegant with empty array, we may want to make this a bit nicer going forward
     color = isempty(data.color) ? (;) : (color=data.color,)
     mini, maxi = extrema(bounds)
+    uv_transform = isempty(data.color) ? Makie.automatic : Mat{2,3,Float32}(0, 1, 1, 0, 0, 0)
     p = Makie.surface!(
         axis.scene,
         (mini[1], maxi[1]), (mini[2], maxi[2]), data.elevation;
         color...,
+        uv_transform = uv_transform,
         shading=Makie.NoShading,
         inspectable=false,
         colorrange=data.elevation_range,
@@ -230,7 +232,8 @@ function create_tileplot!(config::PlotConfig, axis::AbstractAxis, data::ImageDat
     mini, maxi = extrema(bounds)
     plot = Makie.image!(
         axis.scene,
-        (mini[1], maxi[1]), (mini[2], maxi[2]), rotr90(data);
+        (mini[1], maxi[1]), (mini[2], maxi[2]), data;
+        uv_transform=Mat{2,3,Float32}(0, 1, 1, 0, 0, 0),
         inspectable=false,
         config.attributes...
     )
@@ -241,11 +244,10 @@ function update_tile_plot!(plot::Makie.Image, ::PlotConfig, axis::AbstractAxis,
     mini, maxi = extrema(bounds)
     plot[1] = (mini[1], maxi[1])
     plot[2] = (mini[2], maxi[2])
-    plot[3] = rotr90(data)
+    plot[3] = data
     return
 end
 
-
 ############################
 #### PointCloudData Data plotting
 ####
@@ -317,7 +319,6 @@ function update_tile_plot!(plot::Makie.MeshScatter, ::MeshScatterPlotconfig, ::A
 end
 
 
-
 ############################
 #### Debug tile plotting (image only for now)
 ####