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/app.rs | 219 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 203 insertions(+), 16 deletions(-) (limited to 'crates/gipfel-web/src/app.rs') diff --git a/crates/gipfel-web/src/app.rs b/crates/gipfel-web/src/app.rs index 9e8c543..8512d6a 100644 --- a/crates/gipfel-web/src/app.rs +++ b/crates/gipfel-web/src/app.rs @@ -1,8 +1,12 @@ -//! Root component: sidebar (open/fit/status) + viewport canvas. -//! File loading: `` and drag-and-drop, decoded by the -//! browser into an ImageBitmap (see `bridge`). +//! Root component: sidebar (open/fit/status/fit-toggle) + viewport canvas. +//! Owns the `Panorama` and the marker list; refits on every marker change. +use std::io::Read; use std::rc::Rc; + +use flate2::read::GzDecoder; +use gipfel_core::metadata::{apply_image_metadata, ImageMetaData}; +use gipfel_core::panorama::Panorama; use wasm_bindgen::closure::Closure; use wasm_bindgen::JsCast; use wasm_bindgen_futures::spawn_local; @@ -10,16 +14,30 @@ use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, MouseEvent} use yew::prelude::*; use crate::bridge; -use crate::canvas_view::{CanvasView, ViewCallbacks, ViewState}; +use crate::canvas_view::{CanvasView, MarkerView, ViewCallbacks, ViewState}; +use crate::markers::{self, Marker}; + +fn gunzip(gz: &[u8]) -> Result, String> { + let mut raw = Vec::new(); + GzDecoder::new(gz) + .read_to_end(&mut raw) + .map(|_| raw) + .map_err(|e| format!("gunzip: {e}")) +} #[function_component(App)] pub fn app() -> Html { let bitmap = use_state(|| None::); let view = use_state(ViewState::default); let status = use_state(|| "No image loaded.".to_string()); + let db_status = use_state(|| "Loading hill database…".to_string()); + let fit_info = use_state(String::new); let tick = use_state(|| 0u32); let canvas_ref = use_node_ref(); let file_ref = use_node_ref(); + let pan = use_mut_ref(Panorama::new); + let markers = use_state(Vec::::new); + let fit_distortion = use_state(|| false); // force a redraw when the window is resized so the canvas backing // store tracks its CSS size (listener lives as long as the app) @@ -34,6 +52,31 @@ pub fn app() -> Html { }); } + // load the hill database once at startup + { + let pan = pan.clone(); + let db_status = db_status.clone(); + use_effect_with((), move |_| { + spawn_local(async move { + let result = async { + let gz = bridge::fetch_bytes("gipfel.dat.gz").await?; + let raw = gunzip(&gz)?; + pan.borrow_mut() + .load_data_from_bytes(&raw) + .map_err(|e| format!("load: {e}")) + } + .await; + match result { + Ok(()) => { + let n = pan.borrow().hills.len(); + db_status.set(format!("Hill database: {n} peaks")); + } + Err(e) => db_status.set(format!("Hill database failed: {e}")), + } + }); + }); + } + // Fit the current bitmap into the canvas, centered. let fit = { let bitmap = bitmap.clone(); @@ -58,21 +101,57 @@ pub fn app() -> Html { }) }; - // Decode dropped/selected bytes and display them, fitting to view. + // refit the projection to the given markers and update the status line + let do_refit = { + let pan = pan.clone(); + let fit_info = fit_info.clone(); + let fit_distortion = fit_distortion.clone(); + Rc::new(move |mk: &[Marker]| { + let info = { + let mut p = pan.borrow_mut(); + match markers::refit(&mut p, mk, *fit_distortion) { + Ok(()) if mk.len() >= 4 => format!( + "fit: az {:.2}° · pitch {:.2}° · roll {:.2}° · scale {:.1}", + p.get_center_angle(), + p.get_pitch_angle(), + p.get_roll_angle(), + p.get_scale() + ), + Ok(()) => format!("{} markers — place at least 4 to fit", mk.len()), + Err(e) => format!("fit failed: {e}"), + } + }; + fit_info.set(info); + }) + }; + + // Decode selected/dropped bytes: display, read metadata, reset markers. let load_bytes = { let bitmap = bitmap.clone(); let status = status.clone(); let fit = fit.clone(); + let pan = pan.clone(); + let markers = markers.clone(); + let fit_info = fit_info.clone(); Callback::from(move |(bytes, name): (Vec, String)| { - let (bitmap, status, fit) = (bitmap.clone(), status.clone(), fit.clone()); + let (bitmap, status, fit, pan, markers, fit_info) = + (bitmap.clone(), status.clone(), fit.clone(), pan.clone(), markers.clone(), fit_info.clone()); spawn_local(async move { match bridge::decode_bitmap(&bytes).await { Ok(bmp) => { - status.set(format!( - "{name} — {}×{} px", - bmp.width(), - bmp.height() - )); + let (w, h) = (bmp.width(), bmp.height()); + let mut md = ImageMetaData::new(); + md.load_image_from_bytes(&bytes); + let have = apply_image_metadata(&mut pan.borrow_mut(), &md, w, h); + let vis = pan.borrow().visible.len(); + let vp = if have { + format!("viewpoint from image · {vis} peaks visible") + } else { + "no gipfel/EXIF viewpoint in this image".to_string() + }; + status.set(format!("{name} — {w}×{h} px · {vp}")); + markers.set(Vec::new()); + fit_info.set(String::new()); bitmap.set(Some(bmp)); fit.emit(MouseEvent::new("fit").unwrap()); } @@ -112,7 +191,11 @@ pub fn app() -> Html { let status = status.clone(); Callback::from(move |e: DragEvent| { e.prevent_default(); - match e.data_transfer().and_then(|dt| dt.files()).and_then(|fl| fl.item(0)) { + match e + .data_transfer() + .and_then(|dt| dt.files()) + .and_then(|fl| fl.item(0)) + { Some(file) => read_file(file), None => status.set("Dropped item was not a file.".to_string()), } @@ -129,6 +212,17 @@ pub fn app() -> Html { }) }; + let on_distortion_toggle = { + let fit_distortion = fit_distortion.clone(); + let markers = markers.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + fit_distortion.set(input.checked()); + do_refit(&markers); + }) + }; + let callbacks = ViewCallbacks { pan: { let view = view.clone(); @@ -152,15 +246,96 @@ pub fn app() -> Html { }); }) }, + click: { + let pan = pan.clone(); + let markers = markers.clone(); + let view = view.clone(); + let status = status.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let p = pan.borrow_mut(); + match markers::nearest_hill(&p, ix, iy, 20.0 / view.scale) { + None => status.set( + "No peak near click — click on a green dot (zoom in to separate them)." + .to_string(), + ), + Some(idx) => { + let mut mk = (*markers).clone(); + mk.retain(|m| m.hill != idx); + mk.push(Marker { + hill: idx, + x: ix, + y: iy, + }); + drop(p); + do_refit(&mk); + markers.set(mk); + } + } + }) + }, + marker_drag: { + let markers = markers.clone(); + Callback::from(move |(i, dx, dy): (usize, f64, f64)| { + let mut mk = (*markers).clone(); + if let Some(m) = mk.get_mut(i) { + m.x += dx; + m.y += dy; + } + markers.set(mk); + }) + }, + drag_end: { + let markers = markers.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |_: ()| do_refit(&markers)) + }, + context: { + let markers = markers.clone(); + let view = view.clone(); + let status = status.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let mut mk = (*markers).clone(); + let before = mk.len(); + let r = 20.0 / view.scale; + mk.retain(|m| (m.x - ix).hypot(m.y - iy) >= r); + if mk.len() < before { + do_refit(&mk); + markers.set(mk); + status.set("Marker removed.".to_string()); + } else { + status.set("Right-click a marker to remove it.".to_string()); + } + }) + }, + }; + + // overlay data for the canvas + let marker_views: Vec = { + let p = pan.borrow(); + markers + .iter() + .map(|m| MarkerView { + x: m.x, + y: m.y, + name: p.hills[m.hill].name.clone(), + }) + .collect() + }; + let candidates: Vec<(f64, f64)> = { + let p = pan.borrow(); + p.visible.iter().map(|&i| (p.hills[i].x, p.hills[i].y)).collect() }; let zoom_pct = (view.scale * 100.0).round(); + let n_markers = markers.len(); html! {
@@ -186,6 +371,8 @@ pub fn app() -> Html { {callbacks} canvas_ref={canvas_ref.clone()} tick={*tick} + markers={marker_views} + candidates={candidates} />
-- cgit v1.2.3