summaryrefslogtreecommitdiff
path: root/crates/gipfel-web/src
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2026-10-27 11:37:41 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2026-10-27 11:37:41 +0100
commit21487476293a77518e81c91ecdc0fbd4c4b74a25 (patch)
treea73687a9ae1b1bf82af0ff367f0e3fdf26e7db52 /crates/gipfel-web/src
parent574655e57a3790c08659adc87d3a9c5a45da4f0d (diff)
web: W2 — hill DB, metadata-driven viewpoint, markers and auto-fit
- 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).
Diffstat (limited to 'crates/gipfel-web/src')
-rw-r--r--crates/gipfel-web/src/app.rs219
-rw-r--r--crates/gipfel-web/src/bridge.rs17
-rw-r--r--crates/gipfel-web/src/canvas_view.rs269
-rw-r--r--crates/gipfel-web/src/main.rs1
-rw-r--r--crates/gipfel-web/src/markers.rs48
5 files changed, 493 insertions, 61 deletions
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: `<input type=file>` 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<Vec<u8>, 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::<web_sys::ImageBitmap>);
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::<Marker>::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<u8>, 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<MarkerView> = {
+ 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! {
<div class="app" ondrop={on_drop} ondragover={on_dragover}>
<aside class="sidebar">
<h1>{ "gipfel" }</h1>
- <p class="tag">{ "web · W1 scaffold" }</p>
+ <p class="tag">{ "web · W2 markers" }</p>
<button onclick={open_picker}>{ "Open image…" }</button>
<button onclick={fit} disabled={bitmap.is_none()}>{ "Fit to window" }</button>
<input
@@ -171,12 +346,22 @@ pub fn app() -> Html {
onchange={on_file_change}
/>
<p class="status">{ (*status).clone() }</p>
+ <p class="hint">{ (*db_status).clone() }</p>
if bitmap.is_some() {
- <p class="hint">{ format!("zoom: {zoom_pct:.0} %") }</p>
+ <label class="row">
+ <input type="checkbox" checked={*fit_distortion} onchange={on_distortion_toggle} />
+ { "Fit distortion (needs ≥ 4 markers)" }
+ </label>
+ <p class="hint">{ format!("{n_markers} markers · zoom {zoom_pct:.0} %") }</p>
+ if !fit_info.is_empty() {
+ <p class="fitinfo">{ (*fit_info).clone() }</p>
+ }
}
- <p class="hint">{ "Drag to pan, wheel to zoom. Drop a JPEG anywhere." }</p>
+ <p class="hint">
+ { "Click a green dot to mark that peak · drag markers to adjust · right-click a marker to remove." }
+ </p>
<p class="hint dim">
- { "Peak identification, fitting and saving arrive in W2/W3." }
+ { "The view is fitted automatically once 4+ markers are placed." }
</p>
</aside>
<main class="main">
@@ -186,6 +371,8 @@ pub fn app() -> Html {
{callbacks}
canvas_ref={canvas_ref.clone()}
tick={*tick}
+ markers={marker_views}
+ candidates={candidates}
/>
</main>
</div>
diff --git a/crates/gipfel-web/src/bridge.rs b/crates/gipfel-web/src/bridge.rs
index 1353279..a60b1f6 100644
--- a/crates/gipfel-web/src/bridge.rs
+++ b/crates/gipfel-web/src/bridge.rs
@@ -36,6 +36,23 @@ pub async fn read_blob(blob: &Blob) -> Result<Vec<u8>, String> {
Ok(Uint8Array::new(&buf).to_vec())
}
+/// Fetch a URL (same-origin) into memory.
+pub async fn fetch_bytes(url: &str) -> Result<Vec<u8>, String> {
+ let resp = JsFuture::from(window().fetch_with_str(url))
+ .await
+ .map_err(|e| format!("fetch {url}: {e:?}"))?;
+ let resp: web_sys::Response = resp
+ .dyn_into()
+ .map_err(|_| "bad response".to_string())?;
+ if !resp.ok() {
+ return Err(format!("{url}: HTTP {}", resp.status()));
+ }
+ let buf = JsFuture::from(resp.array_buffer().map_err(|_| "array_buffer".to_string())?)
+ .await
+ .map_err(|e| format!("body: {e:?}"))?;
+ Ok(Uint8Array::new(&buf).to_vec())
+}
+
pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option<CanvasRenderingContext2d> {
canvas
.get_context("2d")
diff --git a/crates/gipfel-web/src/canvas_view.rs b/crates/gipfel-web/src/canvas_view.rs
index 87b89d9..4282bc0 100644
--- a/crates/gipfel-web/src/canvas_view.rs
+++ b/crates/gipfel-web/src/canvas_view.rs
@@ -1,7 +1,8 @@
//! Viewport canvas: browser-native bitmap blitted with a pan/zoom
-//! transform. Overlay drawing (markers, labels, compass) is added in W3.
+//! transform, plus the marker overlay and its interactions.
-use web_sys::{HtmlCanvasElement, ImageBitmap, PointerEvent, WheelEvent};use yew::prelude::*;
+use web_sys::{HtmlCanvasElement, ImageBitmap, MouseEvent, PointerEvent, WheelEvent};
+use yew::prelude::*;
use crate::bridge;
@@ -14,11 +15,27 @@ pub struct ViewState {
pub oy: f64,
}
+/// A marker in center-relative image coordinates.
+#[derive(Clone, Debug, PartialEq)]
+pub struct MarkerView {
+ pub x: f64,
+ pub y: f64,
+ pub name: String,
+}
+
#[derive(Clone, PartialEq)]
pub struct ViewCallbacks {
pub pan: Callback<(f64, f64)>,
/// (cursor x, cursor y, factor) — zoom anchored at the cursor.
pub zoom: Callback<(f64, f64, f64)>,
+ /// click on empty space: (x, y) center-relative image coords
+ pub click: Callback<(f64, f64)>,
+ /// drag a marker: (marker index, dx, dy) in image coords
+ pub marker_drag: Callback<(usize, f64, f64)>,
+ /// a marker drag finished (time to refit)
+ pub drag_end: Callback<()>,
+ /// right-click: (x, y) center-relative image coords
+ pub context: Callback<(f64, f64)>,
}
#[derive(Properties, PartialEq)]
@@ -29,41 +46,66 @@ pub struct Props {
pub canvas_ref: NodeRef,
/// bumped on window resize to force a redraw
pub tick: u32,
+ pub markers: Vec<MarkerView>,
+ /// projected positions of all visible hills (small guide dots)
+ pub candidates: Vec<(f64, f64)>,
+}
+
+#[derive(Clone, PartialEq)]
+enum DragMode {
+ Pan,
+ Marker(usize),
+}
+
+#[derive(PartialEq)]
+struct DragState {
+ mode: Option<DragMode>,
+ last: (f64, f64),
+ start: (f64, f64),
+ moved: bool,
}
#[function_component(CanvasView)]
pub fn canvas_view(props: &Props) -> Html {
- let dragging = use_mut_ref(|| false);
- let last = use_mut_ref(|| (0.0f64, 0.0f64));
+ let drag = use_mut_ref(|| DragState {
+ mode: None,
+ last: (0.0, 0.0),
+ start: (0.0, 0.0),
+ moved: false,
+ });
- // redraw on every view/bitmap change and on resize ticks
+ // redraw on every view/bitmap/marker change and on resize ticks
{
let bitmap = props.bitmap.clone();
let view = props.view.clone();
let canvas_ref = props.canvas_ref.clone();
- use_effect_with((bitmap, view, props.tick), move |(bitmap, view, _tick)| {
- let Some(canvas) = canvas_ref.cast::<HtmlCanvasElement>() else {
- return;
- };
- let Some(ctx) = bridge::ctx2d(&canvas) else {
- return;
- };
- let dpr = bridge::window().device_pixel_ratio();
- let cw = canvas.client_width() as f64;
- let ch = canvas.client_height() as f64;
- // keep the backing store in sync with the CSS size
- let bw = (cw * dpr).max(1.0) as u32;
- let bh = (ch * dpr).max(1.0) as u32;
- if canvas.width() != bw || canvas.height() != bh {
- canvas.set_width(bw);
- canvas.set_height(bh);
- }
- let _ = ctx.set_transform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
- // web-sys 0.3: set_fill_style takes a JsValue (deprecated alias)
- #[allow(deprecated)]
- ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("#101014"));
- ctx.fill_rect(0.0, 0.0, canvas.width() as f64, canvas.height() as f64);
- if let Some(bitmap) = bitmap {
+ let markers = props.markers.clone();
+ let candidates = props.candidates.clone();
+ use_effect_with(
+ (bitmap, view, props.tick, markers.clone(), candidates.clone()),
+ move |(bitmap, view, _tick, markers, candidates)| {
+ let Some(canvas) = canvas_ref.cast::<HtmlCanvasElement>() else {
+ return;
+ };
+ let Some(ctx) = bridge::ctx2d(&canvas) else {
+ return;
+ };
+ let dpr = bridge::window().device_pixel_ratio();
+ let cw = canvas.client_width() as f64;
+ let ch = canvas.client_height() as f64;
+ // keep the backing store in sync with the CSS size
+ let bw = (cw * dpr).max(1.0) as u32;
+ let bh = (ch * dpr).max(1.0) as u32;
+ if canvas.width() != bw || canvas.height() != bh {
+ canvas.set_width(bw);
+ canvas.set_height(bh);
+ }
+ let _ = ctx.set_transform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
+ // web-sys 0.3: set_fill_style takes a JsValue (deprecated alias)
+ #[allow(deprecated)]
+ ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("#101014"));
+ ctx.fill_rect(0.0, 0.0, canvas.width() as f64, canvas.height() as f64);
+ let Some(bitmap) = bitmap else { return };
let _ = ctx.set_transform(
dpr * view.scale,
0.0,
@@ -73,47 +115,183 @@ pub fn canvas_view(props: &Props) -> Html {
dpr * view.oy,
);
let _ = ctx.draw_image_with_image_bitmap(bitmap, 0.0, 0.0);
- }
- });
+
+ // overlays in screen space
+ let _ = ctx.set_transform(dpr, 0.0, 0.0, dpr, 0.0, 0.0);
+ let hw = bitmap.width() as f64 / 2.0;
+ let hh = bitmap.height() as f64 / 2.0;
+ let sx = |x: f64| (x + hw) * view.scale + view.ox;
+ let sy = |y: f64| (y + hh) * view.scale + view.oy;
+
+ // guide dots for all visible peaks
+ #[allow(deprecated)]
+ ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(120, 220, 160, 0.8)"));
+ for (cx, cy) in candidates {
+ let (px, py) = (sx(*cx), sy(*cy));
+ if px < -4.0 || py < -4.0 || px > cw + 4.0 || py > ch + 4.0 {
+ continue;
+ }
+ ctx.fill_rect(px - 1.5, py - 1.5, 3.0, 3.0);
+ }
+
+ // markers: red cross + name
+ ctx.set_font("12px system-ui, sans-serif");
+ for m in markers {
+ let (px, py) = (sx(m.x), sy(m.y));
+ #[allow(deprecated)]
+ ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 64, 64)"));
+ ctx.set_line_width(1.5);
+ ctx.begin_path();
+ ctx.move_to(px - 5.0, py);
+ ctx.line_to(px + 5.0, py);
+ ctx.move_to(px, py - 5.0);
+ ctx.line_to(px, py + 5.0);
+ ctx.stroke();
+ if !m.name.is_empty() {
+ // dark shadow + white text stays readable on any photo
+ #[allow(deprecated)]
+ ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.8)"));
+ ctx.fill_text(&m.name, px + 7.0, py - 5.0).ok();
+ #[allow(deprecated)]
+ ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("white"));
+ ctx.fill_text(&m.name, px + 6.0, py - 6.0).ok();
+ }
+ }
+ },
+ );
}
+ // screen (client) -> center-relative image coordinates
+ let to_img = {
+ let canvas_ref = props.canvas_ref.clone();
+ let view = props.view.clone();
+ let bitmap = props.bitmap.clone();
+ let w = bitmap.as_ref().map(|b| b.width() as f64).unwrap_or(0.0);
+ let h = bitmap.as_ref().map(|b| b.height() as f64).unwrap_or(0.0);
+ move |client_x: f64, client_y: f64| -> (f64, f64) {
+ let rect = canvas_ref
+ .cast::<HtmlCanvasElement>()
+ .map(|c| c.get_bounding_client_rect());
+ let (rx, ry) = match rect {
+ Some(r) => (client_x - r.left(), client_y - r.top()),
+ None => (client_x, client_y),
+ };
+ (
+ (rx - view.ox) / view.scale - w / 2.0,
+ (ry - view.oy) / view.scale - h / 2.0,
+ )
+ }
+ };
+
let on_pointerdown = {
- let dragging = dragging.clone();
- let last = last.clone();
+ let drag = drag.clone();
let canvas_ref = props.canvas_ref.clone();
+ let markers = props.markers.clone();
+ let view = props.view.clone();
+ let bitmap = props.bitmap.clone();
Callback::from(move |e: PointerEvent| {
e.prevent_default();
if let Some(c) = canvas_ref.cast::<HtmlCanvasElement>() {
let _ = c.set_pointer_capture(e.pointer_id());
}
- *dragging.borrow_mut() = true;
- *last.borrow_mut() = (e.client_x() as f64, e.client_y() as f64);
+ let rect = canvas_ref
+ .cast::<HtmlCanvasElement>()
+ .map(|c| c.get_bounding_client_rect());
+ let (rx, ry) = match rect {
+ Some(r) => (e.client_x() as f64 - r.left(), e.client_y() as f64 - r.top()),
+ None => (e.client_x() as f64, e.client_y() as f64),
+ };
+ // marker hit-test (screen space, 12 px radius)
+ let mut mode = DragMode::Pan;
+ if let Some(bmp) = &bitmap {
+ let hw = bmp.width() as f64 / 2.0;
+ let hh = bmp.height() as f64 / 2.0;
+ for (i, m) in markers.iter().enumerate().rev() {
+ let px = (m.x + hw) * view.scale + view.ox;
+ let py = (m.y + hh) * view.scale + view.oy;
+ if (rx - px).hypot(ry - py) < 12.0 {
+ mode = DragMode::Marker(i);
+ break;
+ }
+ }
+ }
+ let pos = (e.client_x() as f64, e.client_y() as f64);
+ let mut d = drag.borrow_mut();
+ d.mode = Some(mode);
+ d.last = pos;
+ d.start = pos;
+ d.moved = false;
})
};
+
let on_pointermove = {
- let dragging = dragging.clone();
- let last = last.clone();
+ let drag = drag.clone();
let pan = props.callbacks.pan.clone();
+ let marker_drag = props.callbacks.marker_drag.clone();
+ let scale = props.view.scale;
Callback::from(move |e: PointerEvent| {
- if !*dragging.borrow() {
+ let mut d = drag.borrow_mut();
+ let mode = match &d.mode {
+ Some(m) => m.clone(),
+ None => return,
+ };
+ let pos = (e.client_x() as f64, e.client_y() as f64);
+ let dx = pos.0 - d.last.0;
+ let dy = pos.1 - d.last.1;
+ d.last = pos;
+ if (pos.0 - d.start.0).hypot(pos.1 - d.start.1) > 3.0 {
+ d.moved = true;
+ }
+ if !d.moved {
return;
}
- let cur = (e.client_x() as f64, e.client_y() as f64);
- let prev = *last.borrow();
- *last.borrow_mut() = cur;
- pan.emit((cur.0 - prev.0, cur.1 - prev.1));
+ match mode {
+ DragMode::Pan => pan.emit((dx, dy)),
+ DragMode::Marker(i) => marker_drag.emit((i, dx / scale, dy / scale)),
+ }
})
};
+
let on_pointerup = {
- let dragging = dragging.clone();
+ let drag = drag.clone();
let canvas_ref = props.canvas_ref.clone();
+ let click = props.callbacks.click.clone();
+ let drag_end = props.callbacks.drag_end.clone();
+ let to_img = to_img.clone();
Callback::from(move |e: PointerEvent| {
- *dragging.borrow_mut() = false;
+ let mode = drag.borrow_mut().mode.take();
if let Some(c) = canvas_ref.cast::<HtmlCanvasElement>() {
let _ = c.release_pointer_capture(e.pointer_id());
}
+ let moved = drag.borrow().moved;
+ match mode {
+ Some(DragMode::Pan) if !moved => {
+ let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64);
+ click.emit((ix, iy));
+ }
+ Some(DragMode::Marker(_)) if moved => drag_end.emit(()),
+ _ => {}
+ }
+ })
+ };
+
+ let on_pointercancel = {
+ let drag = drag.clone();
+ Callback::from(move |_: PointerEvent| {
+ drag.borrow_mut().mode = None;
})
};
+
+ let on_contextmenu = {
+ let context = props.callbacks.context.clone();
+ let to_img = to_img.clone();
+ Callback::from(move |e: MouseEvent| {
+ e.prevent_default();
+ let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64);
+ context.emit((ix, iy));
+ })
+ };
+
let on_wheel = {
let zoom = props.callbacks.zoom.clone();
let canvas_ref = props.canvas_ref.clone();
@@ -140,8 +318,9 @@ pub fn canvas_view(props: &Props) -> Html {
class="viewport"
onpointerdown={on_pointerdown}
onpointermove={on_pointermove}
- onpointerup={on_pointerup.clone()}
- onpointercancel={on_pointerup}
+ onpointerup={on_pointerup}
+ onpointercancel={on_pointercancel}
+ oncontextmenu={on_contextmenu}
onwheel={on_wheel}
/>
}
diff --git a/crates/gipfel-web/src/main.rs b/crates/gipfel-web/src/main.rs
index 6a3e4d4..8a39039 100644
--- a/crates/gipfel-web/src/main.rs
+++ b/crates/gipfel-web/src/main.rs
@@ -1,6 +1,7 @@
mod app;
mod bridge;
mod canvas_view;
+mod markers;
fn main() {
yew::Renderer::<app::App>::new().render();
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<Hill> = 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<usize> = (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<usize> {
+ 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
+}