bugfix 2d tile depth (#128)

* bugfix 2d tile depth

* tests, new numbers for tiles

* go back, locals are not like in ci, we need to control this better

* rm test manifest

* extent test

* do less

---------

Co-authored-by: Lazaro Alonso <[email protected]>

Author: rafaqz

Project.toml

@@ -42,7 +42,7 @@ FileIO = "1"
 GeoFormatTypes = "0.4"
 GeoInterface = "1"
 GeoMakie = "0.7.12"
-GeometryBasics = "0.4, 0.5"
+GeometryBasics = "0.5"
 GeometryOps = "0.1"
 HTTP = "1"
 ImageIO = "0.6"
@@ -51,7 +51,7 @@ LinearAlgebra = "1"
 Makie = "0.21.6, 0.22"
 MapTiles = "1"
 OrderedCollections = "1"
-PointClouds = "0.3, 0.4"
+PointClouds = "0.3"
 Proj = "1"
 Scratch = "1"
 Statistics = "1"

docs/Project.toml

@@ -21,5 +21,4 @@ TileProviders = "263fe934-28e1-4ae9-998a-c2629c5fede6"
 Tyler = "e170d443-b9d6-418a-9ee8-061e966341ef"
 
 [sources]
-OSMMakie = {url = "https://github.com/lazarusA/OSMMakie.jl/"}
-Tyler = {path = ".."}
+Tyler = {path = ".."}

docs/src/map-3d.md

@@ -54,7 +54,7 @@ delta = 0.008
 ext = Rect2f(lon - delta / 2, lat - delta / 2, delta, delta)
 provider = Tyler.GeoTilePointCloudProvider()
 image = ElevationProvider(nothing)
-cfg = Tyler.MeshScatterPlotconfig()
+cfg = Tyler.MeshScatterPlotconfig(; markersize=2)
 m1 = Tyler.Map3D(ext; provider=provider, plot_config=cfg)
 cfg = Tyler.PlotConfig(preprocess=pc -> map(p -> p .* 2, pc), shading=FastShading, colormap=:alpine)
 m2 = Tyler.Map3D(m1; provider=image, plot_config=cfg)

src/map.jl

@@ -134,7 +134,7 @@ function Map(extent, extent_crs=wgs84;
                 # That means we won't plot this tile and it should not be in the queue anymore
                 delete!(map.should_get_plotted, tile_key(map.provider, tile))
             else
-                create_tile_plot!(map, tile, data)
+                create_tyler_plot!(map, tile, data)
             end
         catch e
             @warn "error while creating tile" exception = (e, Base.catch_backtrace())

src/tile-fetching.jl

@@ -50,12 +50,7 @@ function update_tiles!(m::Map, arealike)
 
     # Move all plots to the back, that aren't in the newest tileset anymore
     for (key, (plot, tile, bounds)) in m.plots
-        dist = abs(m.zoom[] - tile.z)
-        if haskey(m.foreground_tiles, tile)
-            move_in_front!(plot, dist, bounds)
-        else
-            move_to_back!(plot, dist, bounds)
-        end
+        move_z(m, plot, tile, bounds)
     end
 
     # Remove any item from queue, that isn't in the new set

src/tile-plotting.jl

@@ -4,7 +4,7 @@ function move_in_front!(plot, amount, ::Rect2)
     if !hasproperty(plot, :depth_shift)
         translate!(plot, 0, 0, amount)
     else
-        plot.depth_shift = -amount / 100f0
+        plot.depth_shift = -amount / 10000f0
     end
 end
 
@@ -13,10 +13,31 @@ function move_to_back!(plot, amount, ::Rect2)
     if !hasproperty(plot, :depth_shift)
         translate!(plot, 0, 0, -amount)
     else
-        plot.depth_shift = amount / 100f0
+        plot.depth_shift = amount / 10000f0
     end
 end
 
+move_z(m::AbstractMap, plot, tile::Tile, bounds::Rect3) = nothing
+function move_z(m::AbstractMap, plot, tile::Tile, bounds::Rect2)
+    # We want to see everything of the current zoom and more zoomed out, 
+    # to fill gaps until they load
+    if haskey(m.foreground_tiles, tile)
+        plot.visible = true
+        amount = -tile.z
+    elseif m.zoom[] >= tile.z
+        # @show "zoom is more or equal tile"
+        plot.visible = true
+        # move_to_front!(plot, amount, bounds)
+        # If we are zoomed in we want to see everything
+        # of that zoom and more zoomed out, to fill gaps until they load
+        amount = 30 - tile.z # Flip the order for negative shift
+        move_to_back!(plot, amount, bounds)
+    else
+        plot.visible = false
+    end
+    # @show m.zoom[] tile.z amount shift
+end
+
 struct PlotConfig <: AbstractPlotConfig
     attributes::Dict{Symbol, Any}
     preprocess::Function
@@ -126,7 +147,7 @@ function cull_plots!(m::Map)
     end
 end
 
-function create_tile_plot!(m::AbstractMap, tile::Tile, data)
+function create_tyler_plot!(m::AbstractMap, tile::Tile, data)
     # For providers which have to map the same data to different tiles
     # Or providers that have e.g. additional parameters like a date
     # the url is a much better key than the tile itself
@@ -149,16 +170,10 @@ function create_tile_plot!(m::AbstractMap, tile::Tile, data)
     cull_plots!(m)
 
     if isempty(m.unused_plots)
-        mplot = create_tileplot!(cfg, m.axis, data_processed, bounds, (tile, m.crs))
+        mplot = create_tileplot!(cfg, m.axis, m, data_processed, bounds, (tile, m.crs))
     else
         mplot = pop!(m.unused_plots)
-        update_tile_plot!(mplot, cfg, m.axis, data_processed, bounds, (tile, m.crs))
-    end
-
-    if haskey(m.foreground_tiles, tile)
-        move_in_front!(mplot, abs(m.zoom[] - tile.z), bounds)
-    else
-        move_to_back!(mplot, abs(m.zoom[] - tile.z), bounds)
+        update_tile_plot!(mplot, cfg, m.axis, m, data_processed, bounds, (tile, m.crs))
     end
 
     # Always move new plots to the front
@@ -195,7 +210,7 @@ function get_bounds(tile::Tile, data::ElevationData, crs)
 end
 
 function create_tileplot!(
-    config::PlotConfig, axis::AbstractAxis, data::ElevationData, bounds::Rect, tile_crs
+    config::PlotConfig, axis::AbstractAxis, m, data::ElevationData, bounds::Rect, tile_crs
 )
     # not so elegant with empty array, we may want to make this a bit nicer going forward
     color = isempty(data.color) ? (;) : (color=data.color,)
@@ -215,7 +230,7 @@ function create_tileplot!(
 end
 
 function update_tile_plot!(
-    plot::Surface, ::PlotConfig, ::AbstractAxis, data::ElevationData, bounds::Rect, tile_crs
+    plot::Surface, ::PlotConfig, ::AbstractAxis, m, data::ElevationData, bounds::Rect, tile_crs
 )
     mini, maxi = extrema(bounds)
     plot.args[1].val = (mini[1], maxi[1])
@@ -234,7 +249,7 @@ end
 const ImageData = AbstractMatrix{<:Colorant}
 
 function create_tileplot!(
-    config::PlotConfig, axis::AbstractAxis, data::ImageData, bounds::Rect, tile_crs
+    config::PlotConfig, axis::AbstractAxis, m, data::ImageData, bounds::Rect, (tile, crs)
 )
     mini, maxi = extrema(bounds)
     plot = Makie.image!(
@@ -244,11 +259,12 @@ function create_tileplot!(
         inspectable=false,
         config.attributes...
     )
+    translate!(plot, 0, 0, -10)
     return plot
 end
 
 function update_tile_plot!(
-    plot::Makie.Image, ::PlotConfig, axis::AbstractAxis, data::ImageData, bounds::Rect, tile_crs
+    plot::Makie.Image, ::PlotConfig, axis::AbstractAxis, m, data::ImageData, bounds::Rect, tile_crs
 )
     mini, maxi = extrema(bounds)
     plot[1] = (mini[1], maxi[1])
@@ -280,7 +296,7 @@ function Base.map(f::Function, data::PointCloudData)
 end
 
 function create_tileplot!(
-    config::PlotConfig, axis::AbstractAxis, data::PointCloudData, ::Rect, tile_crs
+    config::PlotConfig, axis::AbstractAxis, m, data::PointCloudData, ::Rect, tile_crs
 )
     p = Makie.scatter!(
         axis.scene, data.points;
@@ -296,7 +312,7 @@ function create_tileplot!(
 end
 
 function update_tile_plot!(
-    plot::Makie.Scatter, ::PlotConfig, ::AbstractAxis, data::PointCloudData, bounds::Rect, tile_crs
+    plot::Makie.Scatter, ::PlotConfig, ::AbstractAxis, m, data::PointCloudData, bounds::Rect, tile_crs
 )
     plot.color.val = data.color
     plot[1] = data.points
@@ -312,7 +328,7 @@ get_preprocess(config::AbstractPlotConfig) = get_preprocess(config.plcfg)
 get_postprocess(config::AbstractPlotConfig) = get_postprocess(config.plcfg)
 
 function create_tileplot!(
-    config::MeshScatterPlotconfig, axis::AbstractAxis, data::PointCloudData, ::Rect, tile_crs
+    config::MeshScatterPlotconfig, axis::AbstractAxis, m, data::PointCloudData, ::Rect, tile_crs
 )
     m = Rect3f(Vec3f(0), Vec3f(1))
     p = Makie.meshscatter!(
@@ -327,7 +343,7 @@ function create_tileplot!(
 end
 
 function update_tile_plot!(
-    plot::Makie.MeshScatter, ::MeshScatterPlotconfig, ::AbstractAxis, data::PointCloudData, bounds::Rect, tile_crs
+    plot::Makie.MeshScatter, ::MeshScatterPlotconfig, ::AbstractAxis, m, data::PointCloudData, bounds::Rect, tile_crs
 )
     plot.color = data.color
     plot[1] = data.points
@@ -347,7 +363,7 @@ DebugPlotConfig(; plot_attributes...) =
     DebugPlotConfig(Dict{Symbol,Any}(plot_attributes))
 
 function create_tileplot!(
-    config::DebugPlotConfig, axis::AbstractAxis, data::ImageData, bounds::Rect, tile_crs
+    config::DebugPlotConfig, axis::AbstractAxis, m, data::ImageData, bounds::Rect, tile_crs
 )
     plot = Makie.poly!(
         axis.scene,
@@ -363,7 +379,7 @@ function create_tileplot!(
 end
 
 function update_tile_plot!(
-    plot::Makie.Poly, ::DebugPlotConfig, axis::AbstractAxis, data::ImageData, bounds::Rect, tile_crs
+    plot::Makie.Poly, ::DebugPlotConfig, axis::AbstractAxis, m, data::ImageData, bounds::Rect, tile_crs
 )
     plot[1] = bounds
     plot.color = reverse(data; dims=1)