From 21487476293a77518e81c91ecdc0fbd4c4b74a25 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 11:37:41 +0100 Subject: web: W2 — hill DB, metadata-driven viewpoint, markers and auto-fit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fetch gipfel.dat.gz at startup, gunzip (flate2, pure Rust) and load into a Panorama held in app state - image loads now also parse the gipfel JPEG comment / EXIF and set the viewpoint via apply_image_metadata (same path as desktop) - markers: click a visible-peak guide dot to mark it, drag to adjust, right-click to remove; refit (comp_params_with, distortion locked by default) after every change once >= 4 markers - sidebar: fit-distortion toggle, marker/zoom readout, fitted az/pitch/roll/scale line - canvas: guide dots for visible peaks, red crosses + shadowed labels - serve-here.sh: dev helper (cargo build --target wasm32 + wasm-bindgen + gzip the DB into the static dist dir) Verified: cargo check clean for wasm32; runtime to be confirmed in browser against a gipfel-saved photo (W2 acceptance: fit must match the desktop result on the same image). --- crates/gipfel-web/src/markers.rs | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 crates/gipfel-web/src/markers.rs (limited to 'crates/gipfel-web/src/markers.rs') diff --git a/crates/gipfel-web/src/markers.rs b/crates/gipfel-web/src/markers.rs new file mode 100644 index 0000000..279c62c --- /dev/null +++ b/crates/gipfel-web/src/markers.rs @@ -0,0 +1,48 @@ +//! Markers: user observations of hills at image positions, plus the +//! refit entry point. Coordinates are center-relative image pixels, +//! matching the projection output space (same convention as the +//! desktop viewport widget). + +use gipfel_core::hill::Hill; +use gipfel_core::panorama::Panorama; + +#[derive(Clone, Debug, PartialEq)] +pub struct Marker { + /// index into `Panorama::hills` (stable: load order is preserved) + pub hill: usize, + pub x: f64, + pub y: f64, +} + +/// Refit the projection parameters to the current markers. +/// With fewer than 4 markers nothing can be fitted (same rule as desktop). +pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Result<(), String> { + if markers.len() < 4 { + return Ok(()); + } + let mut obs: Vec = Vec::with_capacity(markers.len()); + for m in markers { + let mut h = pan.hills[m.hill].clone(); + h.x = m.x; + h.y = m.y; + obs.push(h); + } + let known: Vec = (0..markers.len()).collect(); + pan.comp_params_with(&obs, &known, fit_distortion) +} + +/// Nearest visible hill to image position `(x, y)`, within `max_dist` +/// image pixels. Used to resolve marker clicks. +pub fn nearest_hill(pan: &Panorama, x: f64, y: f64, max_dist: f64) -> Option { + let mut best = None; + let mut best_d = max_dist; + for &i in &pan.visible { + let h = &pan.hills[i]; + let d = (h.x - x).hypot(h.y - y); + if d < best_d { + best_d = d; + best = Some(i); + } + } + best +} -- cgit v1.2.3