Skip to content

s57: widen the pick to the mark the shells draw #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beetlebugorg merged 1 commit into from
Aug 4, 2026
Merged

s57: widen the pick to the mark the shells draw #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/chart.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,6 +1809,13 @@ fn composeTileGpuScene(src: *compose_mod.ComposeSource, z: u8, x: u32, y: u32, p
return out;
}

/// The pick's tolerance in px, and the contract a shell's mark makes.
///
/// A shell marks the pick with a circle 34 px across. Everything under that
/// circle must be in the report, so the tolerance is the mark's radius. A
/// smaller tolerance misses objects the circle plainly covers.
pub const PICK_RADIUS_PX = 17.0;

/// Cursor object-query over a runtime compositor (the S-52 §10.8 pick across the
/// whole composed set — seams included): replay the composed tile covering
/// (lon,lat) at the view zoom through a QuerySurface and report each feature the
Expand Down Expand Up @@ -1838,7 +1845,7 @@ pub fn composeQueryPoint(src: *compose_mod.ComposeSource, lon: f64, lat: f64, zo
var qs = render.query.QuerySurface{
.qx = @floatFromInt(local.x),
.qy = @floatFromInt(local.y),
.radius = 6.0 * upp, // 6 px, whatever the tile is stretched to
.radius = PICK_RADIUS_PX * upp, // whatever the tile is stretched to
.view_zoom = zoom, // raw view zoom for the SCAMIN cull
.cb = &inner_cb,
.store = if (store) |st| st.asStore() else null,
Expand Down Expand Up @@ -2886,7 +2893,7 @@ pub const Chart = struct {
var qs = render.query.QuerySurface{
.qx = @floatFromInt(local.x),
.qy = @floatFromInt(local.y),
.radius = 6.0 * upp, // 6 px, whatever the tile is stretched to
.radius = PICK_RADIUS_PX * upp, // whatever the tile is stretched to
.view_zoom = zoom, // raw view zoom for the SCAMIN cull
.cb = &inner_cb,
.store = if (store) |st| st.asStore() else null,
Expand Down
Loading