From 912a2d0b15b873923698126ac8112d1aa4bdbb1a Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 10:08:22 +0100 Subject: wasm: experimental browser spike Proves the gipfel core can run in the browser via WASM. Enabled by the earlier GSL removal: the core is now pure Rust. gipfel-core gains byte-oriented entry points (no filesystem) alongside the existing path-based ones: - hill::load_from_bytes, Panorama::load_data_from_bytes - metadata: load_image_from_bytes, read_jpeg_comment_from_bytes, write_jpeg_comment_to_bytes, save_image_to_bytes (EXIF via Cursor) New crate gipfel-wasm (experimental, not shipped with the app): - wasm-bindgen surface: version() + fit_demo(db_bytes, jpg_bytes) which runs the whole pipeline in memory: parse hill DB, read gipfel JPEG comment / EXIF, synthesize 5 observations from visible hills, perturb, refit (pure-Rust LM), report JSON with reprojection error - demo/index.html: file pickers + result pane (wasm-pack --target web) - build.sh: adds the wasm target, builds with wasm-pack, prints serve cmd - native test runs the same pipeline against gipfel.dat + test.jpg and asserts sub-pixel reprojection error (passes here) To try on a machine with rustup: cd crates/gipfel-wasm && ./build.sh --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index e9aa0be..60a554a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app"] +members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm"] # Single source of truth for metadata inherited by every crate via # `version.workspace = true` etc. Bump `version` here on release; the -- cgit v1.2.3 From 2ac8e530b8fb9ca4fa073e1e25a4230a83d99c5d Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 10:48:03 +0100 Subject: web: W1 scaffold — Yew app with image display, pan and zoom MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First milestone of wasm-plan.md: - new crate gipfel-web: Yew 0.21 (csr), canvas 2D viewport - file input + drag-and-drop; browser-native decode via createImageBitmap (faster than image-crate decode in wasm, GPU-backed blitting) - pan (pointer drag with capture, touch-ready) and cursor-anchored wheel zoom, DPR-aware canvas sizing, fit-to-window - dark sidebar shell: open/fit buttons, status line - Trunk.toml + www/ (index.html, style.css); README with dev setup Verified: cargo check clean (native and wasm32-unknown-unknown), release wasm builds (5.3 MB pre-wasm-opt), all 38 native tests pass. Runtime behavior to be confirmed with trunk serve on a desktop browser. --- .gitignore | 1 + Cargo.lock | 645 ++++++++++++++++++++++++++++++++++- Cargo.toml | 2 +- crates/gipfel-web/Cargo.toml | 37 ++ crates/gipfel-web/README.md | 46 +++ crates/gipfel-web/Trunk.toml | 2 + crates/gipfel-web/src/app.rs | 193 +++++++++++ crates/gipfel-web/src/bridge.rs | 45 +++ crates/gipfel-web/src/canvas_view.rs | 148 ++++++++ crates/gipfel-web/src/main.rs | 7 + crates/gipfel-web/www/index.html | 11 + crates/gipfel-web/www/style.css | 77 +++++ 12 files changed, 1201 insertions(+), 13 deletions(-) create mode 100644 crates/gipfel-web/Cargo.toml create mode 100644 crates/gipfel-web/README.md create mode 100644 crates/gipfel-web/Trunk.toml create mode 100644 crates/gipfel-web/src/app.rs create mode 100644 crates/gipfel-web/src/bridge.rs create mode 100644 crates/gipfel-web/src/canvas_view.rs create mode 100644 crates/gipfel-web/src/main.rs create mode 100644 crates/gipfel-web/www/index.html create mode 100644 crates/gipfel-web/www/style.css (limited to 'Cargo.toml') diff --git a/.gitignore b/.gitignore index 07849dd..fbccf5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /target tests/harness/build/ crates/gipfel-wasm/pkg/ +crates/gipfel-web/dist/ *.tmp gipfel-app-bin.tar.gz diff --git a/Cargo.lock b/Cargo.lock index 02fdc71..a01b90b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,6 +172,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + [[package]] name = "apply" version = "0.3.0" @@ -475,6 +481,15 @@ dependencies = [ "serde", ] +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bit-set" version = "0.8.0" @@ -551,6 +566,12 @@ dependencies = [ "piper", ] +[[package]] +name = "boolinator" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" + [[package]] name = "borsh" version = "1.8.1" @@ -791,6 +812,16 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "031ad3d167622974ed636505ae4556267ed4aa2aea0464122fa6bc9698a32825" +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + [[package]] name = "const-oid" version = "0.10.2" @@ -1705,8 +1736,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1782,6 +1815,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gipfel-web" +version = "0.5.5" +dependencies = [ + "gipfel-core", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew", +] + [[package]] name = "gl_generator" version = "0.14.0" @@ -1799,6 +1844,353 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +[[package]] +name = "gloo" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +dependencies = [ + "gloo-console 0.2.3", + "gloo-dialogs 0.1.1", + "gloo-events 0.1.2", + "gloo-file 0.2.3", + "gloo-history 0.1.5", + "gloo-net 0.3.1", + "gloo-render 0.1.1", + "gloo-storage 0.2.2", + "gloo-timers 0.2.6", + "gloo-utils 0.1.7", + "gloo-worker 0.2.1", +] + +[[package]] +name = "gloo" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +dependencies = [ + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.2", + "gloo-net 0.4.0", + "gloo-render 0.2.0", + "gloo-storage 0.3.0", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", + "gloo-worker 0.4.0", +] + +[[package]] +name = "gloo-console" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-console" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" +dependencies = [ + "gloo-utils 0.2.0", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" +dependencies = [ + "gloo-events 0.1.2", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" +dependencies = [ + "gloo-events 0.2.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +dependencies = [ + "gloo-events 0.1.2", + "gloo-utils 0.1.7", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_urlencoded", + "thiserror 1.0.69", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6" +dependencies = [ + "getrandom 0.2.17", + "gloo-events 0.2.0", + "gloo-utils 0.2.0", + "serde", + "serde-wasm-bindgen 0.6.5", + "serde_urlencoded", + "thiserror 1.0.69", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.1.7", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror 1.0.69", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac9e8288ae2c632fa9f8657ac70bfe38a1530f345282d7ba66a1f70b72b7dc4" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror 1.0.69", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "serde_json", + "thiserror 1.0.69", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" +dependencies = [ + "gloo-utils 0.2.0", + "js-sys", + "serde", + "serde_json", + "thiserror 1.0.69", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +dependencies = [ + "anymap2", + "bincode", + "gloo-console 0.2.3", + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" +dependencies = [ + "bincode", + "futures", + "gloo-utils 0.2.0", + "gloo-worker-macros", + "js-sys", + "pinned", + "serde", + "thiserror 1.0.69", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-worker-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "glow" version = "0.16.0" @@ -1958,6 +2350,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "hybrid-array" version = "0.4.15" @@ -2409,6 +2812,26 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" +[[package]] +name = "implicit-clone" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a9aa791c7b5a71b636b7a68207fdebf171ddfc593d9c8506ec4cbc527b6a84" +dependencies = [ + "implicit-clone-derive", + "indexmap", +] + +[[package]] +name = "implicit-clone-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "699c1b6d335e63d0ba5c1e1c7f647371ce989c3bcbe1f7ed2b85fa56e3bd1a21" +dependencies = [ + "quote", + "syn 2.0.119", +] + [[package]] name = "indexmap" version = "2.14.2" @@ -3098,6 +3521,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "num_enum" version = "0.7.6" @@ -3114,7 +3547,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.119", @@ -3567,6 +4000,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bee6c73da26345c729282832b60b0363cf3dd9f4bfd81d8551b7a1c889a113" +[[package]] +name = "pinned" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +dependencies = [ + "futures", + "rustversion", + "thiserror 1.0.69", +] + [[package]] name = "piper" version = "0.2.5" @@ -3675,13 +4119,57 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.119", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + [[package]] name = "proc-macro-crate" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit", + "toml_edit 0.25.17+spec-1.1.0", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", ] [[package]] @@ -3734,6 +4222,23 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5" +[[package]] +name = "prokio" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +dependencies = [ + "futures", + "gloo 0.8.1", + "num_cpus", + "once_cell", + "pin-project", + "pinned", + "tokio", + "tokio-stream", + "wasm-bindgen-futures", +] + [[package]] name = "pxfm" version = "0.1.30" @@ -4101,6 +4606,12 @@ dependencies = [ "unicode-script", ] +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + [[package]] name = "same-file" version = "1.0.6" @@ -4157,6 +4668,28 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_core" version = "1.0.229" @@ -4203,6 +4736,18 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.11.1" @@ -4459,6 +5004,16 @@ dependencies = [ "zeno", ] +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.119" @@ -4718,6 +5273,12 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" + [[package]] name = "toml_datetime" version = "1.1.2+spec-1.1.0" @@ -4727,6 +5288,17 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime 0.6.11", + "winnow 0.5.40", +] + [[package]] name = "toml_edit" version = "0.25.17+spec-1.1.0" @@ -4734,9 +5306,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c" dependencies = [ "indexmap", - "toml_datetime", + "toml_datetime 1.1.2+spec-1.1.0", "toml_parser", - "winnow", + "winnow 1.0.4", ] [[package]] @@ -4745,7 +5317,7 @@ version = "1.1.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" dependencies = [ - "winnow", + "winnow 1.0.4", ] [[package]] @@ -6081,6 +6653,15 @@ dependencies = [ "xkbcommon-dl", ] +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + [[package]] name = "winnow" version = "1.0.4" @@ -6190,6 +6771,46 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" +[[package]] +name = "yew" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f1a03f255c70c7aa3e9c62e15292f142ede0564123543c1cc0c7a4f31660cac" +dependencies = [ + "console_error_panic_hook", + "futures", + "gloo 0.10.0", + "implicit-clone", + "indexmap", + "js-sys", + "prokio", + "rustversion", + "serde", + "slab", + "thiserror 1.0.69", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew-macro", +] + +[[package]] +name = "yew-macro" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02fd8ca5166d69e59f796500a2ce432ff751edecbbb308ca59fd3fe4d0343de2" +dependencies = [ + "boolinator", + "once_cell", + "prettyplease", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "yoke" version = "0.8.4" @@ -6243,7 +6864,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow", + "winnow 1.0.4", "zbus_macros", "zbus_names", "zvariant", @@ -6279,7 +6900,7 @@ version = "5.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 3.0.9", @@ -6295,7 +6916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd" dependencies = [ "serde", - "winnow", + "winnow 1.0.4", "zvariant", ] @@ -6306,7 +6927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a" dependencies = [ "serde", - "winnow", + "winnow 1.0.4", "zbus_names", "zvariant", ] @@ -6453,7 +7074,7 @@ dependencies = [ "enumflags2", "serde", "url", - "winnow", + "winnow 1.0.4", "zcheapstr", "zvariant_derive", "zvariant_utils", @@ -6465,7 +7086,7 @@ version = "5.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2672456ba1cb54b5eaec136e63135b3c7495fb938e53b28a62e633496d486d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 3.0.9", @@ -6482,5 +7103,5 @@ dependencies = [ "quote", "serde", "syn 3.0.9", - "winnow", + "winnow 1.0.4", ] diff --git a/Cargo.toml b/Cargo.toml index 60a554a..5de748e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm"] +members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm", "crates/gipfel-web"] # Single source of truth for metadata inherited by every crate via # `version.workspace = true` etc. Bump `version` here on release; the diff --git a/crates/gipfel-web/Cargo.toml b/crates/gipfel-web/Cargo.toml new file mode 100644 index 0000000..b53fdaa --- /dev/null +++ b/crates/gipfel-web/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "gipfel-web" +version.workspace = true +edition.workspace = true +license.workspace = true +description = "gipfel web — browser front end (WASM)" + +[dependencies] +gipfel-core = { path = "../gipfel-core" } +js-sys = "0.3" +wasm-bindgen = "0.2" +wasm-bindgen-futures = "0.4" +yew = { version = "0.21", features = ["csr"] } + +[dependencies.web-sys] +version = "0.3" +features = [ + "Blob", + "CanvasRenderingContext2d", + "DataTransfer", + "Document", + "DomRect", + "DragEvent", + "Element", + "Event", + "EventTarget", + "File", + "FileList", + "HtmlCanvasElement", + "HtmlElement", + "HtmlInputElement", + "ImageBitmap", + "MouseEvent", + "PointerEvent", + "Window", + "WheelEvent", +] diff --git a/crates/gipfel-web/README.md b/crates/gipfel-web/README.md new file mode 100644 index 0000000..2442e67 --- /dev/null +++ b/crates/gipfel-web/README.md @@ -0,0 +1,46 @@ +# gipfel-web + +Browser front end for gipfel (WASM, Yew + canvas 2D). See +[`/wasm-plan.md`](../../wasm-plan.md) for the overall plan and milestones. + +**Status: W1 (scaffold + image display) done** — open/drag-drop a JPEG, +pan (drag) and zoom (wheel, cursor-anchored). Peak identification, +fitting and saving arrive in W2/W3. + +## Development + +Prerequisites: [rustup](https://rustup.rs) and trunk: + +```sh +cargo install --locked trunk +``` + +Serve with hot reload: + +```sh +cd crates/gipfel-web +trunk serve --port 8090 # then open http://localhost:8090 +``` + +Release build (static output in `dist/`, serveable by any web server): + +```sh +trunk build --release +``` + +## Layout + +| File | Purpose | +|---|---| +| `src/main.rs` | entry point | +| `src/app.rs` | root component: sidebar, file loading, state | +| `src/canvas_view.rs` | viewport canvas: bitmap blit, pan/zoom | +| `src/bridge.rs` | JS glue: image decode, blob read, canvas ctx | +| `www/` | index.html, style.css (trunk assets) | + +## Notes + +- The base image is decoded by the browser (`createImageBitmap`), not + by the `image` crate — faster decode and GPU-backed blitting. +- The crate compiles natively (`cargo check -p gipfel-web`) so it can + be checked in CI without a wasm toolchain; runtime is wasm-only. diff --git a/crates/gipfel-web/Trunk.toml b/crates/gipfel-web/Trunk.toml new file mode 100644 index 0000000..1772684 --- /dev/null +++ b/crates/gipfel-web/Trunk.toml @@ -0,0 +1,2 @@ +[build] +target = "www/index.html" diff --git a/crates/gipfel-web/src/app.rs b/crates/gipfel-web/src/app.rs new file mode 100644 index 0000000..9e8c543 --- /dev/null +++ b/crates/gipfel-web/src/app.rs @@ -0,0 +1,193 @@ +//! Root component: sidebar (open/fit/status) + viewport canvas. +//! File loading: `` and drag-and-drop, decoded by the +//! browser into an ImageBitmap (see `bridge`). + +use std::rc::Rc; +use wasm_bindgen::closure::Closure; +use wasm_bindgen::JsCast; +use wasm_bindgen_futures::spawn_local; +use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, MouseEvent}; +use yew::prelude::*; + +use crate::bridge; +use crate::canvas_view::{CanvasView, ViewCallbacks, ViewState}; + +#[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 tick = use_state(|| 0u32); + let canvas_ref = use_node_ref(); + let file_ref = use_node_ref(); + + // force a redraw when the window is resized so the canvas backing + // store tracks its CSS size (listener lives as long as the app) + { + let tick = tick.clone(); + use_effect_with((), move |_| { + let closure = Closure::wrap(Box::new(move || tick.set(*tick + 1)) as Box); + let _ = bridge::window() + .add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref()); + // the listener is never removed (app lifetime); leak the closure + std::mem::forget(closure); + }); + } + + // Fit the current bitmap into the canvas, centered. + let fit = { + let bitmap = bitmap.clone(); + let view = view.clone(); + let canvas_ref = canvas_ref.clone(); + Callback::from(move |_: MouseEvent| { + let Some(bmp) = bitmap.as_ref() else { return }; + let (cw, ch) = canvas_ref + .cast::() + .map(|c| (c.client_width() as f64, c.client_height() as f64)) + .unwrap_or((800.0, 600.0)); + let (iw, ih) = (bmp.width() as f64, bmp.height() as f64); + if iw <= 0.0 || ih <= 0.0 || cw <= 0.0 || ch <= 0.0 { + return; + } + let scale = (cw / iw).min(ch / ih); + view.set(ViewState { + scale, + ox: (cw - iw * scale) / 2.0, + oy: (ch - ih * scale) / 2.0, + }); + }) + }; + + // Decode dropped/selected bytes and display them, fitting to view. + let load_bytes = { + let bitmap = bitmap.clone(); + let status = status.clone(); + let fit = fit.clone(); + Callback::from(move |(bytes, name): (Vec, String)| { + let (bitmap, status, fit) = (bitmap.clone(), status.clone(), fit.clone()); + spawn_local(async move { + match bridge::decode_bitmap(&bytes).await { + Ok(bmp) => { + status.set(format!( + "{name} — {}×{} px", + bmp.width(), + bmp.height() + )); + bitmap.set(Some(bmp)); + fit.emit(MouseEvent::new("fit").unwrap()); + } + Err(e) => status.set(format!("Failed to load {name}: {e}")), + } + }); + }) + }; + + let read_file = { + let load_bytes = load_bytes.clone(); + let status = status.clone(); + Rc::new(move |file: web_sys::File| { + let (load_bytes, status) = (load_bytes.clone(), status.clone()); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => load_bytes.emit((bytes, name)), + Err(e) => status.set(format!("Failed to read {name}: {e}")), + } + }); + }) + }; + + let on_file_change = { + let read_file = read_file.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Some(file) = input.files().and_then(|fl| fl.item(0)) { + read_file(file); + } + }) + }; + + let on_drop = { + let read_file = read_file.clone(); + 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)) { + Some(file) => read_file(file), + None => status.set("Dropped item was not a file.".to_string()), + } + }) + }; + let on_dragover = Callback::from(|e: DragEvent| e.prevent_default()); + + let open_picker = { + let file_ref = file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = file_ref.cast::() { + input.click(); + } + }) + }; + + let callbacks = ViewCallbacks { + pan: { + let view = view.clone(); + Callback::from(move |(dx, dy): (f64, f64)| { + let mut v = (*view).clone(); + v.ox += dx; + v.oy += dy; + view.set(v); + }) + }, + zoom: { + let view = view.clone(); + Callback::from(move |(cx, cy, factor): (f64, f64, f64)| { + let v = &*view; + let ns = (v.scale * factor).clamp(0.02, 64.0); + let k = ns / v.scale; + view.set(ViewState { + scale: ns, + ox: cx - (cx - v.ox) * k, + oy: cy - (cy - v.oy) * k, + }); + }) + }, + }; + + let zoom_pct = (view.scale * 100.0).round(); + + html! { +
+ +
+ +
+
+ } +} diff --git a/crates/gipfel-web/src/bridge.rs b/crates/gipfel-web/src/bridge.rs new file mode 100644 index 0000000..1353279 --- /dev/null +++ b/crates/gipfel-web/src/bridge.rs @@ -0,0 +1,45 @@ +//! Small JS helpers: window access, browser-native image decode, blob +//! reads, canvas context — the hand-written JS boundary of the app. + +use js_sys::Uint8Array; +use wasm_bindgen::JsCast; +use wasm_bindgen_futures::JsFuture; +use web_sys::{Blob, CanvasRenderingContext2d, HtmlCanvasElement, ImageBitmap, Window}; + +pub fn window() -> Window { + web_sys::window().expect("no global window") +} + +/// Decode image bytes into a browser-native (GPU-backed) bitmap. +/// The browser does the JPEG decode and keeps the pixels where canvas +/// blitting is fast — cheaper than any pure-Rust path in wasm. +pub async fn decode_bitmap(bytes: &[u8]) -> Result { + let array = js_sys::Array::new(); + array.push(&Uint8Array::from(bytes).buffer()); + let blob = Blob::new_with_u8_array_sequence(&array).map_err(|_| "blob failed".to_string())?; + let promise = window() + .create_image_bitmap_with_blob(&blob) + .map_err(|_| "createImageBitmap failed".to_string())?; + let value = JsFuture::from(promise) + .await + .map_err(|e| format!("decode failed: {e:?}"))?; + value + .dyn_into::() + .map_err(|_| "decode produced non-bitmap".to_string()) +} + +/// Read a File/Blob fully into memory. +pub async fn read_blob(blob: &Blob) -> Result, String> { + let buf = JsFuture::from(blob.array_buffer()) + .await + .map_err(|e| format!("read failed: {e:?}"))?; + Ok(Uint8Array::new(&buf).to_vec()) +} + +pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option { + canvas + .get_context("2d") + .ok() + .flatten() + .and_then(|c| c.dyn_into::().ok()) +} diff --git a/crates/gipfel-web/src/canvas_view.rs b/crates/gipfel-web/src/canvas_view.rs new file mode 100644 index 0000000..87b89d9 --- /dev/null +++ b/crates/gipfel-web/src/canvas_view.rs @@ -0,0 +1,148 @@ +//! Viewport canvas: browser-native bitmap blitted with a pan/zoom +//! transform. Overlay drawing (markers, labels, compass) is added in W3. + +use web_sys::{HtmlCanvasElement, ImageBitmap, PointerEvent, WheelEvent};use yew::prelude::*; + +use crate::bridge; + +/// Image -> screen transform: `screen = img * scale + (ox, oy)`. +/// Same convention as the desktop viewport widget. +#[derive(Clone, Debug, PartialEq, Default)] +pub struct ViewState { + pub scale: f64, + pub ox: f64, + pub oy: f64, +} + +#[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)>, +} + +#[derive(Properties, PartialEq)] +pub struct Props { + pub bitmap: Option, + pub view: ViewState, + pub callbacks: ViewCallbacks, + pub canvas_ref: NodeRef, + /// bumped on window resize to force a redraw + pub tick: u32, +} + +#[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)); + + // redraw on every view/bitmap 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::() 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 _ = ctx.set_transform( + dpr * view.scale, + 0.0, + 0.0, + dpr * view.scale, + dpr * view.ox, + dpr * view.oy, + ); + let _ = ctx.draw_image_with_image_bitmap(bitmap, 0.0, 0.0); + } + }); + } + + let on_pointerdown = { + let dragging = dragging.clone(); + let last = last.clone(); + let canvas_ref = props.canvas_ref.clone(); + Callback::from(move |e: PointerEvent| { + e.prevent_default(); + if let Some(c) = canvas_ref.cast::() { + 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 on_pointermove = { + let dragging = dragging.clone(); + let last = last.clone(); + let pan = props.callbacks.pan.clone(); + Callback::from(move |e: PointerEvent| { + if !*dragging.borrow() { + 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)); + }) + }; + let on_pointerup = { + let dragging = dragging.clone(); + let canvas_ref = props.canvas_ref.clone(); + Callback::from(move |e: PointerEvent| { + *dragging.borrow_mut() = false; + if let Some(c) = canvas_ref.cast::() { + let _ = c.release_pointer_capture(e.pointer_id()); + } + }) + }; + let on_wheel = { + let zoom = props.callbacks.zoom.clone(); + let canvas_ref = props.canvas_ref.clone(); + Callback::from(move |e: WheelEvent| { + e.prevent_default(); + let cx = e.client_x() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().left()) + .unwrap_or(0.0); + let cy = e.client_y() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().top()) + .unwrap_or(0.0); + let factor = 1.0015f64.powf(-(e.delta_y() as f64)); + zoom.emit((cx, cy, factor)); + }) + }; + + html! { + + } +} diff --git a/crates/gipfel-web/src/main.rs b/crates/gipfel-web/src/main.rs new file mode 100644 index 0000000..6a3e4d4 --- /dev/null +++ b/crates/gipfel-web/src/main.rs @@ -0,0 +1,7 @@ +mod app; +mod bridge; +mod canvas_view; + +fn main() { + yew::Renderer::::new().render(); +} diff --git a/crates/gipfel-web/www/index.html b/crates/gipfel-web/www/index.html new file mode 100644 index 0000000..c601fee --- /dev/null +++ b/crates/gipfel-web/www/index.html @@ -0,0 +1,11 @@ + + + + + + gipfel web + + + + + diff --git a/crates/gipfel-web/www/style.css b/crates/gipfel-web/www/style.css new file mode 100644 index 0000000..5ea080d --- /dev/null +++ b/crates/gipfel-web/www/style.css @@ -0,0 +1,77 @@ +* { + box-sizing: border-box; +} +html, +body { + margin: 0; + height: 100%; + font-family: system-ui, sans-serif; +} +.app { + display: flex; + height: 100vh; + background: #101014; + color: #e8e8ea; +} +.sidebar { + width: 300px; + padding: 16px; + background: #1a1a20; + border-right: 1px solid #2c2c34; + display: flex; + flex-direction: column; + gap: 8px; + overflow-y: auto; +} +.sidebar h1 { + margin: 0; + font-size: 22px; +} +.tag { + margin: 0 0 12px; + color: #8a8a94; + font-size: 12px; + text-transform: uppercase; + letter-spacing: 1px; +} +.sidebar button { + padding: 8px 12px; + background: #3b6fd4; + color: #fff; + border: 0; + border-radius: 6px; + font-size: 14px; + cursor: pointer; +} +.sidebar button:hover { + background: #4a7ee4; +} +.status { + font-size: 13px; + color: #c8c8d0; + word-break: break-word; +} +.hint { + font-size: 12px; + color: #8a8a94; +} +.dim { + opacity: 0.6; +} +.hidden-file { + display: none; +} +.main { + flex: 1; + position: relative; + min-width: 0; +} +canvas.viewport { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + display: block; + touch-action: none; + cursor: grab; +} -- cgit v1.2.3 From f6883fa1d586a040bf228ab886b95ca64457fa34 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 13:55:35 +0100 Subject: Rename web front end to wipfel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'gipfel web' is taken by an existing related project. The browser app is now wipfel — web based gipfel photogrammetry for mountain images: crate gipfel-web -> wipfel, updated titles, docs, plan and dev script. The shared engine crate stays gipfel-core. --- COPYING | 674 +++++++++++++++++++++++++++++++ Cargo.lock | 26 +- Cargo.toml | 2 +- INSTALL | 368 +++++++++++++++++ crates/gipfel-web/Cargo.toml | 42 -- crates/gipfel-web/README.md | 47 --- crates/gipfel-web/index.html | 11 - crates/gipfel-web/serve-here.sh | 12 - crates/gipfel-web/src/app.rs | 763 ----------------------------------- crates/gipfel-web/src/bridge.rs | 69 ---- crates/gipfel-web/src/canvas_view.rs | 481 ---------------------- crates/gipfel-web/src/compass.rs | 349 ---------------- crates/gipfel-web/src/main.rs | 10 - crates/gipfel-web/src/markers.rs | 60 --- crates/gipfel-web/src/widgets.rs | 77 ---- crates/gipfel-web/www/style.css | 221 ---------- crates/wipfel/Cargo.toml | 42 ++ crates/wipfel/README.md | 47 +++ crates/wipfel/index.html | 11 + crates/wipfel/serve-here.sh | 12 + crates/wipfel/src/app.rs | 763 +++++++++++++++++++++++++++++++++++ crates/wipfel/src/bridge.rs | 69 ++++ crates/wipfel/src/canvas_view.rs | 481 ++++++++++++++++++++++ crates/wipfel/src/compass.rs | 349 ++++++++++++++++ crates/wipfel/src/main.rs | 10 + crates/wipfel/src/markers.rs | 60 +++ crates/wipfel/src/widgets.rs | 77 ++++ crates/wipfel/www/style.css | 221 ++++++++++ plan.md | 371 +++++++++++++++++ wasm-plan.md | 10 +- 30 files changed, 3574 insertions(+), 2161 deletions(-) create mode 100644 COPYING create mode 100644 INSTALL delete mode 100644 crates/gipfel-web/Cargo.toml delete mode 100644 crates/gipfel-web/README.md delete mode 100644 crates/gipfel-web/index.html delete mode 100755 crates/gipfel-web/serve-here.sh delete mode 100644 crates/gipfel-web/src/app.rs delete mode 100644 crates/gipfel-web/src/bridge.rs delete mode 100644 crates/gipfel-web/src/canvas_view.rs delete mode 100644 crates/gipfel-web/src/compass.rs delete mode 100644 crates/gipfel-web/src/main.rs delete mode 100644 crates/gipfel-web/src/markers.rs delete mode 100644 crates/gipfel-web/src/widgets.rs delete mode 100644 crates/gipfel-web/www/style.css create mode 100644 crates/wipfel/Cargo.toml create mode 100644 crates/wipfel/README.md create mode 100644 crates/wipfel/index.html create mode 100755 crates/wipfel/serve-here.sh create mode 100644 crates/wipfel/src/app.rs create mode 100644 crates/wipfel/src/bridge.rs create mode 100644 crates/wipfel/src/canvas_view.rs create mode 100644 crates/wipfel/src/compass.rs create mode 100644 crates/wipfel/src/main.rs create mode 100644 crates/wipfel/src/markers.rs create mode 100644 crates/wipfel/src/widgets.rs create mode 100644 crates/wipfel/www/style.css create mode 100644 plan.md (limited to 'Cargo.toml') diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Cargo.lock b/Cargo.lock index 829f24f..0be6ad5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1815,19 +1815,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gipfel-web" -version = "0.5.5" -dependencies = [ - "flate2", - "gipfel-core", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew", -] - [[package]] name = "gl_generator" version = "0.14.0" @@ -6672,6 +6659,19 @@ dependencies = [ "memchr", ] +[[package]] +name = "wipfel" +version = "0.5.5" +dependencies = [ + "flate2", + "gipfel-core", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew", +] + [[package]] name = "wit-bindgen" version = "0.57.1" diff --git a/Cargo.toml b/Cargo.toml index 5de748e..196bcda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm", "crates/gipfel-web"] +members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm", "crates/wipfel"] # Single source of truth for metadata inherited by every crate via # `version.workspace = true` etc. Bump `version` here on release; the diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..e82fd21 --- /dev/null +++ b/INSTALL @@ -0,0 +1,368 @@ +Installation Instructions +************************* + + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell command './configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the 'README' file for +instructions specific to this package. Some packages provide this +'INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The 'configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that +you can run in the future to recreate the current configuration, and a +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). + + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. + + If you need to do unusual things to compile the package, please try +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can +be considered for the next release. If you are using the cache, and at +some point 'config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. + + The simplest way to compile this package is: + + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. + + Running 'configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type 'make' to compile the package. + + 3. Optionally, type 'make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type 'make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the 'make install' phase executed with root + privileges. + + 5. Optionally, type 'make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior 'make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type 'make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide 'make + distcheck', which can by used by developers to test that all other + targets like 'make install' and 'make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the 'configure' script does not know about. Run './configure --help' +for details on some of the pertinent environment variables. + + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU 'make'. 'cd' to the +directory where you want the object files and executables to go and run +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. + + With a non-GNU 'make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use 'make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the 'lipo' tool if you have problems. + +Installation Names +================== + + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to 'configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +'make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, 'make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the +package recognizes. + + For packages that use the X Window System, 'configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of 'make' will be. For these packages, running './configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with 'make V=1'; while running './configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with 'make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX 'make' updates targets which have the same timestamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. + + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features 'configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, 'configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option '--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with '--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to 'configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the 'configure' command line, using 'VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified 'gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +'configure' Invocation +====================== + + 'configure' recognizes the following options to control how it +operates. + +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. + +'--help=short' +'--help=recursive' + Print a summary of the options unique to this package's + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' + script, and exit. + +'--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally 'config.cache'. FILE defaults to '/dev/null' to + disable caching. + +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to '/dev/null' (any error + messages will still be shown). + +'--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + 'configure' can determine that directory automatically. + +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. + +'--no-create' +'-n' + Run the configure checks, but stop before creating any output + files. + +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff --git a/crates/gipfel-web/Cargo.toml b/crates/gipfel-web/Cargo.toml deleted file mode 100644 index 303750a..0000000 --- a/crates/gipfel-web/Cargo.toml +++ /dev/null @@ -1,42 +0,0 @@ -[package] -name = "gipfel-web" -version.workspace = true -edition.workspace = true -license.workspace = true -description = "gipfel web — browser front end (WASM)" - -[dependencies] -gipfel-core = { path = "../gipfel-core" } -flate2 = "1" -js-sys = "0.3" -wasm-bindgen = "0.2" -wasm-bindgen-futures = "0.4" -yew = { version = "0.21", features = ["csr"] } - -[dependencies.web-sys] -version = "0.3" -features = [ - "Blob", - "CanvasRenderingContext2d", - "DataTransfer", - "Document", - "DomRect", - "DragEvent", - "Element", - "Event", - "EventTarget", - "File", - "FileList", - "HtmlCanvasElement", - "HtmlElement", - "HtmlInputElement", - "ImageBitmap", - "InputEvent", - "MouseEvent", - "PointerEvent", - "Request", - "Response", - "TextMetrics", - "Window", - "WheelEvent", -] diff --git a/crates/gipfel-web/README.md b/crates/gipfel-web/README.md deleted file mode 100644 index 74e93c5..0000000 --- a/crates/gipfel-web/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# gipfel-web - -Browser front end for gipfel (WASM, Yew + canvas 2D). See -[`/wasm-plan.md`](../../wasm-plan.md) for the overall plan and milestones. - -**Status: W1 (scaffold + image display) done** — open/drag-drop a JPEG, -pan (drag) and zoom (wheel, cursor-anchored). Peak identification, -fitting and saving arrive in W2/W3. - -## Development - -Prerequisites: [rustup](https://rustup.rs) and trunk: - -```sh -cargo install --locked trunk -``` - -Serve with hot reload: - -```sh -cd crates/gipfel-web -trunk serve --port 8090 # then open http://localhost:8090 -``` - -Release build (static output in `dist/`, serveable by any web server): - -```sh -trunk build --release -``` - -## Layout - -| File | Purpose | -|---|---| -| `src/main.rs` | entry point | -| `src/app.rs` | root component: sidebar, file loading, state | -| `src/canvas_view.rs` | viewport canvas: bitmap blit, pan/zoom | -| `src/bridge.rs` | JS glue: image decode, blob read, canvas ctx | -| `index.html` | trunk entry point (canonical trunk layout) | -| `www/style.css` | stylesheet (trunk asset) | - -## Notes - -- The base image is decoded by the browser (`createImageBitmap`), not - by the `image` crate — faster decode and GPU-backed blitting. -- The crate compiles natively (`cargo check -p gipfel-web`) so it can - be checked in CI without a wasm toolchain; runtime is wasm-only. diff --git a/crates/gipfel-web/index.html b/crates/gipfel-web/index.html deleted file mode 100644 index 32ec87f..0000000 --- a/crates/gipfel-web/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - gipfel web - - - - - diff --git a/crates/gipfel-web/serve-here.sh b/crates/gipfel-web/serve-here.sh deleted file mode 100755 index 54038a6..0000000 --- a/crates/gipfel-web/serve-here.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Build gipfel-web for wasm and refresh the static dist dir served from -# /tmp/gipfel-web-dist (python http.server on :8090). Dev-only helper. -set -e -cd "$(dirname "$0")/../.." -cargo build -p gipfel-web --target wasm32-unknown-unknown --release -DIST=/tmp/gipfel-web-dist -mkdir -p "$DIST" -wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/gipfel-web.wasm -cp crates/gipfel-web/www/style.css "$DIST/" -gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" -echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/gipfel-web/src/app.rs b/crates/gipfel-web/src/app.rs deleted file mode 100644 index f4b0de4..0000000 --- a/crates/gipfel-web/src/app.rs +++ /dev/null @@ -1,763 +0,0 @@ -//! 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::hill::{FLAG_DUPLIC, FLAG_HIDDEN, FLAG_TRACK_POINT}; -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; -use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; -use yew::prelude::*; - -use crate::bridge; -use crate::canvas_view::{CanvasView, MarkerView, ViewCallbacks, ViewState}; -use crate::compass::{Compass, CompassData}; -use crate::markers::{self, Marker}; -use crate::widgets::{NumItem, SliderItem}; - -/// sidebar-editable view parameters (degrees / meters / mm) -#[derive(Clone, Copy, PartialEq)] -struct UiParams { - lat: f64, - lon: f64, - height: f64, - az: f64, - focal: f64, - pitch: f64, - roll: f64, - /// visibility UI value: 0.11 - height_dist_ratio (right = more visible) - vis: f64, - label_font: f32, -} - -impl Default for UiParams { - fn default() -> Self { - UiParams { - lat: 0.0, - lon: 0.0, - height: 0.0, - az: 0.0, - focal: 50.0, - pitch: 0.0, - roll: 0.0, - vis: 0.04, - label_font: 12.0, - } - } -} - -/// open Find Peak popup: anchor (screen + image coords) and search query -#[derive(Clone, PartialEq)] -struct FindPeak { - sx: f64, - sy: f64, - ix: f64, - iy: f64, - query: String, -} - -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}")) -} - -#[derive(Properties, PartialEq)] -struct FpProps { - fp: FindPeak, - items: Vec<(String, usize)>, - on_pick: Callback, - on_query: Callback, - on_close: Callback<()>, -} - -/// searchable Find Peak dialog: type to filter, click to select -#[function_component(FindPeakPanel)] -fn find_peak_panel(p: &FpProps) -> Html { - let input_ref = use_node_ref(); - // focus the search box when the dialog opens - { - let input_ref = input_ref.clone(); - use_effect_with((), move |_| { - if let Some(i) = input_ref.cast::() { - let _ = i.focus(); - } - }); - } - let on_query = { - let on_query = p.on_query.clone(); - Callback::from(move |e: InputEvent| { - let input: HtmlInputElement = e.target_unchecked_into(); - on_query.emit(input.value()); - }) - }; - let on_close = { - let on_close = p.on_close.clone(); - Callback::from(move |_: MouseEvent| on_close.emit(())) - }; - html! { - <> -
-
-
{ "Find Peak" }
-
- -
-
- { - for p.items.iter().map(|(label, idx)| { - let onclick = { - let on_pick = p.on_pick.clone(); - let i = *idx; - Callback::from(move |_: MouseEvent| on_pick.emit(i)) - }; - html! { - - } - }) - } - if p.items.is_empty() { -

{ "no matches" }

- } -
-
- -
-
- - } -} - -#[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); - let hover = use_state(|| Option::::None); - let vp = use_state(UiParams::default); - let img_size = use_state(|| (0u32, 0u32)); - let find_peak = use_state(|| Option::::None); - let show_hidden = 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) - { - let tick = tick.clone(); - use_effect_with((), move |_| { - let closure = Closure::wrap(Box::new(move || tick.set(*tick + 1)) as Box); - let _ = bridge::window() - .add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref()); - // the listener is never removed (app lifetime); leak the closure - std::mem::forget(closure); - }); - } - - // 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(); - let view = view.clone(); - let canvas_ref = canvas_ref.clone(); - Callback::from(move |_: MouseEvent| { - let Some(bmp) = bitmap.as_ref() else { return }; - let (cw, ch) = canvas_ref - .cast::() - .map(|c| (c.client_width() as f64, c.client_height() as f64)) - .unwrap_or((800.0, 600.0)); - let (iw, ih) = (bmp.width() as f64, bmp.height() as f64); - if iw <= 0.0 || ih <= 0.0 || cw <= 0.0 || ch <= 0.0 { - return; - } - let scale = (cw / iw).min(ch / ih); - view.set(ViewState { - scale, - ox: (cw - iw * scale) / 2.0, - oy: (ch - ih * scale) / 2.0, - }); - }) - }; - - // 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]| { - if mk.is_empty() { - fit_info.set(String::new()); - return; - } - let info = { - let mut p = pan.borrow_mut(); - match markers::refit(&mut p, mk, *fit_distortion) { - Ok(()) => 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() - ), - Err(e) => format!("fit failed: {e}"), - } - }; - fit_info.set(info); - }) - }; - - // place a marker for a hill at an image position and refit - let mark_peak = { - let markers = markers.clone(); - let do_refit = do_refit.clone(); - Callback::from(move |(idx, ix, iy): (usize, f64, f64)| { - let mut mk = (*markers).clone(); - mk.retain(|m| m.hill != idx); - mk.push(Marker { hill: idx, x: ix, y: iy }); - do_refit(&mk); - markers.set(mk); - }) - }; - - // 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(); - let vp = vp.clone(); - let img_size = img_size.clone(); - let find_peak = find_peak.clone(); - Callback::from(move |(bytes, name): (Vec, String)| { - let (bitmap, status, fit, pan, markers, fit_info) = - (bitmap.clone(), status.clone(), fit.clone(), pan.clone(), markers.clone(), fit_info.clone()); - let vp = vp.clone(); - let img_size = img_size.clone(); - let find_peak = find_peak.clone(); - spawn_local(async move { - match bridge::decode_bitmap(&bytes).await { - Ok(bmp) => { - 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 u = { - let p = pan.borrow(); - UiParams { - lat: p.get_view_lat(), - lon: p.get_view_long(), - height: p.get_view_height(), - az: p.get_center_angle().rem_euclid(360.0), - focal: (p.get_scale() * 35.0 / w as f64).clamp(1.0, 300.0), - pitch: p.get_pitch_angle(), - roll: p.get_roll_angle(), - vis: (0.11 - p.height_dist_ratio).clamp(0.01, 0.1), - label_font: vp.label_font, - } - }; - vp.set(u); - img_size.set((w, h)); - 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()); - find_peak.set(None); - bitmap.set(Some(bmp)); - fit.emit(MouseEvent::new("fit").unwrap()); - // same nudge as the desktop app: re-fit shortly - // after the first paint so the image is guaranteed - // to appear even if layout was not ready yet - { - let fit = fit.clone(); - spawn_local(async move { - let _ = wasm_bindgen_futures::JsFuture::from( - bridge::delay_promise(120), - ) - .await; - fit.emit(MouseEvent::new("fit").unwrap()); - }); - } - } - Err(e) => status.set(format!("Failed to load {name}: {e}")), - } - }); - }) - }; - - let read_file = { - let load_bytes = load_bytes.clone(); - let status = status.clone(); - Rc::new(move |file: web_sys::File| { - let (load_bytes, status) = (load_bytes.clone(), status.clone()); - let name = file.name(); - spawn_local(async move { - match bridge::read_blob(&file).await { - Ok(bytes) => load_bytes.emit((bytes, name)), - Err(e) => status.set(format!("Failed to read {name}: {e}")), - } - }); - }) - }; - - let on_file_change = { - let read_file = read_file.clone(); - Callback::from(move |e: Event| { - let input: HtmlInputElement = e.target_unchecked_into(); - if let Some(file) = input.files().and_then(|fl| fl.item(0)) { - read_file(file); - } - }) - }; - - let on_drop = { - let read_file = read_file.clone(); - 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)) - { - Some(file) => read_file(file), - None => status.set("Dropped item was not a file.".to_string()), - } - }) - }; - let on_dragover = Callback::from(|e: DragEvent| e.prevent_default()); - - let open_picker = { - let file_ref = file_ref.clone(); - Callback::from(move |_: MouseEvent| { - if let Some(input) = file_ref.cast::() { - input.click(); - } - }) - }; - - 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); - }) - }; - - // sidebar parameter editing: update UI state and apply to the panorama - macro_rules! param_cb { - ($field:ident, $apply:expr) => {{ - let vp = vp.clone(); - let pan = pan.clone(); - Callback::from(move |v: f64| { - let mut u = *vp; - u.$field = v; - vp.set(u); - let f: &dyn Fn(&mut Panorama, f64) = &$apply; - f(&mut pan.borrow_mut(), v); - }) - }}; - } - let on_lat = param_cb!(lat, |p: &mut Panorama, v| p.set_view_lat(v)); - let on_lon = param_cb!(lon, |p, v| p.set_view_long(v)); - let on_height = param_cb!(height, |p, v| p.set_view_height(v)); - let on_az = param_cb!(az, |p, v| p.set_center_angle(v)); - let on_pitch = param_cb!(pitch, |p, v| p.set_pitch_angle(v)); - let on_roll = param_cb!(roll, |p, v| p.set_roll_angle(v)); - let on_vis = param_cb!(vis, |p, v| p.set_height_dist_ratio(0.11 - v)); - let on_focal = { - let vp = vp.clone(); - let pan = pan.clone(); - let img_size = img_size.clone(); - Callback::from(move |v: f64| { - let mut u = *vp; - u.focal = v; - vp.set(u); - let w = img_size.0 as f64; - if w > 0.0 { - pan.borrow_mut().set_scale(v * w / 35.0); - } - }) - }; - let on_font = { - let vp = vp.clone(); - Callback::from(move |v: f64| { - let mut u = *vp; - u.label_font = v as f32; - vp.set(u); - }) - }; - let on_show_hidden = { - let show_hidden = show_hidden.clone(); - Callback::from(move |e: Event| { - let input: HtmlInputElement = e.target_unchecked_into(); - show_hidden.set(input.checked()); - }) - }; - - // compass strip: shares the image transform, drag changes azimuth - let compass_data = { - let p = pan.borrow(); - CompassData { - ptype: p.projection_type, - parms: p.parms, - center_deg: p.get_center_angle(), - zoom: view.scale, - cx: view.ox + img_size.0 as f64 * view.scale / 2.0, - max_view_angle: p.max_view_angle, - } - }; - let compass_change = { - let pan = pan.clone(); - let vp = vp.clone(); - Callback::from(move |deg: f64| { - pan.borrow_mut().set_center_angle(deg); - let mut u = *vp; - u.az = deg.rem_euclid(360.0); - vp.set(u); - }) - }; - - let fp_close = { - let find_peak = find_peak.clone(); - Callback::from(move |_: ()| find_peak.set(None)) - }; - - // Find Peak picker: searchable list over the geographically close hills - // (same candidate set and filtering as the desktop dialog) - let findpeak_popup = if let Some(fp) = &*find_peak { - let items: Vec<(String, usize)> = { - let p = pan.borrow(); - let q = fp.query.to_uppercase(); - let mut entries: Vec<(String, usize)> = p - .close - .iter() - .filter(|&&i| { - let h = &p.hills[i]; - h.flags & (FLAG_DUPLIC | FLAG_TRACK_POINT) == 0 - && (q.is_empty() || h.name.to_uppercase().contains(&q)) - }) - .map(|&i| { - ( - format!("{} ({} m)", p.hills[i].name, p.hills[i].height as i64), - i, - ) - }) - .collect(); - entries.sort_by(|a, b| a.0.cmp(&b.0)); - entries.truncate(300); - entries - }; - let on_pick = { - let mark = mark_peak.clone(); - let find_peak = find_peak.clone(); - let (ix, iy) = (fp.ix, fp.iy); - Callback::from(move |hill: usize| { - mark.emit((hill, ix, iy)); - find_peak.set(None); - }) - }; - let on_query = { - let find_peak = find_peak.clone(); - Callback::from(move |q: String| { - if let Some(mut fp) = (*find_peak).clone() { - fp.query = q; - find_peak.set(Some(fp)); - } - }) - }; - html! { - - } - } else { - Html::default() - }; - - let callbacks = ViewCallbacks { - pan: { - let view = view.clone(); - Callback::from(move |(dx, dy): (f64, f64)| { - let mut v = (*view).clone(); - v.ox += dx; - v.oy += dy; - view.set(v); - }) - }, - zoom: { - let view = view.clone(); - Callback::from(move |(cx, cy, factor): (f64, f64, f64)| { - let v = &*view; - let ns = (v.scale * factor).clamp(0.02, 64.0); - let k = ns / v.scale; - view.set(ViewState { - scale: ns, - ox: cx - (cx - v.ox) * k, - oy: cy - (cy - v.oy) * k, - }); - }) - }, - click: { - let pan = pan.clone(); - let view = view.clone(); - let mark = mark_peak.clone(); - let find_peak = find_peak.clone(); - let img_size = img_size.clone(); - let show_hidden = show_hidden.clone(); - Callback::from(move |(ix, iy): (f64, f64)| { - let scale = view.scale; - // unambiguous click right on a peak: mark directly - // (borrow must be released before mark -> do_refit!) - let near = { - let p = pan.borrow(); - markers::nearest_hill(&p, ix, iy, 10.0 / scale, *show_hidden) - }; - if let Some(idx) = near { - find_peak.set(None); - mark.emit((idx, ix, iy)); - return; - } - // otherwise open the Find Peak picker (searchable, like the - // desktop dialog): the correct peak may project far away - // while the viewpoint is still rough - let (w, h) = (img_size.0 as f64, img_size.1 as f64); - find_peak.set(Some(FindPeak { - sx: (ix + w / 2.0) * scale + view.ox, - sy: (iy + h / 2.0) * scale + view.oy, - ix, - iy, - query: String::new(), - })); - }) - }, - 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()); - } - }) - }, - hover: { - let pan = pan.clone(); - let view = view.clone(); - let hover = hover.clone(); - let show_hidden = show_hidden.clone(); - Callback::from(move |(ix, iy): (f64, f64)| { - let p = pan.borrow(); - let name = markers::nearest_hill(&p, ix, iy, 20.0 / view.scale, *show_hidden) - .map(|i| { - let h = &p.hills[i]; - format!("{} · {:.0} m", h.name, h.height) - }); - hover.set(name); - }) - }, - hover_end: { - let hover = hover.clone(); - Callback::from(move |_: ()| hover.set(None)) - }, - }; - - // 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, bool)> = { - let p = pan.borrow(); - p.visible - .iter() - .filter(|&&i| *show_hidden || p.hills[i].flags & FLAG_HIDDEN == 0) - .map(|&i| { - ( - p.hills[i].x, - p.hills[i].y, - p.hills[i].flags & FLAG_HIDDEN != 0, - ) - }) - .collect() - }; - - let zoom_pct = (view.scale * 100.0).round(); - let n_markers = markers.len(); - - html! { -
- -
-
- - { findpeak_popup.clone() } -
- if bitmap.is_some() { - - } -
-
- } -} diff --git a/crates/gipfel-web/src/bridge.rs b/crates/gipfel-web/src/bridge.rs deleted file mode 100644 index 6dbba93..0000000 --- a/crates/gipfel-web/src/bridge.rs +++ /dev/null @@ -1,69 +0,0 @@ -//! Small JS helpers: window access, browser-native image decode, blob -//! reads, canvas context — the hand-written JS boundary of the app. - -use js_sys::Uint8Array; -use wasm_bindgen::JsCast; -use wasm_bindgen_futures::JsFuture; -use web_sys::{Blob, CanvasRenderingContext2d, HtmlCanvasElement, ImageBitmap, Window}; - -pub fn window() -> Window { - web_sys::window().expect("no global window") -} - -/// Decode image bytes into a browser-native (GPU-backed) bitmap. -/// The browser does the JPEG decode and keeps the pixels where canvas -/// blitting is fast — cheaper than any pure-Rust path in wasm. -pub async fn decode_bitmap(bytes: &[u8]) -> Result { - let array = js_sys::Array::new(); - array.push(&Uint8Array::from(bytes).buffer()); - let blob = Blob::new_with_u8_array_sequence(&array).map_err(|_| "blob failed".to_string())?; - let promise = window() - .create_image_bitmap_with_blob(&blob) - .map_err(|_| "createImageBitmap failed".to_string())?; - let value = JsFuture::from(promise) - .await - .map_err(|e| format!("decode failed: {e:?}"))?; - value - .dyn_into::() - .map_err(|_| "decode produced non-bitmap".to_string()) -} - -/// Read a File/Blob fully into memory. -pub async fn read_blob(blob: &Blob) -> Result, String> { - let buf = JsFuture::from(blob.array_buffer()) - .await - .map_err(|e| format!("read failed: {e:?}"))?; - Ok(Uint8Array::new(&buf).to_vec()) -} - -/// Fetch a URL (same-origin) into memory. -pub async fn fetch_bytes(url: &str) -> Result, 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()) -} - -/// setTimeout as an awaitable Promise. -pub fn delay_promise(ms: i32) -> js_sys::Promise { - js_sys::Promise::new(&mut |resolve, _reject| { - let _ = window().set_timeout_with_callback_and_timeout_and_arguments_0(&resolve, ms); - }) -} - -pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option { - canvas - .get_context("2d") - .ok() - .flatten() - .and_then(|c| c.dyn_into::().ok()) -} diff --git a/crates/gipfel-web/src/canvas_view.rs b/crates/gipfel-web/src/canvas_view.rs deleted file mode 100644 index 9d4338e..0000000 --- a/crates/gipfel-web/src/canvas_view.rs +++ /dev/null @@ -1,481 +0,0 @@ -//! Viewport canvas: browser-native bitmap blitted with a pan/zoom -//! transform, plus the marker overlay and its interactions. - -use web_sys::{HtmlCanvasElement, ImageBitmap, MouseEvent, PointerEvent, WheelEvent}; -use yew::prelude::*; - -use crate::bridge; - -/// Image -> screen transform: `screen = img * scale + (ox, oy)`. -/// Same convention as the desktop viewport widget. -#[derive(Clone, Debug, PartialEq, Default)] -pub struct ViewState { - pub scale: f64, - pub ox: f64, - 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)>, - /// pointer moved over the image (not dragging): (x, y) center-relative - pub hover: Callback<(f64, f64)>, - /// pointer left the canvas - pub hover_end: Callback<()>, -} - -#[derive(Properties, PartialEq)] -pub struct Props { - pub bitmap: Option, - pub view: ViewState, - pub callbacks: ViewCallbacks, - pub canvas_ref: NodeRef, - /// bumped on window resize to force a redraw - pub tick: u32, - pub markers: Vec, - /// projected positions of all visible hills (guide dots) with their - /// hidden-by-occlusion flag - pub candidates: Vec<(f64, f64, bool)>, - /// marker label font size, screen px - pub label_font: f32, -} - -#[derive(Clone, PartialEq)] -enum DragMode { - Pan, - Marker(usize), -} - -#[derive(PartialEq)] -struct DragState { - mode: Option, - last: (f64, f64), - start: (f64, f64), - moved: bool, -} - -#[function_component(CanvasView)] -pub fn canvas_view(props: &Props) -> Html { - 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/marker change and on resize ticks - { - let bitmap = props.bitmap.clone(); - let view = props.view.clone(); - let canvas_ref = props.canvas_ref.clone(); - let markers = props.markers.clone(); - let candidates = props.candidates.clone(); - let label_font = props.label_font; - use_effect_with( - (bitmap, view, props.tick, markers.clone(), candidates.clone(), label_font), - move |(bitmap, view, _tick, markers, candidates, label_font)| { - let Some(canvas) = canvas_ref.cast::() 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, - 0.0, - dpr * view.scale, - dpr * view.ox, - 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: dark outline ring + - // bright core so they stay visible on any photo content; - // peaks hidden by nearer terrain are drawn grey - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); - for (cx, cy, _hidden) in candidates { - let (px, py) = (sx(*cx), sy(*cy)); - if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { - continue; - } - ctx.begin_path(); - let _ = ctx.arc(px, py, 4.5, 0.0, std::f64::consts::TAU); - ctx.fill(); - } - for (cx, cy, hidden) in candidates { - let (px, py) = (sx(*cx), sy(*cy)); - if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { - continue; - } - let color = if *hidden { "rgb(150, 150, 150)" } else { "rgb(110, 231, 183)" }; - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(color)); - ctx.begin_path(); - let _ = ctx.arc(px, py, 2.5, 0.0, std::f64::consts::TAU); - ctx.fill(); - } - - // markers: yellow leader lines, red crosses, collision-free - // labels (port of the desktop viewport drawing) - if !markers.is_empty() { - let label_font = *label_font; - let line_h = label_font * 1.3 + 2.0; - ctx.set_font(&format!("{label_font:.0}px system-ui, sans-serif")); - // layout runs in screen space, sorted by x - let mut order: Vec = (0..markers.len()) - .filter(|&i| { - markers[i].x.abs() * 2.0 <= bitmap.width() as f64 - && markers[i].y.abs() * 2.0 <= bitmap.height() as f64 - }) - .collect(); - order.sort_by(|&a, &b| sx(markers[a].x).total_cmp(&sx(markers[b].x))); - let xs: Vec = order.iter().map(|&i| sx(markers[i].x) as f32).collect(); - let ys: Vec = order.iter().map(|&i| sy(markers[i].y) as f32).collect(); - let widths: Vec = order - .iter() - .map(|&i| { - ctx.measure_text(&markers[i].name) - .map(|m| m.width() as f32) - .unwrap_or_else(|_| markers[i].name.len() as f32 * 7.0) - }) - .collect(); - let in_img = vec![true; order.len()]; - let entries = layout_label_y(&xs, &ys, &widths, &in_img, line_h); - - // leaders (yellow): cross, vertical, horizontal - #[allow(deprecated)] - ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 230, 51)")); - ctx.set_line_width(1.0); - for (k, &i) in order.iter().enumerate() { - let (px, py) = (sx(markers[i].x), sy(markers[i].y)); - let (lx, ly) = entries[k]; - let label_line = py + ly as f64 - line_h as f64; - ctx.begin_path(); - ctx.move_to(px - 4.0, py); - ctx.line_to(px + 4.0, py); - ctx.move_to(px, py); - ctx.line_to(px, label_line); - ctx.move_to(px, label_line); - ctx.line_to(px + lx as f64, label_line); - ctx.stroke(); - } - // marker crosses (always red) - #[allow(deprecated)] - ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 64, 64)")); - ctx.set_line_width(1.5); - for &i in &order { - let (px, py) = (sx(markers[i].x), sy(markers[i].y)); - 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(); - } - // labels: white on dark shadow, right-aligned at leader end - for (k, &i) in order.iter().enumerate() { - if markers[i].name.is_empty() { - continue; - } - let (px, py) = (sx(markers[i].x), sy(markers[i].y)); - let (lx, ly) = entries[k]; - let label_line = py + ly as f64 - line_h as f64; - let tx = px + lx as f64 - widths[k] as f64; - let ty = label_line - 3.0; - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); - ctx.fill_text(&markers[i].name, tx + 1.0, ty + 1.0).ok(); - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("white")); - ctx.fill_text(&markers[i].name, tx, ty).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::() - .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 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::() { - let _ = c.set_pointer_capture(e.pointer_id()); - } - let rect = canvas_ref - .cast::() - .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 drag = drag.clone(); - let pan_cb = props.callbacks.pan.clone(); - let marker_drag = props.callbacks.marker_drag.clone(); - let hover = props.callbacks.hover.clone(); - let to_img = to_img.clone(); - let scale = props.view.scale; - Callback::from(move |e: PointerEvent| { - let mut d = drag.borrow_mut(); - let mode = match &d.mode { - Some(m) => m.clone(), - None => { - // free hover: report position for peak identification - let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64); - hover.emit((ix, iy)); - 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; - } - match mode { - DragMode::Pan => pan_cb.emit((dx, dy)), - DragMode::Marker(i) => marker_drag.emit((i, dx / scale, dy / scale)), - } - }) - }; - - let on_pointerleave = { - let hover_end = props.callbacks.hover_end.clone(); - Callback::from(move |_: PointerEvent| hover_end.emit(())) - }; - - let on_pointerup = { - 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| { - let mode = drag.borrow_mut().mode.take(); - if let Some(c) = canvas_ref.cast::() { - 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(); - Callback::from(move |e: WheelEvent| { - e.prevent_default(); - let cx = e.client_x() as f64 - - canvas_ref - .cast::() - .map(|c| c.get_bounding_client_rect().left()) - .unwrap_or(0.0); - let cy = e.client_y() as f64 - - canvas_ref - .cast::() - .map(|c| c.get_bounding_client_rect().top()) - .unwrap_or(0.0); - let factor = 1.0015f64.powf(-(e.delta_y() as f64)); - zoom.emit((cx, cy, factor)); - }) - }; - - html! { - - } -} - -/// Port of the desktop `viewport::layout_label_y`: place labels right of -/// their crosses, pushing colliding ones up; iterate to a fixed point -/// (the C single pass can leave overlaps). Inputs must be sorted by x. -fn layout_label_y( - xs: &[f32], - ys: &[f32], - widths: &[f32], - in_img: &[bool], - line_h: f32, -) -> Vec<(f32, f32)> { - let n = xs.len(); - let mut label_x = vec![0.0f32; n]; - let mut label_y = vec![0.0f32; n]; - let cross = 4.0f32; - let overlap = |a1: f32, l1: f32, a2: f32, l2: f32| a1 <= a2 + l2 && a1 + l1 >= a2; - - for i in 0..n { - if !in_img[i] { - continue; - } - label_x[i] = widths[i] + 1.0; - label_y[i] = 0.0; - - let mut colliding: Vec = Vec::new(); - for j in (0..i).rev() { - if !in_img[j] { - continue; - } - if overlap(xs[i], label_x[i], xs[j] - cross, label_x[j]) { - colliding.push(j); - } else { - break; - } - } - colliding.sort_by(|&a, &b| { - let ya = ys[a] + label_y[a]; - let yb = ys[b] + label_y[b]; - yb.total_cmp(&ya) - }); - for _round in 0..64 { - let mut pushed = false; - for &j in &colliding { - if overlap( - ys[i] + label_y[i] - line_h, - line_h, - ys[j] + label_y[j] - line_h, - line_h, - ) || overlap(ys[i] + label_y[i] - line_h, line_h, ys[j] - cross, 2.0 * cross) - { - let ny = (ys[j] + label_y[j] - ys[i] - line_h - 2.0).round(); - if ny < label_y[i] { - label_y[i] = ny; - pushed = true; - } - } - } - if !pushed { - break; - } - } - } - - (0..n).map(|i| (label_x[i], label_y[i])).collect() -} diff --git a/crates/gipfel-web/src/compass.rs b/crates/gipfel-web/src/compass.rs deleted file mode 100644 index b539e07..0000000 --- a/crates/gipfel-web/src/compass.rs +++ /dev/null @@ -1,349 +0,0 @@ -//! Compass strip (canvas port of the desktop `compass.rs`, Aligned style): -//! shares the image's horizontal transform so each direction sits above -//! its position in the image; drag horizontally to change the view azimuth. - -use web_sys::{HtmlCanvasElement, PointerEvent};use yew::prelude::*; - -use gipfel_core::projection::{projection_from_type, ProjArgs, Projection, ProjectionType, ViewParams}; - -use crate::bridge; - -pub const STRIP_H: f64 = 56.0; - -/// Damped, clamped Newton iteration for a scalar inverse projection: find -/// `a` such that `f(a) ≈ target` (identical to the desktop solver). -pub fn newton_inverse( - target: f64, - mut f: impl FnMut(f64) -> Option, - seed: f64, - lo: f64, - hi: f64, -) -> f64 { - let mut a = seed.clamp(lo, hi); - for _ in 0..6 { - let Some(y) = f(a) else { break }; - let resid = y - target; - let h = 1e-5; - let (Some(y1), Some(y2)) = (f(a + h), f(a - h)) else { - break; - }; - let d = (y1 - y2) / (2.0 * h); - if !d.is_finite() || d.abs() < 1e-9 { - break; - } - let step = (resid / d).clamp(-0.3, 0.3); - a = (a - step).clamp(lo, hi); - if step.abs() < 1e-10 { - break; - } - } - a -} - -/// azimuth whose image x is `x_img`, measured with `c_ref` as center angle -pub fn alph_at_img_x( - ptype: ProjectionType, - proj: &dyn Projection, - p: &ViewParams, - x_img: f64, - c_ref: f64, -) -> f64 { - let mut p = *p; - p.a_center = c_ref; - let seed = match ptype { - ProjectionType::Rectilinear => c_ref + (x_img / p.scale).atan(), - ProjectionType::Cylindrical => c_ref + x_img / p.scale, - }; - let (lo, hi) = match ptype { - ProjectionType::Rectilinear => (c_ref - 1.55, c_ref + 1.55), - ProjectionType::Cylindrical => (c_ref - 3.1, c_ref + 3.1), - }; - newton_inverse( - x_img, - |a| Some(proj.mac_x(ProjArgs::from_params(&p, a, 0.0))), - seed, - lo, - hi, - ) -} - -const DIRS: [(f64, &str); 8] = [ - (0.0, "N"), - (45.0, "NE"), - (90.0, "E"), - (135.0, "SE"), - (180.0, "S"), - (225.0, "SW"), - (270.0, "W"), - (315.0, "NW"), -]; - -/// everything the strip needs; all plain data so Yew can diff it -#[derive(Clone, Copy, PartialEq)] -pub struct CompassData { - pub ptype: ProjectionType, - pub parms: ViewParams, - pub center_deg: f64, - pub zoom: f64, - /// screen x of the image center (strip shares the image transform) - pub cx: f64, - /// lens FOV half-angle limit, radians (0 = none) - pub max_view_angle: f64, -} - -#[derive(Properties, PartialEq)] -pub struct Props { - pub data: CompassData, - /// bumped on window resize to force a redraw - pub tick: u32, - /// new azimuth in degrees while dragging - pub on_change: Callback, -} - -#[function_component(Compass)] -pub fn compass(props: &Props) -> Html { - let canvas_ref = use_node_ref(); - let drag = use_mut_ref(|| Option::<(f64, f64)>::None); // (press x, center_deg) - - let d = props.data; - - // draw - { - let canvas_ref = canvas_ref.clone(); - use_effect_with((d, props.tick), move |(d, _tick)| { - let Some(canvas) = canvas_ref.cast::() else { - return; - }; - let Some(ctx) = bridge::ctx2d(&canvas) else { - return; - }; - let dpr = bridge::window().device_pixel_ratio(); - let w = canvas.client_width() as f64; - let bw = (w * dpr).max(1.0) as u32; - let bh = (STRIP_H * 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(dpr, 0.0, 0.0, dpr, 0.0, 0.0); - - let on = "rgb(217, 217, 217)"; - let bg = "rgb(41, 41, 41)"; - let divider = "rgb(82, 82, 82)"; - let red = "rgb(255, 102, 64)"; - - let fill = |c: &str| { - #[allow(deprecated)] - ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(c)); - }; - let stroke = |c: &str, width: f64| { - #[allow(deprecated)] - ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str(c)); - ctx.set_line_width(width); - }; - - fill(bg); - ctx.fill_rect(0.0, 0.0, w, STRIP_H); - stroke(divider, 1.0); - ctx.begin_path(); - ctx.move_to(0.0, 0.5); - ctx.line_to(w, 0.5); - ctx.stroke(); - - let label_y = 17.0f64; // text baseline of the direction row - let y0 = (STRIP_H - 10.0).round(); // baseline of the ticks - let tri_y = 25.0f64; - let z = d.zoom; - let proj = projection_from_type(d.ptype); - let cx = d.cx; - let c = d.parms.a_center; - - let x_img_at = |alph: f64| proj.get_coordinates(alph, 0.0, &d.parms).0; - - // adaptive tick step: first that yields >= 6 px spacing - let ppd = ((x_img_at(c + 1f64.to_radians()) - x_img_at(c - 1f64.to_radians())) - * z - / 2.0) - .abs(); - let step = [1.0f64, 2.0, 5.0, 10.0, 15.0, 30.0, 45.0, 90.0] - .into_iter() - .find(|s| s * ppd >= 6.0) - .unwrap_or(90.0); - - let a_lo = alph_at_img_x(d.ptype, &*proj, &d.parms, -cx / z, c) - .min(c - std::f64::consts::PI); - let a_hi = alph_at_img_x(d.ptype, &*proj, &d.parms, (w - cx) / z, c) - .max(c + std::f64::consts::PI); - // rectilinear folds directions behind the camera onto the same - // pixels; also clamp to the lens FOV (distortion can fold - // out-of-view directions back onto the strip) - let mut fold = match d.ptype { - ProjectionType::Rectilinear => 1.535, - ProjectionType::Cylindrical => std::f64::consts::PI, - }; - if d.max_view_angle > 0.0 { - fold = fold.min(d.max_view_angle); - } - let a_lo = a_lo.max(c - fold); - let a_hi = a_hi.min(c + fold); - - // baseline - stroke(on, 1.0); - ctx.begin_path(); - ctx.move_to(0.0, y0 + 0.5); - ctx.line_to(w, y0 + 0.5); - ctx.stroke(); - - // ticks - let step_rad = step.to_radians(); - let mut a = (a_lo / step_rad).floor() * step_rad; - while a <= a_hi { - let x = cx + x_img_at(a) * z; - if x.is_finite() && x >= -1.0 && x <= w + 1.0 { - let rem = a.to_degrees().rem_euclid(45.0); - let major = rem.min(45.0 - rem) < step / 2.0; - let x = x.round(); - ctx.begin_path(); - ctx.move_to(x, y0); - ctx.line_to(x, y0 - if major { 12.0 } else { 6.0 }); - ctx.stroke(); - } - a += step_rad; - } - - // direction labels - ctx.set_font("13px system-ui, sans-serif"); - ctx.set_text_align("center"); - for (deg, name) in DIRS { - let alph = deg.to_radians(); - let rel = (alph - c + std::f64::consts::PI).rem_euclid(std::f64::consts::TAU) - - std::f64::consts::PI; - if rel.abs() > fold { - continue; - } - let x = cx + x_img_at(alph) * z; - if !x.is_finite() || x < -20.0 || x > w + 20.0 { - continue; - } - fill(if deg == 0.0 { red } else { on }); - ctx.fill_text(name, x, label_y).ok(); - } - ctx.set_text_align("start"); - - // center marker: triangle + hairline + azimuth readout - fill(red); - ctx.begin_path(); - ctx.move_to(cx - 6.0, tri_y); - ctx.line_to(cx + 6.0, tri_y); - ctx.line_to(cx, tri_y + 8.0); - ctx.close_path(); - ctx.fill(); - stroke(red, 1.0); - ctx.begin_path(); - ctx.move_to(cx.round(), tri_y + 8.0); - ctx.line_to(cx.round(), y0); - ctx.stroke(); - fill(red); - ctx.fill_text(&format!("{:05.1}°", d.center_deg.rem_euclid(360.0)), cx + 10.0, tri_y + 9.0) - .ok(); - }); - } - - let local_x = { - let canvas_ref = canvas_ref.clone(); - move |client_x: f64| { - client_x - - canvas_ref - .cast::() - .map(|c| c.get_bounding_client_rect().left()) - .unwrap_or(0.0) - } - }; - - let on_pointerdown = { - let drag = drag.clone(); - let canvas_ref = canvas_ref.clone(); - let center_deg = props.data.center_deg; - Callback::from(move |e: PointerEvent| { - e.prevent_default(); - if let Some(c) = canvas_ref.cast::() { - let _ = c.set_pointer_capture(e.pointer_id()); - } - *drag.borrow_mut() = Some((e.client_x() as f64, center_deg)); - }) - }; - let on_pointermove = { - let drag = drag.clone(); - let on_change = props.on_change.clone(); - let d = props.data; - Callback::from(move |e: PointerEvent| { - let Some((x0, c0_deg)) = *drag.borrow() else { - return; - }; - let proj = projection_from_type(d.ptype); - let c0 = c0_deg.to_radians(); - let lx0 = local_x(e.client_x() as f64); - let a0 = alph_at_img_x(d.ptype, &*proj, &d.parms, (x0 - d.cx) / d.zoom, c0); - let a1 = alph_at_img_x(d.ptype, &*proj, &d.parms, (lx0 - d.cx) / d.zoom, c0); - on_change.emit((c0 - (a1 - a0)).to_degrees()); - }) - }; - let on_pointerup = { - let drag = drag.clone(); - let canvas_ref = canvas_ref.clone(); - Callback::from(move |e: PointerEvent| { - *drag.borrow_mut() = None; - if let Some(c) = canvas_ref.cast::() { - let _ = c.release_pointer_capture(e.pointer_id()); - } - }) - }; - - html! { - - } -} - -#[cfg(test)] -mod tests { - use super::*; - - fn roundtrip(ptype: ProjectionType, k0: f64, k1: f64, x0: f64) { - let proj = projection_from_type(ptype); - let mut parms = ViewParams::new(); - parms.a_center = 0.3; - parms.scale = 3000.0; - parms.k0 = k0; - parms.k1 = k1; - parms.x0 = x0; - for x in [-2500.0, -800.0, -50.0, 0.0, 120.0, 900.0, 2400.0] { - let a = alph_at_img_x(ptype, &*proj, &parms, x, parms.a_center); - let (x2, _) = proj.get_coordinates(a, 0.0, &parms); - assert!( - (x2 - x).abs() < 1e-6, - "{ptype:?} x={x}: round-trips to {x2} (alph {a})" - ); - } - } - - #[test] - fn inverse_rectilinear() { - roundtrip(ProjectionType::Rectilinear, 0.0, 0.0, 0.0); - } - #[test] - fn inverse_rectilinear_distorted() { - roundtrip(ProjectionType::Rectilinear, 0.002, -0.0003, 0.01); - } - #[test] - fn inverse_cylindrical() { - roundtrip(ProjectionType::Cylindrical, 0.0, 0.0, 0.0); - } -} diff --git a/crates/gipfel-web/src/main.rs b/crates/gipfel-web/src/main.rs deleted file mode 100644 index 741393b..0000000 --- a/crates/gipfel-web/src/main.rs +++ /dev/null @@ -1,10 +0,0 @@ -mod app; -mod bridge; -mod canvas_view; -mod compass; -mod markers; -mod widgets; - -fn main() { - yew::Renderer::::new().render(); -} diff --git a/crates/gipfel-web/src/markers.rs b/crates/gipfel-web/src/markers.rs deleted file mode 100644 index d024f2e..0000000 --- a/crates/gipfel-web/src/markers.rs +++ /dev/null @@ -1,60 +0,0 @@ -//! 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. -/// Same graduated behavior as the original: 1 marker fits the center -/// angle, 2 add the scale, 4+ the full viewpoint (+ distortion when -/// unlocked and enough markers). -pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Result<(), String> { - if markers.is_empty() { - 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. Hills hidden by the -/// occlusion heuristic are skipped unless `show_hidden`. -pub fn nearest_hill( - pan: &Panorama, - x: f64, - y: f64, - max_dist: f64, - show_hidden: bool, -) -> Option { - let mut best = None; - let mut best_d = max_dist; - for &i in &pan.visible { - if !show_hidden && pan.hills[i].flags & gipfel_core::hill::FLAG_HIDDEN != 0 { - continue; - } - 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 -} diff --git a/crates/gipfel-web/src/widgets.rs b/crates/gipfel-web/src/widgets.rs deleted file mode 100644 index 1d22bac..0000000 --- a/crates/gipfel-web/src/widgets.rs +++ /dev/null @@ -1,77 +0,0 @@ -//! Small form controls: full-width slider with value readout above -//! (mirrors the desktop `slider_item` layout) and a numeric input row. - -use web_sys::{HtmlInputElement, InputEvent}; -use yew::prelude::*; - -#[derive(Properties, PartialEq)] -pub struct SliderProps { - pub label: AttrValue, - /// formatted value shown right of the label - pub display: AttrValue, - pub value: f64, - pub min: f64, - pub max: f64, - pub step: f64, - pub onchange: Callback, -} - -#[function_component(SliderItem)] -pub fn slider_item(p: &SliderProps) -> Html { - // live update while dragging (oninput), not only on release - let oninput = { - let onchange = p.onchange.clone(); - Callback::from(move |e: InputEvent| { - let input: HtmlInputElement = e.target_unchecked_into(); - if let Ok(v) = input.value().parse::() { - onchange.emit(v); - } - }) - }; - html! { -
-
- { p.label.as_ref().to_string() } - { p.display.as_ref().to_string() } -
- -
- } -} - -#[derive(Properties, PartialEq)] -pub struct NumProps { - pub label: AttrValue, - pub value: f64, - pub step: f64, - #[prop_or(2)] - pub decimals: usize, - pub onchange: Callback, -} - -#[function_component(NumItem)] -pub fn num_item(p: &NumProps) -> Html { - let onchange = { - let onchange = p.onchange.clone(); - Callback::from(move |e: Event| { - let input: HtmlInputElement = e.target_unchecked_into(); - if let Ok(v) = input.value().parse::() { - onchange.emit(v); - } - }) - }; - let display = format!("{:.*}", p.decimals, p.value); - html! { - - } -} diff --git a/crates/gipfel-web/www/style.css b/crates/gipfel-web/www/style.css deleted file mode 100644 index 5122c43..0000000 --- a/crates/gipfel-web/www/style.css +++ /dev/null @@ -1,221 +0,0 @@ -* { - box-sizing: border-box; -} -html, -body { - margin: 0; - height: 100%; - font-family: system-ui, sans-serif; -} -.app { - display: flex; - height: 100vh; - background: #101014; - color: #e8e8ea; -} -.sidebar { - width: 300px; - padding: 16px; - background: #1a1a20; - border-right: 1px solid #2c2c34; - display: flex; - flex-direction: column; - gap: 8px; - overflow-y: auto; -} -.sidebar h1 { - margin: 0; - font-size: 22px; -} -.tag { - margin: 0 0 12px; - color: #8a8a94; - font-size: 12px; - text-transform: uppercase; - letter-spacing: 1px; -} -.sidebar button { - padding: 8px 12px; - background: #3b6fd4; - color: #fff; - border: 0; - border-radius: 6px; - font-size: 14px; - cursor: pointer; -} -.sidebar button:hover { - background: #4a7ee4; -} -.status { - font-size: 13px; - color: #c8c8d0; - word-break: break-word; -} -.hint { - font-size: 12px; - color: #8a8a94; -} -.row { - display: flex; - gap: 6px; - align-items: center; - font-size: 13px; - cursor: pointer; -} -.fitinfo { - font-size: 12px; - color: #9fd09f; - font-variant-numeric: tabular-nums; -} -.hover { - font-size: 14px; - font-weight: 600; - color: #ffffff; -} -.dim { - opacity: 0.6; -} -.hidden-file { - display: none; -} -.main { - flex: 1; - min-width: 0; - display: flex; - flex-direction: column; -} -.canvaswrap { - flex: 1; - position: relative; - min-height: 0; -} -canvas.viewport { - position: absolute; - inset: 0; - width: 100%; - height: 100%; - display: block; - touch-action: none; - cursor: grab; -} -canvas.compass { - display: block; - width: 100%; - touch-action: none; - cursor: ew-resize; -} -.section { - margin-top: 14px; - font-size: 11px; - text-transform: uppercase; - letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; - padding-bottom: 3px; -} -.slider { - display: flex; - flex-direction: column; - gap: 2px; - margin-top: 8px; -} -.sliderhead { - display: flex; - justify-content: space-between; - font-size: 12px; - color: #c8c8d0; -} -.slider input[type="range"] { - width: 100%; -} -.numrow { - display: flex; - justify-content: space-between; - align-items: center; - gap: 8px; - font-size: 13px; - margin-top: 6px; -} -.numrow input { - width: 130px; - padding: 4px 6px; - background: #24242c; - color: #e8e8ea; - border: 1px solid #34343e; - border-radius: 4px; -} -.fpbackdrop { - position: absolute; - inset: 0; - z-index: 9; -} -.findpeak { - position: absolute; - z-index: 10; - width: 280px; - background: #1e1e26; - border: 1px solid #3a3a46; - border-radius: 6px; - box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5); - display: flex; - flex-direction: column; -} -.fpsearch { - padding: 8px; - border-bottom: 1px solid #2c2c34; -} -.fpsearch input { - width: 100%; - padding: 5px 8px; - background: #24242c; - border: 1px solid #3a3a46; - border-radius: 4px; - color: #e8e8ea; - font-size: 13px; -} -.fplist { - max-height: 320px; - overflow-y: auto; -} -.fpempty { - padding: 8px 10px; - font-size: 13px; - color: #8a8a94; - margin: 0; -} -.fpfoot { - padding: 6px 8px; - border-top: 1px solid #2c2c34; - text-align: right; -} -.fpcancel { - padding: 4px 12px; - background: #34343e; - color: #e8e8ea; - border: 0; - border-radius: 4px; - font-size: 12px; - cursor: pointer; -} -.fphead { - padding: 6px 10px; - font-size: 11px; - text-transform: uppercase; - letter-spacing: 1px; - color: #8a8a94; - border-bottom: 1px solid #2c2c34; -} -.fpitem { - display: block; - width: 100%; - text-align: left; - padding: 6px 10px; - background: none; - border: 0; - color: #e8e8ea; - font-size: 13px; - cursor: pointer; -} -.fpitem:hover { - background: #2f6fd4; -} diff --git a/crates/wipfel/Cargo.toml b/crates/wipfel/Cargo.toml new file mode 100644 index 0000000..e1e39e1 --- /dev/null +++ b/crates/wipfel/Cargo.toml @@ -0,0 +1,42 @@ +[package] +name = "wipfel" +version.workspace = true +edition.workspace = true +license.workspace = true +description = "wipfel — web based gipfel photogrammetry for mountain images" + +[dependencies] +gipfel-core = { path = "../gipfel-core" } +flate2 = "1" +js-sys = "0.3" +wasm-bindgen = "0.2" +wasm-bindgen-futures = "0.4" +yew = { version = "0.21", features = ["csr"] } + +[dependencies.web-sys] +version = "0.3" +features = [ + "Blob", + "CanvasRenderingContext2d", + "DataTransfer", + "Document", + "DomRect", + "DragEvent", + "Element", + "Event", + "EventTarget", + "File", + "FileList", + "HtmlCanvasElement", + "HtmlElement", + "HtmlInputElement", + "ImageBitmap", + "InputEvent", + "MouseEvent", + "PointerEvent", + "Request", + "Response", + "TextMetrics", + "Window", + "WheelEvent", +] diff --git a/crates/wipfel/README.md b/crates/wipfel/README.md new file mode 100644 index 0000000..37c09ea --- /dev/null +++ b/crates/wipfel/README.md @@ -0,0 +1,47 @@ +# wipfel + +Browser front end for gipfel (WASM, Yew + canvas 2D). See +[`/wasm-plan.md`](../../wasm-plan.md) for the overall plan and milestones. + +**Status: W1 (scaffold + image display) done** — open/drag-drop a JPEG, +pan (drag) and zoom (wheel, cursor-anchored). Peak identification, +fitting and saving arrive in W2/W3. + +## Development + +Prerequisites: [rustup](https://rustup.rs) and trunk: + +```sh +cargo install --locked trunk +``` + +Serve with hot reload: + +```sh +cd crates/wipfel +trunk serve --port 8090 # then open http://localhost:8090 +``` + +Release build (static output in `dist/`, serveable by any web server): + +```sh +trunk build --release +``` + +## Layout + +| File | Purpose | +|---|---| +| `src/main.rs` | entry point | +| `src/app.rs` | root component: sidebar, file loading, state | +| `src/canvas_view.rs` | viewport canvas: bitmap blit, pan/zoom | +| `src/bridge.rs` | JS glue: image decode, blob read, canvas ctx | +| `index.html` | trunk entry point (canonical trunk layout) | +| `www/style.css` | stylesheet (trunk asset) | + +## Notes + +- The base image is decoded by the browser (`createImageBitmap`), not + by the `image` crate — faster decode and GPU-backed blitting. +- The crate compiles natively (`cargo check -p wipfel`) so it can + be checked in CI without a wasm toolchain; runtime is wasm-only. diff --git a/crates/wipfel/index.html b/crates/wipfel/index.html new file mode 100644 index 0000000..d00adbe --- /dev/null +++ b/crates/wipfel/index.html @@ -0,0 +1,11 @@ + + + + + + wipfel — web based gipfel photogrammetry + + + + + diff --git a/crates/wipfel/serve-here.sh b/crates/wipfel/serve-here.sh new file mode 100755 index 0000000..9667965 --- /dev/null +++ b/crates/wipfel/serve-here.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Build wipfel for wasm and refresh the static dist dir served from +# /tmp/wipfel-dist (python http.server on :8090). Dev-only helper. +set -e +cd "$(dirname "$0")/../.." +cargo build -p wipfel --target wasm32-unknown-unknown --release +DIST=/tmp/wipfel-dist +mkdir -p "$DIST" +wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/wipfel.wasm +cp crates/wipfel/www/style.css "$DIST/" +gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" +echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs new file mode 100644 index 0000000..eeb82d6 --- /dev/null +++ b/crates/wipfel/src/app.rs @@ -0,0 +1,763 @@ +//! 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::hill::{FLAG_DUPLIC, FLAG_HIDDEN, FLAG_TRACK_POINT}; +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; +use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; +use yew::prelude::*; + +use crate::bridge; +use crate::canvas_view::{CanvasView, MarkerView, ViewCallbacks, ViewState}; +use crate::compass::{Compass, CompassData}; +use crate::markers::{self, Marker}; +use crate::widgets::{NumItem, SliderItem}; + +/// sidebar-editable view parameters (degrees / meters / mm) +#[derive(Clone, Copy, PartialEq)] +struct UiParams { + lat: f64, + lon: f64, + height: f64, + az: f64, + focal: f64, + pitch: f64, + roll: f64, + /// visibility UI value: 0.11 - height_dist_ratio (right = more visible) + vis: f64, + label_font: f32, +} + +impl Default for UiParams { + fn default() -> Self { + UiParams { + lat: 0.0, + lon: 0.0, + height: 0.0, + az: 0.0, + focal: 50.0, + pitch: 0.0, + roll: 0.0, + vis: 0.04, + label_font: 12.0, + } + } +} + +/// open Find Peak popup: anchor (screen + image coords) and search query +#[derive(Clone, PartialEq)] +struct FindPeak { + sx: f64, + sy: f64, + ix: f64, + iy: f64, + query: String, +} + +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}")) +} + +#[derive(Properties, PartialEq)] +struct FpProps { + fp: FindPeak, + items: Vec<(String, usize)>, + on_pick: Callback, + on_query: Callback, + on_close: Callback<()>, +} + +/// searchable Find Peak dialog: type to filter, click to select +#[function_component(FindPeakPanel)] +fn find_peak_panel(p: &FpProps) -> Html { + let input_ref = use_node_ref(); + // focus the search box when the dialog opens + { + let input_ref = input_ref.clone(); + use_effect_with((), move |_| { + if let Some(i) = input_ref.cast::() { + let _ = i.focus(); + } + }); + } + let on_query = { + let on_query = p.on_query.clone(); + Callback::from(move |e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + on_query.emit(input.value()); + }) + }; + let on_close = { + let on_close = p.on_close.clone(); + Callback::from(move |_: MouseEvent| on_close.emit(())) + }; + html! { + <> +
+
+
{ "Find Peak" }
+
+ +
+
+ { + for p.items.iter().map(|(label, idx)| { + let onclick = { + let on_pick = p.on_pick.clone(); + let i = *idx; + Callback::from(move |_: MouseEvent| on_pick.emit(i)) + }; + html! { + + } + }) + } + if p.items.is_empty() { +

{ "no matches" }

+ } +
+
+ +
+
+ + } +} + +#[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); + let hover = use_state(|| Option::::None); + let vp = use_state(UiParams::default); + let img_size = use_state(|| (0u32, 0u32)); + let find_peak = use_state(|| Option::::None); + let show_hidden = 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) + { + let tick = tick.clone(); + use_effect_with((), move |_| { + let closure = Closure::wrap(Box::new(move || tick.set(*tick + 1)) as Box); + let _ = bridge::window() + .add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref()); + // the listener is never removed (app lifetime); leak the closure + std::mem::forget(closure); + }); + } + + // 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(); + let view = view.clone(); + let canvas_ref = canvas_ref.clone(); + Callback::from(move |_: MouseEvent| { + let Some(bmp) = bitmap.as_ref() else { return }; + let (cw, ch) = canvas_ref + .cast::() + .map(|c| (c.client_width() as f64, c.client_height() as f64)) + .unwrap_or((800.0, 600.0)); + let (iw, ih) = (bmp.width() as f64, bmp.height() as f64); + if iw <= 0.0 || ih <= 0.0 || cw <= 0.0 || ch <= 0.0 { + return; + } + let scale = (cw / iw).min(ch / ih); + view.set(ViewState { + scale, + ox: (cw - iw * scale) / 2.0, + oy: (ch - ih * scale) / 2.0, + }); + }) + }; + + // 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]| { + if mk.is_empty() { + fit_info.set(String::new()); + return; + } + let info = { + let mut p = pan.borrow_mut(); + match markers::refit(&mut p, mk, *fit_distortion) { + Ok(()) => 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() + ), + Err(e) => format!("fit failed: {e}"), + } + }; + fit_info.set(info); + }) + }; + + // place a marker for a hill at an image position and refit + let mark_peak = { + let markers = markers.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |(idx, ix, iy): (usize, f64, f64)| { + let mut mk = (*markers).clone(); + mk.retain(|m| m.hill != idx); + mk.push(Marker { hill: idx, x: ix, y: iy }); + do_refit(&mk); + markers.set(mk); + }) + }; + + // 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(); + let vp = vp.clone(); + let img_size = img_size.clone(); + let find_peak = find_peak.clone(); + Callback::from(move |(bytes, name): (Vec, String)| { + let (bitmap, status, fit, pan, markers, fit_info) = + (bitmap.clone(), status.clone(), fit.clone(), pan.clone(), markers.clone(), fit_info.clone()); + let vp = vp.clone(); + let img_size = img_size.clone(); + let find_peak = find_peak.clone(); + spawn_local(async move { + match bridge::decode_bitmap(&bytes).await { + Ok(bmp) => { + 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 u = { + let p = pan.borrow(); + UiParams { + lat: p.get_view_lat(), + lon: p.get_view_long(), + height: p.get_view_height(), + az: p.get_center_angle().rem_euclid(360.0), + focal: (p.get_scale() * 35.0 / w as f64).clamp(1.0, 300.0), + pitch: p.get_pitch_angle(), + roll: p.get_roll_angle(), + vis: (0.11 - p.height_dist_ratio).clamp(0.01, 0.1), + label_font: vp.label_font, + } + }; + vp.set(u); + img_size.set((w, h)); + 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()); + find_peak.set(None); + bitmap.set(Some(bmp)); + fit.emit(MouseEvent::new("fit").unwrap()); + // same nudge as the desktop app: re-fit shortly + // after the first paint so the image is guaranteed + // to appear even if layout was not ready yet + { + let fit = fit.clone(); + spawn_local(async move { + let _ = wasm_bindgen_futures::JsFuture::from( + bridge::delay_promise(120), + ) + .await; + fit.emit(MouseEvent::new("fit").unwrap()); + }); + } + } + Err(e) => status.set(format!("Failed to load {name}: {e}")), + } + }); + }) + }; + + let read_file = { + let load_bytes = load_bytes.clone(); + let status = status.clone(); + Rc::new(move |file: web_sys::File| { + let (load_bytes, status) = (load_bytes.clone(), status.clone()); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => load_bytes.emit((bytes, name)), + Err(e) => status.set(format!("Failed to read {name}: {e}")), + } + }); + }) + }; + + let on_file_change = { + let read_file = read_file.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Some(file) = input.files().and_then(|fl| fl.item(0)) { + read_file(file); + } + }) + }; + + let on_drop = { + let read_file = read_file.clone(); + 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)) + { + Some(file) => read_file(file), + None => status.set("Dropped item was not a file.".to_string()), + } + }) + }; + let on_dragover = Callback::from(|e: DragEvent| e.prevent_default()); + + let open_picker = { + let file_ref = file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = file_ref.cast::() { + input.click(); + } + }) + }; + + 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); + }) + }; + + // sidebar parameter editing: update UI state and apply to the panorama + macro_rules! param_cb { + ($field:ident, $apply:expr) => {{ + let vp = vp.clone(); + let pan = pan.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.$field = v; + vp.set(u); + let f: &dyn Fn(&mut Panorama, f64) = &$apply; + f(&mut pan.borrow_mut(), v); + }) + }}; + } + let on_lat = param_cb!(lat, |p: &mut Panorama, v| p.set_view_lat(v)); + let on_lon = param_cb!(lon, |p, v| p.set_view_long(v)); + let on_height = param_cb!(height, |p, v| p.set_view_height(v)); + let on_az = param_cb!(az, |p, v| p.set_center_angle(v)); + let on_pitch = param_cb!(pitch, |p, v| p.set_pitch_angle(v)); + let on_roll = param_cb!(roll, |p, v| p.set_roll_angle(v)); + let on_vis = param_cb!(vis, |p, v| p.set_height_dist_ratio(0.11 - v)); + let on_focal = { + let vp = vp.clone(); + let pan = pan.clone(); + let img_size = img_size.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.focal = v; + vp.set(u); + let w = img_size.0 as f64; + if w > 0.0 { + pan.borrow_mut().set_scale(v * w / 35.0); + } + }) + }; + let on_font = { + let vp = vp.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.label_font = v as f32; + vp.set(u); + }) + }; + let on_show_hidden = { + let show_hidden = show_hidden.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + show_hidden.set(input.checked()); + }) + }; + + // compass strip: shares the image transform, drag changes azimuth + let compass_data = { + let p = pan.borrow(); + CompassData { + ptype: p.projection_type, + parms: p.parms, + center_deg: p.get_center_angle(), + zoom: view.scale, + cx: view.ox + img_size.0 as f64 * view.scale / 2.0, + max_view_angle: p.max_view_angle, + } + }; + let compass_change = { + let pan = pan.clone(); + let vp = vp.clone(); + Callback::from(move |deg: f64| { + pan.borrow_mut().set_center_angle(deg); + let mut u = *vp; + u.az = deg.rem_euclid(360.0); + vp.set(u); + }) + }; + + let fp_close = { + let find_peak = find_peak.clone(); + Callback::from(move |_: ()| find_peak.set(None)) + }; + + // Find Peak picker: searchable list over the geographically close hills + // (same candidate set and filtering as the desktop dialog) + let findpeak_popup = if let Some(fp) = &*find_peak { + let items: Vec<(String, usize)> = { + let p = pan.borrow(); + let q = fp.query.to_uppercase(); + let mut entries: Vec<(String, usize)> = p + .close + .iter() + .filter(|&&i| { + let h = &p.hills[i]; + h.flags & (FLAG_DUPLIC | FLAG_TRACK_POINT) == 0 + && (q.is_empty() || h.name.to_uppercase().contains(&q)) + }) + .map(|&i| { + ( + format!("{} ({} m)", p.hills[i].name, p.hills[i].height as i64), + i, + ) + }) + .collect(); + entries.sort_by(|a, b| a.0.cmp(&b.0)); + entries.truncate(300); + entries + }; + let on_pick = { + let mark = mark_peak.clone(); + let find_peak = find_peak.clone(); + let (ix, iy) = (fp.ix, fp.iy); + Callback::from(move |hill: usize| { + mark.emit((hill, ix, iy)); + find_peak.set(None); + }) + }; + let on_query = { + let find_peak = find_peak.clone(); + Callback::from(move |q: String| { + if let Some(mut fp) = (*find_peak).clone() { + fp.query = q; + find_peak.set(Some(fp)); + } + }) + }; + html! { + + } + } else { + Html::default() + }; + + let callbacks = ViewCallbacks { + pan: { + let view = view.clone(); + Callback::from(move |(dx, dy): (f64, f64)| { + let mut v = (*view).clone(); + v.ox += dx; + v.oy += dy; + view.set(v); + }) + }, + zoom: { + let view = view.clone(); + Callback::from(move |(cx, cy, factor): (f64, f64, f64)| { + let v = &*view; + let ns = (v.scale * factor).clamp(0.02, 64.0); + let k = ns / v.scale; + view.set(ViewState { + scale: ns, + ox: cx - (cx - v.ox) * k, + oy: cy - (cy - v.oy) * k, + }); + }) + }, + click: { + let pan = pan.clone(); + let view = view.clone(); + let mark = mark_peak.clone(); + let find_peak = find_peak.clone(); + let img_size = img_size.clone(); + let show_hidden = show_hidden.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let scale = view.scale; + // unambiguous click right on a peak: mark directly + // (borrow must be released before mark -> do_refit!) + let near = { + let p = pan.borrow(); + markers::nearest_hill(&p, ix, iy, 10.0 / scale, *show_hidden) + }; + if let Some(idx) = near { + find_peak.set(None); + mark.emit((idx, ix, iy)); + return; + } + // otherwise open the Find Peak picker (searchable, like the + // desktop dialog): the correct peak may project far away + // while the viewpoint is still rough + let (w, h) = (img_size.0 as f64, img_size.1 as f64); + find_peak.set(Some(FindPeak { + sx: (ix + w / 2.0) * scale + view.ox, + sy: (iy + h / 2.0) * scale + view.oy, + ix, + iy, + query: String::new(), + })); + }) + }, + 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()); + } + }) + }, + hover: { + let pan = pan.clone(); + let view = view.clone(); + let hover = hover.clone(); + let show_hidden = show_hidden.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let p = pan.borrow(); + let name = markers::nearest_hill(&p, ix, iy, 20.0 / view.scale, *show_hidden) + .map(|i| { + let h = &p.hills[i]; + format!("{} · {:.0} m", h.name, h.height) + }); + hover.set(name); + }) + }, + hover_end: { + let hover = hover.clone(); + Callback::from(move |_: ()| hover.set(None)) + }, + }; + + // 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, bool)> = { + let p = pan.borrow(); + p.visible + .iter() + .filter(|&&i| *show_hidden || p.hills[i].flags & FLAG_HIDDEN == 0) + .map(|&i| { + ( + p.hills[i].x, + p.hills[i].y, + p.hills[i].flags & FLAG_HIDDEN != 0, + ) + }) + .collect() + }; + + let zoom_pct = (view.scale * 100.0).round(); + let n_markers = markers.len(); + + html! { +
+ +
+
+ + { findpeak_popup.clone() } +
+ if bitmap.is_some() { + + } +
+
+ } +} diff --git a/crates/wipfel/src/bridge.rs b/crates/wipfel/src/bridge.rs new file mode 100644 index 0000000..6dbba93 --- /dev/null +++ b/crates/wipfel/src/bridge.rs @@ -0,0 +1,69 @@ +//! Small JS helpers: window access, browser-native image decode, blob +//! reads, canvas context — the hand-written JS boundary of the app. + +use js_sys::Uint8Array; +use wasm_bindgen::JsCast; +use wasm_bindgen_futures::JsFuture; +use web_sys::{Blob, CanvasRenderingContext2d, HtmlCanvasElement, ImageBitmap, Window}; + +pub fn window() -> Window { + web_sys::window().expect("no global window") +} + +/// Decode image bytes into a browser-native (GPU-backed) bitmap. +/// The browser does the JPEG decode and keeps the pixels where canvas +/// blitting is fast — cheaper than any pure-Rust path in wasm. +pub async fn decode_bitmap(bytes: &[u8]) -> Result { + let array = js_sys::Array::new(); + array.push(&Uint8Array::from(bytes).buffer()); + let blob = Blob::new_with_u8_array_sequence(&array).map_err(|_| "blob failed".to_string())?; + let promise = window() + .create_image_bitmap_with_blob(&blob) + .map_err(|_| "createImageBitmap failed".to_string())?; + let value = JsFuture::from(promise) + .await + .map_err(|e| format!("decode failed: {e:?}"))?; + value + .dyn_into::() + .map_err(|_| "decode produced non-bitmap".to_string()) +} + +/// Read a File/Blob fully into memory. +pub async fn read_blob(blob: &Blob) -> Result, String> { + let buf = JsFuture::from(blob.array_buffer()) + .await + .map_err(|e| format!("read failed: {e:?}"))?; + Ok(Uint8Array::new(&buf).to_vec()) +} + +/// Fetch a URL (same-origin) into memory. +pub async fn fetch_bytes(url: &str) -> Result, 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()) +} + +/// setTimeout as an awaitable Promise. +pub fn delay_promise(ms: i32) -> js_sys::Promise { + js_sys::Promise::new(&mut |resolve, _reject| { + let _ = window().set_timeout_with_callback_and_timeout_and_arguments_0(&resolve, ms); + }) +} + +pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option { + canvas + .get_context("2d") + .ok() + .flatten() + .and_then(|c| c.dyn_into::().ok()) +} diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs new file mode 100644 index 0000000..9d4338e --- /dev/null +++ b/crates/wipfel/src/canvas_view.rs @@ -0,0 +1,481 @@ +//! Viewport canvas: browser-native bitmap blitted with a pan/zoom +//! transform, plus the marker overlay and its interactions. + +use web_sys::{HtmlCanvasElement, ImageBitmap, MouseEvent, PointerEvent, WheelEvent}; +use yew::prelude::*; + +use crate::bridge; + +/// Image -> screen transform: `screen = img * scale + (ox, oy)`. +/// Same convention as the desktop viewport widget. +#[derive(Clone, Debug, PartialEq, Default)] +pub struct ViewState { + pub scale: f64, + pub ox: f64, + 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)>, + /// pointer moved over the image (not dragging): (x, y) center-relative + pub hover: Callback<(f64, f64)>, + /// pointer left the canvas + pub hover_end: Callback<()>, +} + +#[derive(Properties, PartialEq)] +pub struct Props { + pub bitmap: Option, + pub view: ViewState, + pub callbacks: ViewCallbacks, + pub canvas_ref: NodeRef, + /// bumped on window resize to force a redraw + pub tick: u32, + pub markers: Vec, + /// projected positions of all visible hills (guide dots) with their + /// hidden-by-occlusion flag + pub candidates: Vec<(f64, f64, bool)>, + /// marker label font size, screen px + pub label_font: f32, +} + +#[derive(Clone, PartialEq)] +enum DragMode { + Pan, + Marker(usize), +} + +#[derive(PartialEq)] +struct DragState { + mode: Option, + last: (f64, f64), + start: (f64, f64), + moved: bool, +} + +#[function_component(CanvasView)] +pub fn canvas_view(props: &Props) -> Html { + 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/marker change and on resize ticks + { + let bitmap = props.bitmap.clone(); + let view = props.view.clone(); + let canvas_ref = props.canvas_ref.clone(); + let markers = props.markers.clone(); + let candidates = props.candidates.clone(); + let label_font = props.label_font; + use_effect_with( + (bitmap, view, props.tick, markers.clone(), candidates.clone(), label_font), + move |(bitmap, view, _tick, markers, candidates, label_font)| { + let Some(canvas) = canvas_ref.cast::() 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, + 0.0, + dpr * view.scale, + dpr * view.ox, + 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: dark outline ring + + // bright core so they stay visible on any photo content; + // peaks hidden by nearer terrain are drawn grey + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); + for (cx, cy, _hidden) in candidates { + let (px, py) = (sx(*cx), sy(*cy)); + if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { + continue; + } + ctx.begin_path(); + let _ = ctx.arc(px, py, 4.5, 0.0, std::f64::consts::TAU); + ctx.fill(); + } + for (cx, cy, hidden) in candidates { + let (px, py) = (sx(*cx), sy(*cy)); + if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { + continue; + } + let color = if *hidden { "rgb(150, 150, 150)" } else { "rgb(110, 231, 183)" }; + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(color)); + ctx.begin_path(); + let _ = ctx.arc(px, py, 2.5, 0.0, std::f64::consts::TAU); + ctx.fill(); + } + + // markers: yellow leader lines, red crosses, collision-free + // labels (port of the desktop viewport drawing) + if !markers.is_empty() { + let label_font = *label_font; + let line_h = label_font * 1.3 + 2.0; + ctx.set_font(&format!("{label_font:.0}px system-ui, sans-serif")); + // layout runs in screen space, sorted by x + let mut order: Vec = (0..markers.len()) + .filter(|&i| { + markers[i].x.abs() * 2.0 <= bitmap.width() as f64 + && markers[i].y.abs() * 2.0 <= bitmap.height() as f64 + }) + .collect(); + order.sort_by(|&a, &b| sx(markers[a].x).total_cmp(&sx(markers[b].x))); + let xs: Vec = order.iter().map(|&i| sx(markers[i].x) as f32).collect(); + let ys: Vec = order.iter().map(|&i| sy(markers[i].y) as f32).collect(); + let widths: Vec = order + .iter() + .map(|&i| { + ctx.measure_text(&markers[i].name) + .map(|m| m.width() as f32) + .unwrap_or_else(|_| markers[i].name.len() as f32 * 7.0) + }) + .collect(); + let in_img = vec![true; order.len()]; + let entries = layout_label_y(&xs, &ys, &widths, &in_img, line_h); + + // leaders (yellow): cross, vertical, horizontal + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 230, 51)")); + ctx.set_line_width(1.0); + for (k, &i) in order.iter().enumerate() { + let (px, py) = (sx(markers[i].x), sy(markers[i].y)); + let (lx, ly) = entries[k]; + let label_line = py + ly as f64 - line_h as f64; + ctx.begin_path(); + ctx.move_to(px - 4.0, py); + ctx.line_to(px + 4.0, py); + ctx.move_to(px, py); + ctx.line_to(px, label_line); + ctx.move_to(px, label_line); + ctx.line_to(px + lx as f64, label_line); + ctx.stroke(); + } + // marker crosses (always red) + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 64, 64)")); + ctx.set_line_width(1.5); + for &i in &order { + let (px, py) = (sx(markers[i].x), sy(markers[i].y)); + 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(); + } + // labels: white on dark shadow, right-aligned at leader end + for (k, &i) in order.iter().enumerate() { + if markers[i].name.is_empty() { + continue; + } + let (px, py) = (sx(markers[i].x), sy(markers[i].y)); + let (lx, ly) = entries[k]; + let label_line = py + ly as f64 - line_h as f64; + let tx = px + lx as f64 - widths[k] as f64; + let ty = label_line - 3.0; + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); + ctx.fill_text(&markers[i].name, tx + 1.0, ty + 1.0).ok(); + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("white")); + ctx.fill_text(&markers[i].name, tx, ty).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::() + .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 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::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } + let rect = canvas_ref + .cast::() + .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 drag = drag.clone(); + let pan_cb = props.callbacks.pan.clone(); + let marker_drag = props.callbacks.marker_drag.clone(); + let hover = props.callbacks.hover.clone(); + let to_img = to_img.clone(); + let scale = props.view.scale; + Callback::from(move |e: PointerEvent| { + let mut d = drag.borrow_mut(); + let mode = match &d.mode { + Some(m) => m.clone(), + None => { + // free hover: report position for peak identification + let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64); + hover.emit((ix, iy)); + 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; + } + match mode { + DragMode::Pan => pan_cb.emit((dx, dy)), + DragMode::Marker(i) => marker_drag.emit((i, dx / scale, dy / scale)), + } + }) + }; + + let on_pointerleave = { + let hover_end = props.callbacks.hover_end.clone(); + Callback::from(move |_: PointerEvent| hover_end.emit(())) + }; + + let on_pointerup = { + 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| { + let mode = drag.borrow_mut().mode.take(); + if let Some(c) = canvas_ref.cast::() { + 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(); + Callback::from(move |e: WheelEvent| { + e.prevent_default(); + let cx = e.client_x() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().left()) + .unwrap_or(0.0); + let cy = e.client_y() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().top()) + .unwrap_or(0.0); + let factor = 1.0015f64.powf(-(e.delta_y() as f64)); + zoom.emit((cx, cy, factor)); + }) + }; + + html! { + + } +} + +/// Port of the desktop `viewport::layout_label_y`: place labels right of +/// their crosses, pushing colliding ones up; iterate to a fixed point +/// (the C single pass can leave overlaps). Inputs must be sorted by x. +fn layout_label_y( + xs: &[f32], + ys: &[f32], + widths: &[f32], + in_img: &[bool], + line_h: f32, +) -> Vec<(f32, f32)> { + let n = xs.len(); + let mut label_x = vec![0.0f32; n]; + let mut label_y = vec![0.0f32; n]; + let cross = 4.0f32; + let overlap = |a1: f32, l1: f32, a2: f32, l2: f32| a1 <= a2 + l2 && a1 + l1 >= a2; + + for i in 0..n { + if !in_img[i] { + continue; + } + label_x[i] = widths[i] + 1.0; + label_y[i] = 0.0; + + let mut colliding: Vec = Vec::new(); + for j in (0..i).rev() { + if !in_img[j] { + continue; + } + if overlap(xs[i], label_x[i], xs[j] - cross, label_x[j]) { + colliding.push(j); + } else { + break; + } + } + colliding.sort_by(|&a, &b| { + let ya = ys[a] + label_y[a]; + let yb = ys[b] + label_y[b]; + yb.total_cmp(&ya) + }); + for _round in 0..64 { + let mut pushed = false; + for &j in &colliding { + if overlap( + ys[i] + label_y[i] - line_h, + line_h, + ys[j] + label_y[j] - line_h, + line_h, + ) || overlap(ys[i] + label_y[i] - line_h, line_h, ys[j] - cross, 2.0 * cross) + { + let ny = (ys[j] + label_y[j] - ys[i] - line_h - 2.0).round(); + if ny < label_y[i] { + label_y[i] = ny; + pushed = true; + } + } + } + if !pushed { + break; + } + } + } + + (0..n).map(|i| (label_x[i], label_y[i])).collect() +} diff --git a/crates/wipfel/src/compass.rs b/crates/wipfel/src/compass.rs new file mode 100644 index 0000000..b539e07 --- /dev/null +++ b/crates/wipfel/src/compass.rs @@ -0,0 +1,349 @@ +//! Compass strip (canvas port of the desktop `compass.rs`, Aligned style): +//! shares the image's horizontal transform so each direction sits above +//! its position in the image; drag horizontally to change the view azimuth. + +use web_sys::{HtmlCanvasElement, PointerEvent};use yew::prelude::*; + +use gipfel_core::projection::{projection_from_type, ProjArgs, Projection, ProjectionType, ViewParams}; + +use crate::bridge; + +pub const STRIP_H: f64 = 56.0; + +/// Damped, clamped Newton iteration for a scalar inverse projection: find +/// `a` such that `f(a) ≈ target` (identical to the desktop solver). +pub fn newton_inverse( + target: f64, + mut f: impl FnMut(f64) -> Option, + seed: f64, + lo: f64, + hi: f64, +) -> f64 { + let mut a = seed.clamp(lo, hi); + for _ in 0..6 { + let Some(y) = f(a) else { break }; + let resid = y - target; + let h = 1e-5; + let (Some(y1), Some(y2)) = (f(a + h), f(a - h)) else { + break; + }; + let d = (y1 - y2) / (2.0 * h); + if !d.is_finite() || d.abs() < 1e-9 { + break; + } + let step = (resid / d).clamp(-0.3, 0.3); + a = (a - step).clamp(lo, hi); + if step.abs() < 1e-10 { + break; + } + } + a +} + +/// azimuth whose image x is `x_img`, measured with `c_ref` as center angle +pub fn alph_at_img_x( + ptype: ProjectionType, + proj: &dyn Projection, + p: &ViewParams, + x_img: f64, + c_ref: f64, +) -> f64 { + let mut p = *p; + p.a_center = c_ref; + let seed = match ptype { + ProjectionType::Rectilinear => c_ref + (x_img / p.scale).atan(), + ProjectionType::Cylindrical => c_ref + x_img / p.scale, + }; + let (lo, hi) = match ptype { + ProjectionType::Rectilinear => (c_ref - 1.55, c_ref + 1.55), + ProjectionType::Cylindrical => (c_ref - 3.1, c_ref + 3.1), + }; + newton_inverse( + x_img, + |a| Some(proj.mac_x(ProjArgs::from_params(&p, a, 0.0))), + seed, + lo, + hi, + ) +} + +const DIRS: [(f64, &str); 8] = [ + (0.0, "N"), + (45.0, "NE"), + (90.0, "E"), + (135.0, "SE"), + (180.0, "S"), + (225.0, "SW"), + (270.0, "W"), + (315.0, "NW"), +]; + +/// everything the strip needs; all plain data so Yew can diff it +#[derive(Clone, Copy, PartialEq)] +pub struct CompassData { + pub ptype: ProjectionType, + pub parms: ViewParams, + pub center_deg: f64, + pub zoom: f64, + /// screen x of the image center (strip shares the image transform) + pub cx: f64, + /// lens FOV half-angle limit, radians (0 = none) + pub max_view_angle: f64, +} + +#[derive(Properties, PartialEq)] +pub struct Props { + pub data: CompassData, + /// bumped on window resize to force a redraw + pub tick: u32, + /// new azimuth in degrees while dragging + pub on_change: Callback, +} + +#[function_component(Compass)] +pub fn compass(props: &Props) -> Html { + let canvas_ref = use_node_ref(); + let drag = use_mut_ref(|| Option::<(f64, f64)>::None); // (press x, center_deg) + + let d = props.data; + + // draw + { + let canvas_ref = canvas_ref.clone(); + use_effect_with((d, props.tick), move |(d, _tick)| { + let Some(canvas) = canvas_ref.cast::() else { + return; + }; + let Some(ctx) = bridge::ctx2d(&canvas) else { + return; + }; + let dpr = bridge::window().device_pixel_ratio(); + let w = canvas.client_width() as f64; + let bw = (w * dpr).max(1.0) as u32; + let bh = (STRIP_H * 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(dpr, 0.0, 0.0, dpr, 0.0, 0.0); + + let on = "rgb(217, 217, 217)"; + let bg = "rgb(41, 41, 41)"; + let divider = "rgb(82, 82, 82)"; + let red = "rgb(255, 102, 64)"; + + let fill = |c: &str| { + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(c)); + }; + let stroke = |c: &str, width: f64| { + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str(c)); + ctx.set_line_width(width); + }; + + fill(bg); + ctx.fill_rect(0.0, 0.0, w, STRIP_H); + stroke(divider, 1.0); + ctx.begin_path(); + ctx.move_to(0.0, 0.5); + ctx.line_to(w, 0.5); + ctx.stroke(); + + let label_y = 17.0f64; // text baseline of the direction row + let y0 = (STRIP_H - 10.0).round(); // baseline of the ticks + let tri_y = 25.0f64; + let z = d.zoom; + let proj = projection_from_type(d.ptype); + let cx = d.cx; + let c = d.parms.a_center; + + let x_img_at = |alph: f64| proj.get_coordinates(alph, 0.0, &d.parms).0; + + // adaptive tick step: first that yields >= 6 px spacing + let ppd = ((x_img_at(c + 1f64.to_radians()) - x_img_at(c - 1f64.to_radians())) + * z + / 2.0) + .abs(); + let step = [1.0f64, 2.0, 5.0, 10.0, 15.0, 30.0, 45.0, 90.0] + .into_iter() + .find(|s| s * ppd >= 6.0) + .unwrap_or(90.0); + + let a_lo = alph_at_img_x(d.ptype, &*proj, &d.parms, -cx / z, c) + .min(c - std::f64::consts::PI); + let a_hi = alph_at_img_x(d.ptype, &*proj, &d.parms, (w - cx) / z, c) + .max(c + std::f64::consts::PI); + // rectilinear folds directions behind the camera onto the same + // pixels; also clamp to the lens FOV (distortion can fold + // out-of-view directions back onto the strip) + let mut fold = match d.ptype { + ProjectionType::Rectilinear => 1.535, + ProjectionType::Cylindrical => std::f64::consts::PI, + }; + if d.max_view_angle > 0.0 { + fold = fold.min(d.max_view_angle); + } + let a_lo = a_lo.max(c - fold); + let a_hi = a_hi.min(c + fold); + + // baseline + stroke(on, 1.0); + ctx.begin_path(); + ctx.move_to(0.0, y0 + 0.5); + ctx.line_to(w, y0 + 0.5); + ctx.stroke(); + + // ticks + let step_rad = step.to_radians(); + let mut a = (a_lo / step_rad).floor() * step_rad; + while a <= a_hi { + let x = cx + x_img_at(a) * z; + if x.is_finite() && x >= -1.0 && x <= w + 1.0 { + let rem = a.to_degrees().rem_euclid(45.0); + let major = rem.min(45.0 - rem) < step / 2.0; + let x = x.round(); + ctx.begin_path(); + ctx.move_to(x, y0); + ctx.line_to(x, y0 - if major { 12.0 } else { 6.0 }); + ctx.stroke(); + } + a += step_rad; + } + + // direction labels + ctx.set_font("13px system-ui, sans-serif"); + ctx.set_text_align("center"); + for (deg, name) in DIRS { + let alph = deg.to_radians(); + let rel = (alph - c + std::f64::consts::PI).rem_euclid(std::f64::consts::TAU) + - std::f64::consts::PI; + if rel.abs() > fold { + continue; + } + let x = cx + x_img_at(alph) * z; + if !x.is_finite() || x < -20.0 || x > w + 20.0 { + continue; + } + fill(if deg == 0.0 { red } else { on }); + ctx.fill_text(name, x, label_y).ok(); + } + ctx.set_text_align("start"); + + // center marker: triangle + hairline + azimuth readout + fill(red); + ctx.begin_path(); + ctx.move_to(cx - 6.0, tri_y); + ctx.line_to(cx + 6.0, tri_y); + ctx.line_to(cx, tri_y + 8.0); + ctx.close_path(); + ctx.fill(); + stroke(red, 1.0); + ctx.begin_path(); + ctx.move_to(cx.round(), tri_y + 8.0); + ctx.line_to(cx.round(), y0); + ctx.stroke(); + fill(red); + ctx.fill_text(&format!("{:05.1}°", d.center_deg.rem_euclid(360.0)), cx + 10.0, tri_y + 9.0) + .ok(); + }); + } + + let local_x = { + let canvas_ref = canvas_ref.clone(); + move |client_x: f64| { + client_x + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().left()) + .unwrap_or(0.0) + } + }; + + let on_pointerdown = { + let drag = drag.clone(); + let canvas_ref = canvas_ref.clone(); + let center_deg = props.data.center_deg; + Callback::from(move |e: PointerEvent| { + e.prevent_default(); + if let Some(c) = canvas_ref.cast::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } + *drag.borrow_mut() = Some((e.client_x() as f64, center_deg)); + }) + }; + let on_pointermove = { + let drag = drag.clone(); + let on_change = props.on_change.clone(); + let d = props.data; + Callback::from(move |e: PointerEvent| { + let Some((x0, c0_deg)) = *drag.borrow() else { + return; + }; + let proj = projection_from_type(d.ptype); + let c0 = c0_deg.to_radians(); + let lx0 = local_x(e.client_x() as f64); + let a0 = alph_at_img_x(d.ptype, &*proj, &d.parms, (x0 - d.cx) / d.zoom, c0); + let a1 = alph_at_img_x(d.ptype, &*proj, &d.parms, (lx0 - d.cx) / d.zoom, c0); + on_change.emit((c0 - (a1 - a0)).to_degrees()); + }) + }; + let on_pointerup = { + let drag = drag.clone(); + let canvas_ref = canvas_ref.clone(); + Callback::from(move |e: PointerEvent| { + *drag.borrow_mut() = None; + if let Some(c) = canvas_ref.cast::() { + let _ = c.release_pointer_capture(e.pointer_id()); + } + }) + }; + + html! { + + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn roundtrip(ptype: ProjectionType, k0: f64, k1: f64, x0: f64) { + let proj = projection_from_type(ptype); + let mut parms = ViewParams::new(); + parms.a_center = 0.3; + parms.scale = 3000.0; + parms.k0 = k0; + parms.k1 = k1; + parms.x0 = x0; + for x in [-2500.0, -800.0, -50.0, 0.0, 120.0, 900.0, 2400.0] { + let a = alph_at_img_x(ptype, &*proj, &parms, x, parms.a_center); + let (x2, _) = proj.get_coordinates(a, 0.0, &parms); + assert!( + (x2 - x).abs() < 1e-6, + "{ptype:?} x={x}: round-trips to {x2} (alph {a})" + ); + } + } + + #[test] + fn inverse_rectilinear() { + roundtrip(ProjectionType::Rectilinear, 0.0, 0.0, 0.0); + } + #[test] + fn inverse_rectilinear_distorted() { + roundtrip(ProjectionType::Rectilinear, 0.002, -0.0003, 0.01); + } + #[test] + fn inverse_cylindrical() { + roundtrip(ProjectionType::Cylindrical, 0.0, 0.0, 0.0); + } +} diff --git a/crates/wipfel/src/main.rs b/crates/wipfel/src/main.rs new file mode 100644 index 0000000..741393b --- /dev/null +++ b/crates/wipfel/src/main.rs @@ -0,0 +1,10 @@ +mod app; +mod bridge; +mod canvas_view; +mod compass; +mod markers; +mod widgets; + +fn main() { + yew::Renderer::::new().render(); +} diff --git a/crates/wipfel/src/markers.rs b/crates/wipfel/src/markers.rs new file mode 100644 index 0000000..d024f2e --- /dev/null +++ b/crates/wipfel/src/markers.rs @@ -0,0 +1,60 @@ +//! 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. +/// Same graduated behavior as the original: 1 marker fits the center +/// angle, 2 add the scale, 4+ the full viewpoint (+ distortion when +/// unlocked and enough markers). +pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Result<(), String> { + if markers.is_empty() { + 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. Hills hidden by the +/// occlusion heuristic are skipped unless `show_hidden`. +pub fn nearest_hill( + pan: &Panorama, + x: f64, + y: f64, + max_dist: f64, + show_hidden: bool, +) -> Option { + let mut best = None; + let mut best_d = max_dist; + for &i in &pan.visible { + if !show_hidden && pan.hills[i].flags & gipfel_core::hill::FLAG_HIDDEN != 0 { + continue; + } + 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 +} diff --git a/crates/wipfel/src/widgets.rs b/crates/wipfel/src/widgets.rs new file mode 100644 index 0000000..1d22bac --- /dev/null +++ b/crates/wipfel/src/widgets.rs @@ -0,0 +1,77 @@ +//! Small form controls: full-width slider with value readout above +//! (mirrors the desktop `slider_item` layout) and a numeric input row. + +use web_sys::{HtmlInputElement, InputEvent}; +use yew::prelude::*; + +#[derive(Properties, PartialEq)] +pub struct SliderProps { + pub label: AttrValue, + /// formatted value shown right of the label + pub display: AttrValue, + pub value: f64, + pub min: f64, + pub max: f64, + pub step: f64, + pub onchange: Callback, +} + +#[function_component(SliderItem)] +pub fn slider_item(p: &SliderProps) -> Html { + // live update while dragging (oninput), not only on release + let oninput = { + let onchange = p.onchange.clone(); + Callback::from(move |e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Ok(v) = input.value().parse::() { + onchange.emit(v); + } + }) + }; + html! { +
+
+ { p.label.as_ref().to_string() } + { p.display.as_ref().to_string() } +
+ +
+ } +} + +#[derive(Properties, PartialEq)] +pub struct NumProps { + pub label: AttrValue, + pub value: f64, + pub step: f64, + #[prop_or(2)] + pub decimals: usize, + pub onchange: Callback, +} + +#[function_component(NumItem)] +pub fn num_item(p: &NumProps) -> Html { + let onchange = { + let onchange = p.onchange.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Ok(v) = input.value().parse::() { + onchange.emit(v); + } + }) + }; + let display = format!("{:.*}", p.decimals, p.value); + html! { + + } +} diff --git a/crates/wipfel/www/style.css b/crates/wipfel/www/style.css new file mode 100644 index 0000000..5122c43 --- /dev/null +++ b/crates/wipfel/www/style.css @@ -0,0 +1,221 @@ +* { + box-sizing: border-box; +} +html, +body { + margin: 0; + height: 100%; + font-family: system-ui, sans-serif; +} +.app { + display: flex; + height: 100vh; + background: #101014; + color: #e8e8ea; +} +.sidebar { + width: 300px; + padding: 16px; + background: #1a1a20; + border-right: 1px solid #2c2c34; + display: flex; + flex-direction: column; + gap: 8px; + overflow-y: auto; +} +.sidebar h1 { + margin: 0; + font-size: 22px; +} +.tag { + margin: 0 0 12px; + color: #8a8a94; + font-size: 12px; + text-transform: uppercase; + letter-spacing: 1px; +} +.sidebar button { + padding: 8px 12px; + background: #3b6fd4; + color: #fff; + border: 0; + border-radius: 6px; + font-size: 14px; + cursor: pointer; +} +.sidebar button:hover { + background: #4a7ee4; +} +.status { + font-size: 13px; + color: #c8c8d0; + word-break: break-word; +} +.hint { + font-size: 12px; + color: #8a8a94; +} +.row { + display: flex; + gap: 6px; + align-items: center; + font-size: 13px; + cursor: pointer; +} +.fitinfo { + font-size: 12px; + color: #9fd09f; + font-variant-numeric: tabular-nums; +} +.hover { + font-size: 14px; + font-weight: 600; + color: #ffffff; +} +.dim { + opacity: 0.6; +} +.hidden-file { + display: none; +} +.main { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; +} +.canvaswrap { + flex: 1; + position: relative; + min-height: 0; +} +canvas.viewport { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + display: block; + touch-action: none; + cursor: grab; +} +canvas.compass { + display: block; + width: 100%; + touch-action: none; + cursor: ew-resize; +} +.section { + margin-top: 14px; + font-size: 11px; + text-transform: uppercase; + letter-spacing: 1px; + color: #8a8a94; + border-bottom: 1px solid #2c2c34; + padding-bottom: 3px; +} +.slider { + display: flex; + flex-direction: column; + gap: 2px; + margin-top: 8px; +} +.sliderhead { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #c8c8d0; +} +.slider input[type="range"] { + width: 100%; +} +.numrow { + display: flex; + justify-content: space-between; + align-items: center; + gap: 8px; + font-size: 13px; + margin-top: 6px; +} +.numrow input { + width: 130px; + padding: 4px 6px; + background: #24242c; + color: #e8e8ea; + border: 1px solid #34343e; + border-radius: 4px; +} +.fpbackdrop { + position: absolute; + inset: 0; + z-index: 9; +} +.findpeak { + position: absolute; + z-index: 10; + width: 280px; + background: #1e1e26; + border: 1px solid #3a3a46; + border-radius: 6px; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.5); + display: flex; + flex-direction: column; +} +.fpsearch { + padding: 8px; + border-bottom: 1px solid #2c2c34; +} +.fpsearch input { + width: 100%; + padding: 5px 8px; + background: #24242c; + border: 1px solid #3a3a46; + border-radius: 4px; + color: #e8e8ea; + font-size: 13px; +} +.fplist { + max-height: 320px; + overflow-y: auto; +} +.fpempty { + padding: 8px 10px; + font-size: 13px; + color: #8a8a94; + margin: 0; +} +.fpfoot { + padding: 6px 8px; + border-top: 1px solid #2c2c34; + text-align: right; +} +.fpcancel { + padding: 4px 12px; + background: #34343e; + color: #e8e8ea; + border: 0; + border-radius: 4px; + font-size: 12px; + cursor: pointer; +} +.fphead { + padding: 6px 10px; + font-size: 11px; + text-transform: uppercase; + letter-spacing: 1px; + color: #8a8a94; + border-bottom: 1px solid #2c2c34; +} +.fpitem { + display: block; + width: 100%; + text-align: left; + padding: 6px 10px; + background: none; + border: 0; + color: #e8e8ea; + font-size: 13px; + cursor: pointer; +} +.fpitem:hover { + background: #2f6fd4; +} diff --git a/plan.md b/plan.md new file mode 100644 index 0000000..9796beb --- /dev/null +++ b/plan.md @@ -0,0 +1,371 @@ +# Plan: Porting gipfel to a Cosmic DE Application in Rust + +Status: **planning only — no implementation started** +Reference: C++/FLTK sources in `src/` (gipfel 0.4.1, commit `45425dd`) + +--- + +## 1. Analysis of the Existing Application + +### 1.1 What gipfel does + +gipfel is "georeferencing for arbitrary images": given a photo, the GPS position of +the camera, and two or more manually identified peaks in the image, it fits the +camera view parameters and then labels all other peaks/POIs from a GPS database +directly on the image. It also stitches referenced images into panoramas. + +### 1.2 Module map (current C++/FLTK) + +| Component | Files | Responsibility | +|---|---|---| +| Main / control window | `gipfel.cxx` | CLI parsing, two FLTK windows (control + scrolled image), menu bar, sliders/dials, stitching & export CLI modes | +| Image canvas | `GipfelWidget.cxx/.H` | Draws image + labels + markers + GPS track; mouse interaction (see 1.4) | +| Domain model | `Panorama.cxx/.H` | Viewpoint (lat/lon/height), hill DB, azimuth/nick/distance with earth curvature (`EARTH_RADIUS 6371000.785`), refraction model (Tom Chester approximation), hidden-object detection (cone model + `hide_value` / "Visibility" slider), visible-hill computation | +| Projection + fit | `ProjectionLSQ.*`, `ProjectionRectilinear.*`, `ProjectionCylindrical.*` | Non-linear least squares (GSL `gsl_multifit_fdfsolver_lmsder`, max 100 iterations) over `ViewParams {a_center, a_nick, a_tilt, scale, k0, k1, x0}`. Fit level depends on # marked hills: 1 hill → 2 params, 2–3 → 4 params, ≥4 → 7 params (lens distortion calibration) | +| **Symbolic codegen** | `lsq_rectilinear.mac`, `lsq_cylindrical.mac`, `expr2c.mac`, `Makefile.lsq_funcs` | **maxima** computes the projection equations and all analytic partial derivatives (Jacobian) symbolically and emits C functions `mac_x`, `mac_y`, `mac_x_d*` into `Projection*_funcs.cxx` | +| Data model | `Hill.cxx/.H` | `Hill {phi, lam, height, alph, a_nick, dist, x, y, flags}`, `Hills` collection, CSV loader, duplicate marking, sorting | +| Metadata | `ImageMetaData.cxx/.H` | EXIF read via exiv2 (GPS lat/lon/alt, focal length, 35mm-equiv, Make/Model) + own serialization of fit results into the **JPEG comment** (`gipfel: longitude …, latitude …, height …, direction …, nick …, tilt …, focal_length_35mm …, projection type N, k0 …, k1 …, x0 …`) | +| Stitching | `Stitch.*`, `ScanImage.*`, `OutputImage.*`, `JPEG/TIFF/PreviewOutputImage.*` | Resample a view-angle range across referenced images (nearest/bicubic), output JPEG/TIFF (8/16-bit) or on-screen preview | +| Custom widgets | `Fl_Value_Dial.*`, `Fl_Search_Chooser.*`, `choose_hill.*` | Compass dial (view direction), searchable hill picker dialog | +| Preferences | `GipfelWidget.cxx` (Fl_Preferences) | Distortion profiles in `$HOME/.fltk/Johannes.HofmannATgmx.de/gipfel` | +| Data file | `gipfel.dat` (~21k rows) | `SHORTNAME,NAME,DESCRIPTION,LATITUDE,LONGITUDE,HEIGHT` per line | + +### 1.3 Data flow + +``` +gipfel.dat ─┐ +EXIF/JPEG ──┼─► Panorama (viewpoint, angles, distances, refraction, visibility) +user marks ─┘ │ + ▼ + ProjectionLSQ.comp_params() ◄── maxima-generated mac_* + Jacobian + │ ViewParams + ▼ + get_coordinates(alph, nick) → (x, y) per hill ─► GipfelWidget redraw +``` + +### 1.4 Interaction model (to preserve / improve) + +- **Middle-click** a label cross → mark hill as known (turns red) +- **Left-drag** a marked cross → position it on the peak; on release, refit +- **Right-click** → context menu: "Find Peak", "Hide/Unhide " +- **Hover** → tooltip "name (height m), distance x.xkm" +- Control window: compass dial (view direction), sliders (nick, tilt, focal length + in 35mm, visibility, track width), numeric inputs (viewpoint lat/lon/height, + distortion k0/k1/x0) +- CLI modes: `-s` stitch, `-e/-E` export hills, `-p` export position + +### 1.5 Constraints carried into the port + +- **The algorithm stays as-is**: same projection math, same LM fit strategy, same + refraction/visibility models, **same maxima-based symbolic derivative generation**. +- Wire formats stay compatible: `gipfel.dat` CSV, the JPEG-comment parameter string + (so images referenced with the old gipfel still open correctly), distortion + profile semantics. + +--- + +## 2. Target Application + +**gipfel-rs**: a native [Cosmic](https://system76.com/cosmic) DE application built +with `cosmic-toolkit` (`cosmic::app`, iced under the hood), single window, with +optional image zooming. + +### 2.1 UI concept — single window + +The FLTK version uses two windows (control + image) plus modal dialogs. The Cosmic +port consolidates everything into one window: + +``` +┌──────────────────────────────────────────────────────────────────────┐ +│ ⌘ Menu (File / Projection / Distortion / Options / Help) │ +├──────────────────────────────────────────────────────────────────────┤ +│ Viewpoint: [✎] Lat [____] Lon [____] Hgt [____] │ +├───────────────────────────────┬──────────────────────────────────────┤ +│ │ Controls (collapsible sidebar) │ +│ │ ┌───────────┐ ┌────────────────┐ │ +│ Image canvas │ │ compass │ │ Focal length ⌬ │ │ +│ (custom iced Canvas) │ │ dial │ │ Nick ⌬ │ │ +│ │ │ (view dir)│ │ Tilt ⌬ │ │ +│ - pan: drag / space+drag │ └───────────┘ │ Visibility ⌬ │ │ +│ - zoom: ctrl+scroll, +/-, │ │ Track width ⌬ │ │ +│ pinch; fit / 1:1 buttons │ Distortion k0/k1/x0 [advanced] │ +│ - labels, markers, track │ Projection: ○ normal ● panoramic │ +│ │ [Compute] [Reset] [Show hidden ☐] │ +├───────────────────────────────┴──────────────────────────────────────┤ +│ Status: hover → "Simetsberg (1836 m), distance 12.4 km" · zoom 150% │ +└──────────────────────────────────────────────────────────────────────┘ +``` + +Design principles: +- **One window, no modal dialogs for the core loop.** Viewpoint selection becomes an + inline searchable overlay (iced `text_input` + filtered list in a popover/panel), + replacing the `choose_hill` dialog. +- **Zoom is optional and non-destructive**: a viewport transform (scale + offset) + applied at render time; all hit-testing and label placement in image coordinates. + Labels stay screen-space (constant font size) so they remain readable when zoomed. +- Context menus (Find Peak, Hide/Unhide) via `cosmic::widget::popover` / context-menu. +- Overlays (viewpoint picker, find-peak, about) as Cosmic **dialogs** (they render + inside/over the app window) — no secondary top-level windows. + +### 2.2 UI options to explore first (spikes, before committing) + +| Option | Pros | Cons | +|---|---|---| +| **A. cosmic-toolkit (`cosmic::app`)** — recommended | Native look & feel, app menu, dialogs, popover, theming, Cosmic conventions, active development | API still moving; pin a release/tag | +| B. Plain iced 0.13 | More stable API, more examples | Not "Cosmic-native"; lose cosmic widgets/menus/theming | +| C. Slint / GTK4 / Qt | Mature canvas options | Not idiomatic for Cosmic DE | + +Exploration tasks (throwaway prototypes, no product code): +1. **Canvas perf spike**: draw a 6000×4000 JPEG in an iced `Canvas`, pan/zoom at + 60 fps (texture upload cost, `wgpu` backend, downscale-on-zoom-out strategy). +2. **Text spike**: render ~300 hill labels + leader lines via glyphon/iced canvas + text; measure frame times; decide label decluttering strategy. +3. **Input spike**: verify middle-mouse (or map "toggle known" to click + `K` key / + double-click if middle-click is unreliable under Wayland), drag-and-drop of image + files into a Cosmic window, ctrl+scroll zoom gesture. +4. **Widget inventory**: sliders, radio groups, menu bar, dialog, popover, + searchable list — confirm cosmic-widget coverage; identify what needs a custom + canvas widget (compass dial, canvas). +5. **Packaging spike**: minimal `cosmic-app-library` hello-world, `.desktop` file, + `cargo vendor` build without network. + +--- + +## 3. Rust Architecture + +Cargo workspace: + +``` +gipfel-rs/ +├── Cargo.toml # workspace +├── crates/ +│ ├── gipfel-core/ # pure domain logic, no UI, fully testable +│ │ ├── geo.rs # distance/azimuth/nick, earth radius, refraction +│ │ ├── hill.rs # Hill, Hills, flags, CSV loader, duplicate marking +│ │ ├── panorama.rs # Panorama: viewpoint, visible/hidden computation +│ │ ├── projection/ +│ │ │ ├── mod.rs # Projection trait, ViewParams, get_coordinates +│ │ │ ├── rectilinear.rs +│ │ │ ├── cylindrical.rs +│ │ │ └── generated/{rectilinear,cylindrical}_funcs.rs # ← maxima output +│ │ ├── lsq.rs # Levenberg–Marquardt driver (lmsder-equivalent) +│ │ ├── metadata.rs # EXIF read + JPEG-comment read/write (gipfel: string) +│ │ ├── stitch.rs # scan/resample pipeline (nearest + bicubic) +│ │ └── prefs.rs # distortion profiles (~/.config/gipfel/) +│ ├── gipfel-codegen/ # maxima scripts + generator (see 3.2) +│ │ ├── lsq_rectilinear.mac +│ │ ├── lsq_cylindrical.mac +│ │ └── expr2rust.mac +│ └── gipfel-app/ # Cosmic application +│ ├── src/app.rs # cosmic::Application: Model/Message/view/update +│ ├── src/canvas.rs # image viewport widget (pan/zoom/labels/hit-test) +│ ├── src/panels.rs # controls sidebar, viewpoint picker, dialogs +│ └── i18n/ +├── data/gipfel.dat # unchanged format +└── examples/ # CLI: stitch, export (clap subcommands) +``` + +### 3.1 Keeping the algorithm identical + +- Port `Panorama`/`ProjectionLSQ` logic **line-for-line in spirit**: same formulas, + same initial-value heuristics (`comp_scale`, alpha-monotonicity fix in the + cylindrical case), same fit levels (2/4/7 params), same 100-iteration LM loop. +- **Derivatives stay symbolic via maxima** (explicit requirement): + - Port `expr2c.mac` → `expr2rust.mac` (emit `pub fn mac_x(c_view: f64, …) -> f64` + with the same `_1.._n` temporary-variable scheme maxima already produces). + - Reuse `lsq_rectilinear.mac` / `lsq_cylindrical.mac` unchanged except for the + `expr2c(...)` calls. + - Generated `*_funcs.rs` files are **committed to the repo** (like today's + generated `.cxx`), regenerated manually by the maintainer via a `just`/`make` + target; optionally a `build.rs` that regenerates if `maxima` is on `$PATH`. + - Validation: differential test comparing generated Rust vs. original C output + bit-for-bit on a parameter grid, and vs. numerical finite differences. +- **Solver**: two candidates, decide during M2: + 1. `gsl` crate (bind to GSL `multifit_fdfsolver_lmsder`) — bit-identical behavior, + keeps the C dependency (acceptable: Cosmic is Linux-first). + 2. Pure-Rust LM (small problem: n≤2·#hills, p≤7) with QR-based inner steps + (e.g. `levmar`-style, `ndarray` + householder QR) — no C deps, needs + equivalence testing against the GSL reference. + Default preference: **(1) gsl crate** to honor "algorithm stays as it is". + +### 3.2 Replacements for C libraries + +| C dependency | Rust replacement | +|---|---| +| FLTK | `cosmic-toolkit` / iced | +| libjpeg/libtiff (via FLTK/exiv2) | `image` crate (jpeg, tiff features) | +| exiv2 (read) | `kamadak-exif` (EXIF + GPS tags) | +| exiv2 (write JPEG comment) | custom JPEG segment writer: parse markers, replace/insert `COM` (0xFFFE) segment — small, well-defined; keeps the exact `gipfel: …` string format | +| GSL | `gsl` crate (see 3.1) | +| Fl_Preferences | `directories` + simple key-file (or `confy`) for distortion profiles | +| getopt | `clap` (subcommands: `gui`, `stitch`, `export-hills`, `export-position`) | + +### 3.3 State & concurrency model + +- `cosmic::Application` Elm architecture: `App` holds `AppState` (loaded image, + `Panorama` model, viewport transform, UI state). +- Heavy operations (image decode of large JPEGs, LM fit, stitching) run via + `cosmic::task::future` / `tokio` background tasks; messages (`Msg::FitFinished(ViewParams)`, + `Msg::ImageLoaded(..)`) return results to the UI — keeps the window responsive + (the C version blocks with a wait cursor today; this is an improvement we keep). +- The 21k-row hill DB is loaded once and indexed (grid by lat/lon) for the + "close mountains" pre-filter (the C code rescans linearly). + +--- + +## 4. Milestones + +### M0 — UI exploration (spikes from §2.2) — ✅ DONE +Deliverables (see `../gipfel-spikes/`): +- `spike-render/` — headless wgpu+glyphon benchmark, **executed** on lavapipe: + 24 MP JPEG decode 206 ms, texture upload 60 ms (once), image frame 5.3 ms, + 300 glyphon labels 0.8 ms → rendering approach viable +- `spike-canvas/` — iced 0.14 custom viewport widget (zoom/pan/middle-click + markers/300 screen-space labels/sidebar), compile-verified +- `spike-cosmic/` — libcosmic app with menu bar + key binds, dialog, popover, + settings section, `.desktop` file, compile-verified +- `MEMO.md` — decision memo (toolkit = libcosmic pinned to tag; custom `Widget` + viewport; `GSL` crate for `lmsder`; Ctrl tracked via event subscription; + middle-click exists in iced 0.14; cosmic's iced fork = 0.14.2 API parity) + +Deferred (no display server in spike env): interactive runtime feel, middle-click +verification under a real Cosmic session, file-chooser choice. + +### M1 — Core port (`gipfel-core`, headless) — ✅ DONE + +Repo: `~/gipfel-rs` (workspace: `crates/gipfel-core`, `crates/gipfel-cli`, +`codegen/`, `tests/`). All behaviour is verified against the original C++ +through committed golden files (`tests/gen_golden.sh` regenerates them). + +- [x] `hill.rs`: `Hill`/`Hills` + CSV loader (Latin-1, `atof` semantics, both + 6-field and 3-field record layouts), `mark_duplicates`, all five sort orders +- [x] `panorama.rs`: geodesy — `distance`/`alpha`/`nick`/`refraction`/ + `get_earth_radius`/`get_real_distance`, `mark_hidden` (incl. the original's + `fabs(alph_diff > pi/2)` quirk, ported as-is), close/visible bookkeeping +- [x] `projection/`: `Projection` trait (16 macro entry points, defaults `NAN` + like the C++ base class) + rectilinear/cylindrical impls +- [x] `codegen/expr2rust.mac` + `lsq_{rectilinear,cylindrical}.mac` + `fixup.py` + + `regen.sh`; generated `*_funcs.rs` committed (16 + 10 functions) +- [x] `lsq.rs`: `gsl_multifit_fdfsolver_lmsder` via a minimal hand-written FFI, + identical 2/4/7-parameter levels and identical two-pass schedule +- [x] `metadata.rs`: `gipfel:` JPEG-comment read/write (byte-identical format), + EXIF fallback (GPS/focal/make/model), atomic save +- [x] Golden tests: 200-point function grid, full fit for both projections + (agreement to ~1e-15), export output, comment round-trip, real `gipfel.dat` +- [x] `gipfel-cli`: `export-position`, `export-hills`, `info` — `export-position` + is byte-identical to the C binary, `export-hills` matches the C pipeline + +Notes / deviations from the C original (all deliberate): +- `gsl_multifit_fdfsolver_lmsder` is a **pointer** in GSL ≥ 2.7; the FFI models + it as `*const` (the C++ code dereferences implicitly). Using the struct form + yields `failed to allocate space for multifit solver state`. +- Upstream C bug fixed in the reference tree: `ImageMetaData::load_image_jpgcom` + took `c_str()` of a temporary `std::string`, so `-p` read garbage. The Rust + port is correct; the C tree was patched only to produce valid goldens. +- Upstream C bug not reproduced: `Hill`'s copy constructor does not copy + `a_nick`, so fitting a *copy* of a hill fed the solver uninitialised memory. + The harness sets `a_nick` explicitly to model real-app behaviour. +- Rust `Hill` is plain data (no manual `strdup`/`free`); `Panorama` keeps one + `Vec` plus index lists instead of three aliasing pointer arrays. +- `rint` → `round_ties_even` (matches C's round-half-to-even); `atof` prefix + parsing reproduced exactly. + +### M2 — Cosmic app skeleton ✅ DONE (2026-10-25) +- [x] `cosmic::app` project (`crates/gipfel-app`, libcosmic pinned to rev + `430f3d4`), app menu (File/View/Projection/Help), Ctrl+O/S/D/T/V/F/Q + (menu `KeyBind` map is display-only → real dispatch via + `event::listen_with` subscription) +- [x] Open image (xdg-portal file dialog via `cosmic::dialog::file_chooser`, + feature `xdg-portal`), drag&drop (`Event::Window(FileDropped)`), hill DB + load (`--data` / `$GIPFEL_DATA` / XDG + system paths), EXIF/gipfel-comment + driven initial state (`apply_image_metadata`) +- [x] Controls sidebar: custom compass dial widget (center angle), sliders for + focal (1–300), nick (−40…20), tilt (−10…10), visibility (0.01–0.1), + track width (1–500); lat/lon/height + k0/k1/x0 inputs (on submit); + projection radios; show-hidden toggle; zoom/fit buttons +- [x] Status-bar hover info (name/height/distance, like C's FL_MOVE label) +- Notes: cosmic fork text API differs from crates.io iced 0.14 — text is + measured via `paragraph::Plain::` + `fill_paragraph`, and + `cosmic::Renderer` is the *fallback* (wgpu+tiny-skia) renderer. `Point`/`Rectangle` + are f32; hill coords stay f64 in core, cast at the draw boundary. + +### M3 — Canvas & interaction ✅ DONE (2026-10-25) +- [x] `ViewportWidget` production widget (`src/viewport.rs`): ctrl+scroll zoom + anchored at cursor (image-space anchor math), wheel/drag pan, fit/zoom + buttons; single draw pass image→geometry→text +- [x] Crosses + leader lines (yellow), known-hill flags (red ≤3, green >3), + decluttered labels (port of C `set_labels` collision push-up, cached in + widget Tree state keyed by a version counter), GPS track polyline with + distance-scaled width (C `get_rel_track_width`), hidden hills blue and + only drawn with show-hidden on +- [x] Interactions: left-drag known marker → live move + refit on release + (`comp_params`), middle-click **and double-click** toggle known, + right-click context dialog (Find Peak / Hide-Unhide), hover highlight +- [x] Viewpoint & Find-Peak pickers: searchable dialog (name filter, sorted, + 300-row cap), Find Peak places the marker at the right-click position + exactly like C's `find_peak_cb` +- [x] Save Image (file dialog → `md_from_state` → `gipfel:` comment write), + Screen Dump (re-decode + render markers/labels/track via fontdue → PNG/JPG), + Load Track (3-field CSV, `TRACK_POINT` flags, indices remapped by name + across reloads) +- Core change for M3: `Panorama` no longer re-sorts `hills` (keeps insertion + order + `alpha_order` index list) so hill indices are stable handles — the + C port used stable pointers; golden tests unaffected. +- Not yet verified interactively (no display in dev env) — needs a real + Wayland/X11 session run-through. +- Field fixes after live testing on real Wayland: + - text labels + overlay z-order: overlay recorded in its own graphics + layer (`start_layer`/`end_layer`); strong `Plain` paragraph refs kept + alive in widget Tree state (renderer only holds `Weak`) + - **segfault on marker-drag refit**: the hand-written GSL FFI struct + `gsl_multifit_function_fdf` was missing the trailing `nevalf`/`nevaldf` + counters (gsl_multifit_nlin.h) — GSL's `fdfsolver_set` wrote 16 bytes + past the struct, corrupting `lsq()`'s stack. Fixed; regression test + runs the fit on a 128 KB stack (guard-page canary). + +### M4 — Stitching & export ✅ DONE +- [x] Port `ScanImage` (nearest + bicubic) and `Stitch` resampling + (`gipfel-core/src/stitch.rs`; bit-for-bit golden tests vs C harness + `stitchdump.cxx` for nearest/bicubic, rect/cyl, with and without + distortion — sampling on the C 0..=65025 scale, Keys cubic, `rint`) +- [x] `gipfel-cli stitch -j/-t/-4/-w/-h/-r/-b` parity (C defaults kept: + 2000x500, range 0..380 deg); TIFF writer matches C `TIFFOutputImage` + (RGBA, deflate, 8/16-bit, alpha 65025), JPEG q90 +- [x] App: File → “Stitch Cylindrical TIFF…” — exports the current image + as a cylindrical 16-bit TIFF (bicubic) spanning the lens FOV derived + from the fitted projection (edge-angle inverse + vertical Newton), + for external stitching tools (Hugin etc.) +- [ ] Preview of stitched result in-app (optional, not done) + +### M5 — Polish & packaging +- [x] Distortion profiles: `gipfel-core/src/profile.rs` reads/writes the + C version's FLTK prefs file (`~/.fltk/Johannes.HofmannATgmx.de/gipfel/ + DistortionProfiles.prefs`) so profiles are shared with the C binary + (verified both directions with a Fl_Preferences probe). Auto-match by + camera+focal length on load (comment > profile > zero, C order). App: + Distortion section has a profile name field, Save/Load buttons and a + stored-profiles dropdown; CLI gains `profiles`/`profile-save`. +- [ ] Config/data dir handling (`XDG_DATA_HOME`), ship `gipfel.dat` +- [ ] i18n (de/en), theming (light/dark), HiDPI scaling +- [ ] `.desktop` file, icon, Cargo vendor for offline builds, CI (fmt, clippy, tests) +- [ ] Docs: README port, migration notes from the C version + +--- + +## 5. Risks & Mitigations + +| Risk | Mitigation | +|---|---| +| iced canvas performance with huge images + many labels | M0 spike; tile/downscale pyramid; label decluttering; only draw visible viewport | +| cosmic-toolkit API churn | pin to a tagged release; isolate UI in `gipfel-app` only | +| LM solver divergence from GSL reference | use `gsl` crate first; differential golden tests vs C binary | +| JPEG comment writing corner cases (progressive, large EXIF) | dedicated marker-walker with tests on real-world photos; atomic write via temp file (as C version does) | +| maxima output differs from C expectations | generated-code diff tests; keep maxima version pinned/documented | +| Middle-mouse availability on Wayland/touchpads | alternative binding (double-click or key modifier) decided in M0 | + +## 6. Explicit non-goals (for now) + +- No changes to the mathematical models (refraction, cone-visibility, distortion). +- No new projection types, no southern-hemisphere bugfix sweep, no GUI stitching mode. +- No Windows/macOS support; Linux/Cosmic first. +- No database rewrite (keep flat CSV; in-memory index is internal only). diff --git a/wasm-plan.md b/wasm-plan.md index d030b0d..8e73cfe 100644 --- a/wasm-plan.md +++ b/wasm-plan.md @@ -1,4 +1,4 @@ -# gipfel-web — plan for a real browser (WASM) version +# wipfel — plan for a real browser (WASM) version Status: **planning**. Feasibility spike done and verified on this branch (`crates/gipfel-wasm`): the full computational core — hill DB, JPEG @@ -116,11 +116,11 @@ the primary product; the web version is a second front end on the same ## 3. Crate / module layout -New crate `crates/gipfel-web` (on this branch; `gipfel-wasm` folds into +New crate `crates/wipfel` (on this branch; `gipfel-wasm` folds into it or becomes its `demo/`): ``` -crates/gipfel-web/ +crates/wipfel/ src/lib.rs Yew root component, routing between views src/state.rs app state + reducer (port of GipfelApp fields/Message) src/canvas_view.rs viewport canvas: bitmap layer + overlay layer, @@ -208,7 +208,7 @@ spike already retired the two scariest risks (core-in-wasm, fit speed). |---|---|---| | Canvas label metrics differ from iced → label layout drift | cosmetic | layout code is width-driven; tune line-height constant on real browser | | Memory on mobile (4080×3072 RGBA ≈ 50 MB + wasm heap) | OOM on low-end phones | downscale preview bitmap for display (keep full-res only in dump path); measure iOS Safari early (W1) | -| `image`/`exif`/`flate2` wasm compile surprises | days | all pure Rust; verify in W1 scaffold (`cargo check --target wasm32-unknown-unknown -p gipfel-web`) | +| `image`/`exif`/`flate2` wasm compile surprises | days | all pure Rust; verify in W1 scaffold (`cargo check --target wasm32-unknown-unknown -p wipfel`) | | Service worker caching stale DB/app | confusing updates | versioned cache keys, skipWaiting flow with "update available" toast | | Scope creep toward desktop parity | never ships | non-goals table is binding for v1; stitch/GPX explicitly deferred | | Two front ends drift apart (desktop fixes not applied to web) | long-term maintenance | shared core + shared golden tests; web-specific tests only for glue | @@ -218,6 +218,6 @@ spike already retired the two scariest risks (core-in-wasm, fit speed). ## 6. Open questions (decide before W1) 1. **Where does it live?** subdomain (web.gipfel.flpsed.org?) + which static host. 2. **Bundle the full 21k hill DB** (~1 MB gz ≈ 300 KB) or offer regional subsets? Default: full, it fits the budget. -3. Name: same "gipfel" brand for web, or distinct (e.g. "gipfel web")? +3. Name: same "gipfel" brand for web, or distinct (e.g. "wipfel")? 4. Does the web version need its own About/privacy page text (all-local processing statement)? 5. Framework confirmation: Yew per A1, or do you want to evaluate Leptos first? (One-day spike would settle it; Yew default stands.) -- cgit v1.2.3 From 4626a87f1815e998dfdd25e6d3826726bc912ca2 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 20:14:25 +0100 Subject: Remove gipfel-wasm spike crate Superseded by wipfel; its feasibility question (pure-Rust core in the browser) was answered and documented. --- Cargo.lock | 9 --- Cargo.toml | 2 +- crates/gipfel-wasm/Cargo.toml | 14 ---- crates/gipfel-wasm/README.md | 36 --------- crates/gipfel-wasm/build.sh | 22 ------ crates/gipfel-wasm/demo/index.html | 39 ---------- crates/gipfel-wasm/src/lib.rs | 147 ------------------------------------- 7 files changed, 1 insertion(+), 268 deletions(-) delete mode 100644 crates/gipfel-wasm/Cargo.toml delete mode 100644 crates/gipfel-wasm/README.md delete mode 100755 crates/gipfel-wasm/build.sh delete mode 100644 crates/gipfel-wasm/demo/index.html delete mode 100644 crates/gipfel-wasm/src/lib.rs (limited to 'Cargo.toml') diff --git a/Cargo.lock b/Cargo.lock index 0be6ad5..b9b8a97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1806,15 +1806,6 @@ dependencies = [ "tiff", ] -[[package]] -name = "gipfel-wasm" -version = "0.5.5" -dependencies = [ - "gipfel-core", - "image", - "wasm-bindgen", -] - [[package]] name = "gl_generator" version = "0.14.0" diff --git a/Cargo.toml b/Cargo.toml index 196bcda..ab0a71f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel-wasm", "crates/wipfel"] +members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/wipfel"] # Single source of truth for metadata inherited by every crate via # `version.workspace = true` etc. Bump `version` here on release; the diff --git a/crates/gipfel-wasm/Cargo.toml b/crates/gipfel-wasm/Cargo.toml deleted file mode 100644 index 34cbbbd..0000000 --- a/crates/gipfel-wasm/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "gipfel-wasm" -version.workspace = true -edition.workspace = true -license.workspace = true -description = "EXPERIMENT: WebAssembly bindings for gipfel-core (browser spike, not part of the app)" - -[lib] -crate-type = ["cdylib", "rlib"] - -[dependencies] -gipfel-core = { path = "../gipfel-core" } -image.workspace = true -wasm-bindgen = "0.2" diff --git a/crates/gipfel-wasm/README.md b/crates/gipfel-wasm/README.md deleted file mode 100644 index 20d7dc7..0000000 --- a/crates/gipfel-wasm/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# gipfel-wasm (EXPERIMENT) - -Browser spike proving the gipfel core runs as WebAssembly. Enabled by the -GSL removal — the core is pure Rust end to end. - -## Status: spike verified (2026-10-26) - -`fit_demo()` ran the full pipeline in a real browser on a 4080×3072 -gipfel-annotated photo (21324 hills, gipfel JPEG comment found): - -```json -{"ok":true,"hills_in_db":21324,"image":"4080x3072","had_gipfel_info":true, - "observations":5,"viewpoint":{"lat":47.65526,"lon":11.61856,"height_m":1319}, - "perturbed":{"center_deg":245.8905,"scale":2558.0}, - "refitted":{"center_deg":245.390505,"pitch_deg":-7.763227,"roll_deg":1.245000,"scale":2692.61}, - "max_reproj_err_px":0.0000} -``` - -Wall time 50 ms. The refit exactly undid the synthetic perturbation -(center to 5e-6 deg, scale to 7e-6 rel) — identical convergence to the -native golden tests. - -## Build & run (requires rustup) - -```sh -cd crates/gipfel-wasm -./build.sh # wasm-pack build --target web -python3 -m http.server 8080 # then open /demo/ -``` - -## What is proven / what is not -- Proven: hill DB parsing, JPEG comment + EXIF I/O, geodesy, projections, - Levenberg-Marquardt fit — all in wasm at native speed. -- Not built: the UI shell (libcosmic has no browser story). Next step if - pursued: Yew (or Leptos) + canvas 2D reusing the viewport/compass logic - and the pixel-based dump renderer. diff --git a/crates/gipfel-wasm/build.sh b/crates/gipfel-wasm/build.sh deleted file mode 100755 index 8d1d812..0000000 --- a/crates/gipfel-wasm/build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Build the gipfel WASM spike and serve the demo page. -# Requires: rustup (for the wasm target) and wasm-pack. -set -e -cd "$(dirname "$0")" - -if ! rustup target list --installed 2>/dev/null | grep -q wasm32-unknown-unknown; then - echo "adding wasm32-unknown-unknown target ..." - rustup target add wasm32-unknown-unknown -fi -command -v wasm-pack >/dev/null 2>&1 || { - echo "wasm-pack not found. Install it once with:" - echo " cargo install wasm-pack (or: cargo binstall wasm-pack)" - exit 1 -} - -wasm-pack build --target web - -echo -echo "built. serve the demo with:" -echo " (cd crates/gipfel-wasm && python3 -m http.server 8080)" -echo "then open http://localhost:8080/demo/" diff --git a/crates/gipfel-wasm/demo/index.html b/crates/gipfel-wasm/demo/index.html deleted file mode 100644 index f8e764d..0000000 --- a/crates/gipfel-wasm/demo/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - gipfel WASM spike - - - -

gipfel WASM spike

-

core version: loading…

-

Pick a hill database and a JPEG (ideally one saved by gipfel, or with EXIF GPS data):

- - - -
pick both files, then run
- - - - diff --git a/crates/gipfel-wasm/src/lib.rs b/crates/gipfel-wasm/src/lib.rs deleted file mode 100644 index b521829..0000000 --- a/crates/gipfel-wasm/src/lib.rs +++ /dev/null @@ -1,147 +0,0 @@ -//! EXPERIMENT: browser spike exposing the gipfel core pipeline to JavaScript. -//! -//! The whole computational core (hill DB, geodesy, projections, LM fit, -//! JPEG comment + EXIF I/O) is pure Rust and WASM-friendly — the GSL -//! removal made this possible. This crate proves the pipeline end-to-end -//! in the browser: bytes in (hill DB + JPEG), fit report out. -//! -//! Build (requires rustup): -//! rustup target add wasm32-unknown-unknown -//! cargo install wasm-pack # once -//! cd crates/gipfel-wasm && wasm-pack build --target web -//! python3 -m http.server 8080 # then open /demo/ - -use wasm_bindgen::prelude::*; - -/// Crate version (from Cargo.toml, via the workspace). -#[wasm_bindgen] -pub fn version() -> String { - env!("CARGO_PKG_VERSION").to_string() -} - -/// End-to-end pipeline smoke test, all in memory: -/// -/// 1. parse the hill database (`db` = gipfel.dat bytes, Latin-1 CSV) -/// 2. read gipfel metadata from the JPEG bytes (comment, else EXIF) -/// 3. build the panorama, take up to 5 visible hills as synthetic -/// "user-marked" observations, perturb the view parameters, refit -/// 4. return a JSON report (recovered parameters + max reprojection error) -/// -/// This mirrors the native golden fit test; a correct WASM build reports -/// a reprojection error well below one pixel. -#[wasm_bindgen] -pub fn fit_demo(db: &[u8], jpg: &[u8]) -> String { - match fit_inner(db, jpg) { - Ok(json) => json, - Err(e) => format!(r#"{{"ok":false,"error":"{}"}}"#, e.replace('\\', "\\\\").replace('"', "\\\"")), - } -} - -fn fit_inner(db: &[u8], jpg: &[u8]) -> Result { - use gipfel_core::metadata::{apply_image_metadata, ImageMetaData}; - use gipfel_core::panorama::Panorama; - use gipfel_core::projection::projection_from_type; - - let mut pan = Panorama::new(); - pan.load_data_from_bytes(db).map_err(|e| format!("hill db: {e}"))?; - - let mut md = ImageMetaData::new(); - md.load_image_from_bytes(jpg); - - let (w, h) = image::ImageReader::new(std::io::Cursor::new(jpg)) - .with_guessed_format() - .map_err(|e| format!("image: {e}"))? - .into_dimensions() - .map_err(|e| format!("image: {e}"))?; - if w == 0 || h == 0 { - return Err("image has zero dimensions".into()); - } - - let have = apply_image_metadata(&mut pan, &md, w, h); - if !have { - // demo fallback: a fixed Alpine viewpoint so the pipeline always runs - pan.set_view_lat(47.36); - pan.set_view_long(11.15); - pan.set_view_height(2100.0); - pan.set_center_angle(20.0); - pan.set_pitch_angle(0.0); - pan.set_roll_angle(1.0); - pan.set_scale(3000.0); - } - - let n = pan.visible.len().min(5); - if n < 2 { - return Err("fewer than 2 hills visible from this viewpoint".into()); - } - // snapshot the "observations" (what a user would have marked) - let obs: Vec<_> = pan.visible[..n].iter().map(|&i| pan.hills[i].clone()).collect(); - let known: Vec = (0..n).collect(); - - // perturb, then refit (distortion stays locked for the spike) - let center0 = pan.get_center_angle(); - let scale0 = pan.get_scale(); - pan.set_center_angle(center0 + 0.5); - pan.set_scale(scale0 * 0.95); - pan.comp_params_with(&obs, &known, false)?; - - // reprojection error of the recovered parameters against the snapshot - let proj = projection_from_type(pan.projection_type); - let mut max_err = 0.0f64; - for ob in &obs { - let (x, y) = proj.get_coordinates(ob.alph, ob.a_elev, &pan.parms); - max_err = max_err.max((x - ob.x).hypot(y - ob.y)); - } - - Ok(format!( - concat!( - "{{\"ok\":true,\"hills_in_db\":{},\"image\":\"{}x{}\",\"had_gipfel_info\":{},", - "\"observations\":{},\"viewpoint\":{{\"lat\":{:.5},\"lon\":{:.5},\"height_m\":{:.0}}},", - "\"perturbed\":{{\"center_deg\":{:.4},\"scale\":{:.1}}},", - "\"refitted\":{{\"center_deg\":{:.6},\"pitch_deg\":{:.6},\"roll_deg\":{:.6},\"scale\":{:.2}}},", - "\"max_reproj_err_px\":{:.4}}}" - ), - pan.hills.len(), - w, - h, - have, - n, - pan.get_view_lat(), - pan.get_view_long(), - pan.get_view_height(), - center0 + 0.5, - scale0 * 0.95, - pan.get_center_angle(), - pan.get_pitch_angle(), - pan.get_roll_angle(), - pan.get_scale(), - max_err, - )) -} - -#[cfg(test)] -mod tests { - use crate::fit_demo; - - /// The spike must also work natively (the wasm-bindgen attribute is a - /// no-op off-wasm), so CI here covers the whole byte-oriented pipeline. - /// Skips when the repo data files are not present (e.g. stripped checkouts). - #[test] - fn fit_demo_native_pipeline() { - let (Ok(db), Ok(jpg)) = ( - std::fs::read("../../gipfel.dat"), - std::fs::read("../../tests/golden/test.jpg"), - ) else { - eprintln!("gipfel.dat / test.jpg not found, skipping"); - return; - }; - let out = fit_demo(&db, &jpg); - assert!(out.contains(r#""ok":true"#), "fit_demo failed: {out}"); - // recovered parameters must reproduce the observations sub-pixel - let err = out - .split("max_reproj_err_px\":") - .nth(1) - .and_then(|s| s.trim_end_matches('}').parse::().ok()) - .expect("error value present"); - assert!(err < 0.01, "reprojection error too large: {out}"); - } -} -- cgit v1.2.3 From d5967c1b91b14b3b4e5b0d9663e8a4d2a5e80533 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 6 Nov 2026 09:52:26 +0100 Subject: wasm front end becomes the main gipfel; add desktop installers - rename crates/wipfel -> crates/gipfel (crate, wasm artifact, dist, scripts, page titles); slogan back to "Photogrammetry for Mountain Images"; crates/wipfel-tauri -> crates/gipfel-desktop - new features in the wasm app: Save image (gipfel JPEG comment, same format as before, via browser download) and lens distortion profiles stored in localStorage in FLTK prefs format with camera auto-match on image load; profile name field, save/load and dropdown - gipfel-core: read GPSImgDirection from EXIF (magnetic -> true) as azimuth fallback; expose parse_prefs/serialize_prefs for the wasm build; ?file=/?az=/?pitch=/?roll=/?focal=/?vis= URL parameters - Tauri v2 wrapper crate building .deb, AppImage and (cross-compiled) Windows NSIS installers; safe stage-and-swap build-release.sh - README: web-centric Installation, concise Build section for the official targets (Web, Windows, Linux); drop native/Android mentions - release site moved dist/wipfel -> dist/gipfel --- Cargo.lock | 2667 +++++++++++++++++++- Cargo.toml | 2 +- README.md | 78 +- crates/gipfel-cli/examples/overlay.rs | 30 + crates/gipfel-core/src/metadata.rs | 16 + crates/gipfel-core/src/profile.rs | 14 +- crates/gipfel-desktop/.cargo/config.toml | 3 + crates/gipfel-desktop/.gitignore | 4 + crates/gipfel-desktop/Cargo.toml | 12 + crates/gipfel-desktop/app-icon.png | Bin 0 -> 63626 bytes crates/gipfel-desktop/build-frontend.sh | 15 + crates/gipfel-desktop/build.rs | 3 + crates/gipfel-desktop/icons/128x128.png | Bin 0 -> 5415 bytes crates/gipfel-desktop/icons/128x128@2x.png | Bin 0 -> 10888 bytes crates/gipfel-desktop/icons/32x32.png | Bin 0 -> 1367 bytes crates/gipfel-desktop/icons/64x64.png | Bin 0 -> 2660 bytes crates/gipfel-desktop/icons/Square107x107Logo.png | Bin 0 -> 4586 bytes crates/gipfel-desktop/icons/Square142x142Logo.png | Bin 0 -> 5855 bytes crates/gipfel-desktop/icons/Square150x150Logo.png | Bin 0 -> 6145 bytes crates/gipfel-desktop/icons/Square284x284Logo.png | Bin 0 -> 11800 bytes crates/gipfel-desktop/icons/Square30x30Logo.png | Bin 0 -> 1271 bytes crates/gipfel-desktop/icons/Square310x310Logo.png | Bin 0 -> 12924 bytes crates/gipfel-desktop/icons/Square44x44Logo.png | Bin 0 -> 1828 bytes crates/gipfel-desktop/icons/Square71x71Logo.png | Bin 0 -> 3038 bytes crates/gipfel-desktop/icons/Square89x89Logo.png | Bin 0 -> 3766 bytes crates/gipfel-desktop/icons/StoreLogo.png | Bin 0 -> 2100 bytes .../android/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../icons/android/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3064 bytes .../android/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 6740 bytes .../android/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 3356 bytes .../icons/android/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1978 bytes .../android/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 4518 bytes .../android/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2227 bytes .../icons/android/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4198 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 9042 bytes .../android/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 4640 bytes .../icons/android/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6431 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 13480 bytes .../android/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 6943 bytes .../icons/android/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 8554 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 18545 bytes .../android/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 9196 bytes .../android/values/ic_launcher_background.xml | 4 + crates/gipfel-desktop/icons/icon.icns | Bin 0 -> 111593 bytes crates/gipfel-desktop/icons/icon.ico | Bin 0 -> 20635 bytes crates/gipfel-desktop/icons/icon.png | Bin 0 -> 23994 bytes .../gipfel-desktop/icons/ios/AppIcon-20x20@1x.png | Bin 0 -> 843 bytes .../icons/ios/AppIcon-20x20@2x-1.png | Bin 0 -> 1692 bytes .../gipfel-desktop/icons/ios/AppIcon-20x20@2x.png | Bin 0 -> 1692 bytes .../gipfel-desktop/icons/ios/AppIcon-20x20@3x.png | Bin 0 -> 2490 bytes .../gipfel-desktop/icons/ios/AppIcon-29x29@1x.png | Bin 0 -> 1229 bytes .../icons/ios/AppIcon-29x29@2x-1.png | Bin 0 -> 2410 bytes .../gipfel-desktop/icons/ios/AppIcon-29x29@2x.png | Bin 0 -> 2410 bytes .../gipfel-desktop/icons/ios/AppIcon-29x29@3x.png | Bin 0 -> 3752 bytes .../gipfel-desktop/icons/ios/AppIcon-40x40@1x.png | Bin 0 -> 1692 bytes .../icons/ios/AppIcon-40x40@2x-1.png | Bin 0 -> 3294 bytes .../gipfel-desktop/icons/ios/AppIcon-40x40@2x.png | Bin 0 -> 3294 bytes .../gipfel-desktop/icons/ios/AppIcon-40x40@3x.png | Bin 0 -> 5078 bytes crates/gipfel-desktop/icons/ios/AppIcon-512@2x.png | Bin 0 -> 28749 bytes .../gipfel-desktop/icons/ios/AppIcon-60x60@2x.png | Bin 0 -> 5078 bytes .../gipfel-desktop/icons/ios/AppIcon-60x60@3x.png | Bin 0 -> 7445 bytes .../gipfel-desktop/icons/ios/AppIcon-76x76@1x.png | Bin 0 -> 3147 bytes .../gipfel-desktop/icons/ios/AppIcon-76x76@2x.png | Bin 0 -> 6291 bytes .../icons/ios/AppIcon-83.5x83.5@2x.png | Bin 0 -> 7163 bytes crates/gipfel-desktop/package.json | 14 + crates/gipfel-desktop/src/main.rs | 11 + crates/gipfel-desktop/tauri.conf.json | 37 + crates/gipfel/Cargo.toml | 50 + crates/gipfel/README.md | 47 + crates/gipfel/build-release.sh | 46 + crates/gipfel/index.html | 11 + crates/gipfel/serve-here.sh | 12 + crates/gipfel/src/app.rs | 1460 +++++++++++ crates/gipfel/src/bridge.rs | 119 + crates/gipfel/src/canvas_view.rs | 686 +++++ crates/gipfel/src/compass.rs | 351 +++ crates/gipfel/src/main.rs | 10 + crates/gipfel/src/markers.rs | 66 + crates/gipfel/src/widgets.rs | 106 + crates/gipfel/www/index.html | 24 + crates/gipfel/www/loader.js | 4 + crates/gipfel/www/style.css | 378 +++ crates/wipfel/Cargo.toml | 44 - crates/wipfel/README.md | 47 - crates/wipfel/build-release.sh | 21 - crates/wipfel/index.html | 11 - crates/wipfel/serve-here.sh | 12 - crates/wipfel/src/app.rs | 1166 --------- crates/wipfel/src/bridge.rs | 81 - crates/wipfel/src/canvas_view.rs | 686 ----- crates/wipfel/src/compass.rs | 351 --- crates/wipfel/src/main.rs | 10 - crates/wipfel/src/markers.rs | 66 - crates/wipfel/src/widgets.rs | 106 - crates/wipfel/www/index.html | 24 - crates/wipfel/www/loader.js | 4 - crates/wipfel/www/style.css | 357 --- dist/gipfel/gipfel.dat.gz | Bin 0 -> 346448 bytes dist/gipfel/gipfel.js | 1109 ++++++++ dist/gipfel/gipfel_bg.wasm | Bin 0 -> 551505 bytes dist/gipfel/index.html | 24 + dist/gipfel/loader.js | 4 + dist/gipfel/style.css | 378 +++ dist/wipfel/gipfel.dat.gz | Bin 346448 -> 0 bytes dist/wipfel/index.html | 24 - dist/wipfel/loader.js | 4 - dist/wipfel/style.css | 357 --- dist/wipfel/wipfel.js | 1039 -------- dist/wipfel/wipfel_bg.wasm | Bin 524243 -> 0 bytes wipfel-droid/build.sh | 4 +- 110 files changed, 7662 insertions(+), 4552 deletions(-) create mode 100644 crates/gipfel-cli/examples/overlay.rs create mode 100644 crates/gipfel-desktop/.cargo/config.toml create mode 100644 crates/gipfel-desktop/.gitignore create mode 100644 crates/gipfel-desktop/Cargo.toml create mode 100644 crates/gipfel-desktop/app-icon.png create mode 100755 crates/gipfel-desktop/build-frontend.sh create mode 100644 crates/gipfel-desktop/build.rs create mode 100644 crates/gipfel-desktop/icons/128x128.png create mode 100644 crates/gipfel-desktop/icons/128x128@2x.png create mode 100644 crates/gipfel-desktop/icons/32x32.png create mode 100644 crates/gipfel-desktop/icons/64x64.png create mode 100644 crates/gipfel-desktop/icons/Square107x107Logo.png create mode 100644 crates/gipfel-desktop/icons/Square142x142Logo.png create mode 100644 crates/gipfel-desktop/icons/Square150x150Logo.png create mode 100644 crates/gipfel-desktop/icons/Square284x284Logo.png create mode 100644 crates/gipfel-desktop/icons/Square30x30Logo.png create mode 100644 crates/gipfel-desktop/icons/Square310x310Logo.png create mode 100644 crates/gipfel-desktop/icons/Square44x44Logo.png create mode 100644 crates/gipfel-desktop/icons/Square71x71Logo.png create mode 100644 crates/gipfel-desktop/icons/Square89x89Logo.png create mode 100644 crates/gipfel-desktop/icons/StoreLogo.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_round.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_round.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_round.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 crates/gipfel-desktop/icons/android/values/ic_launcher_background.xml create mode 100644 crates/gipfel-desktop/icons/icon.icns create mode 100644 crates/gipfel-desktop/icons/icon.ico create mode 100644 crates/gipfel-desktop/icons/icon.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-20x20@1x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x-1.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-20x20@3x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-29x29@1x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x-1.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-29x29@3x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-40x40@1x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x-1.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-40x40@3x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-512@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-60x60@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-60x60@3x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-76x76@1x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-76x76@2x.png create mode 100644 crates/gipfel-desktop/icons/ios/AppIcon-83.5x83.5@2x.png create mode 100644 crates/gipfel-desktop/package.json create mode 100644 crates/gipfel-desktop/src/main.rs create mode 100644 crates/gipfel-desktop/tauri.conf.json create mode 100644 crates/gipfel/Cargo.toml create mode 100644 crates/gipfel/README.md create mode 100755 crates/gipfel/build-release.sh create mode 100644 crates/gipfel/index.html create mode 100755 crates/gipfel/serve-here.sh create mode 100644 crates/gipfel/src/app.rs create mode 100644 crates/gipfel/src/bridge.rs create mode 100644 crates/gipfel/src/canvas_view.rs create mode 100644 crates/gipfel/src/compass.rs create mode 100644 crates/gipfel/src/main.rs create mode 100644 crates/gipfel/src/markers.rs create mode 100644 crates/gipfel/src/widgets.rs create mode 100644 crates/gipfel/www/index.html create mode 100644 crates/gipfel/www/loader.js create mode 100644 crates/gipfel/www/style.css delete mode 100644 crates/wipfel/Cargo.toml delete mode 100644 crates/wipfel/README.md delete mode 100755 crates/wipfel/build-release.sh delete mode 100644 crates/wipfel/index.html delete mode 100755 crates/wipfel/serve-here.sh delete mode 100644 crates/wipfel/src/app.rs delete mode 100644 crates/wipfel/src/bridge.rs delete mode 100644 crates/wipfel/src/canvas_view.rs delete mode 100644 crates/wipfel/src/compass.rs delete mode 100644 crates/wipfel/src/main.rs delete mode 100644 crates/wipfel/src/markers.rs delete mode 100644 crates/wipfel/src/widgets.rs delete mode 100644 crates/wipfel/www/index.html delete mode 100644 crates/wipfel/www/loader.js delete mode 100644 crates/wipfel/www/style.css create mode 100644 dist/gipfel/gipfel.dat.gz create mode 100644 dist/gipfel/gipfel.js create mode 100644 dist/gipfel/gipfel_bg.wasm create mode 100644 dist/gipfel/index.html create mode 100644 dist/gipfel/loader.js create mode 100644 dist/gipfel/style.css delete mode 100644 dist/wipfel/gipfel.dat.gz delete mode 100644 dist/wipfel/index.html delete mode 100644 dist/wipfel/loader.js delete mode 100644 dist/wipfel/style.css delete mode 100644 dist/wipfel/wipfel.js delete mode 100644 dist/wipfel/wipfel_bg.wasm (limited to 'Cargo.toml') diff --git a/Cargo.lock b/Cargo.lock index b9b8a97..7e53347 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,12 +120,36 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "aho-corasick" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" +dependencies = [ + "memchr", +] + [[package]] name = "aliasable" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "alloc-no-stdlib" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a" + +[[package]] +name = "alloc-stdlib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.21" @@ -147,7 +171,7 @@ dependencies = [ "android-properties", "bitflags 2.13.2", "cc", - "jni", + "jni 0.22.4", "libc", "log", "ndk", @@ -172,6 +196,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" + [[package]] name = "anymap2" version = "0.13.0" @@ -226,7 +256,7 @@ version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading", + "libloading 0.8.9", ] [[package]] @@ -395,6 +425,29 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "atk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +dependencies = [ + "atk-sys", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -466,12 +519,24 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "basic-toml" version = "0.1.10" @@ -526,6 +591,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "block-buffer" version = "0.12.1" @@ -582,6 +656,36 @@ dependencies = [ "cfg_aliases", ] +[[package]] +name = "brotli" +version = "9.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "627b7cfb0578f0eafce087a90fcd40add1231900b69e4d4de2d456260a4f5d81" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34c6783f42c21c952ad7112b354f0ba2f10760e9decea5b1b60523d6e270faaf" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + [[package]] name = "bstr" version = "1.13.1" @@ -642,6 +746,12 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "byteorder-lite" version = "0.1.0" @@ -653,6 +763,34 @@ name = "bytes" version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.13.2", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror 1.0.69", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] [[package]] name = "calloop" @@ -678,6 +816,49 @@ dependencies = [ "wayland-client", ] +[[package]] +name = "camino" +version = "1.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbad30e4b4c14a39e3cc8aed085a12a327257c316619c93581e017bc52be591" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror 2.0.21", +] + +[[package]] +name = "cargo_toml" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f4b26e751e711a5302649417f2da046dce6391b2ea30a4820f37462314f0b9" +dependencies = [ + "semver", + "serde", + "toml 1.1.8+spec-1.1.0", +] + [[package]] name = "cc" version = "1.10.0" @@ -690,6 +871,33 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3" +dependencies = [ + "fnv", + "uuid", + "web-time", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.5" @@ -702,6 +910,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" +[[package]] +name = "chrono" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link 0.2.1", +] + [[package]] name = "clipboard-win" version = "5.4.3" @@ -750,7 +970,7 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation 0.9.4", - "core-graphics", + "core-graphics 0.23.2", "foreign-types", "libc", "objc", @@ -828,6 +1048,16 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +[[package]] +name = "cookie" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a373e3602691c3cdea496d2f0ee5935151e6168fe87739483c463db1b2f2f87" +dependencies = [ + "time", + "version_check", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -867,6 +1097,19 @@ dependencies = [ "libc", ] +[[package]] +name = "core-graphics" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" +dependencies = [ + "bitflags 2.13.2", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", + "foreign-types", + "libc", +] + [[package]] name = "core-graphics-types" version = "0.1.3" @@ -906,7 +1149,7 @@ dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", - "dirs", + "dirs 6.0.0", "futures-util", "iced_futures", "known-folders", @@ -983,7 +1226,7 @@ dependencies = [ "configparser", "cosmic-config", "csscolorparser", - "dirs", + "dirs 6.0.0", "hex_color", "palette", "ron", @@ -992,6 +1235,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + [[package]] name = "cpufeatures" version = "0.3.1" @@ -1010,6 +1262,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.23" @@ -1034,6 +1295,16 @@ dependencies = [ "wgpu", ] +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-common" version = "0.2.2" @@ -1061,6 +1332,29 @@ dependencies = [ "uncased", ] +[[package]] +name = "cssparser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a" +dependencies = [ + "quote", + "syn 3.0.9", +] + [[package]] name = "ctor" version = "0.10.1" @@ -1070,6 +1364,12 @@ dependencies = [ "dtor", ] +[[package]] +name = "ctor" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" + [[package]] name = "cursor-icon" version = "1.2.0" @@ -1082,8 +1382,18 @@ version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.21.3", + "darling_macro 0.21.3", +] + +[[package]] +name = "darling" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" +dependencies = [ + "darling_core 0.24.1", + "darling_macro 0.24.1", ] [[package]] @@ -1100,23 +1410,58 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "darling_core" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" +dependencies = [ + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 3.0.9", +] + [[package]] name = "darling_macro" version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "darling_core", + "darling_core 0.21.3", "quote", "syn 2.0.119", ] +[[package]] +name = "darling_macro" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" +dependencies = [ + "darling_core 0.24.1", + "quote", + "syn 3.0.9", +] + [[package]] name = "data-url" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" +[[package]] +name = "dbus" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" +dependencies = [ + "libc", + "libdbus-sys", + "windows-sys 0.61.2", +] + [[package]] name = "defmt" version = "1.2.0" @@ -1149,39 +1494,79 @@ dependencies = [ ] [[package]] -name = "derive_setters" -version = "0.1.9" +name = "deranged" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e6f6fa1f03c14ae082120b84b3c7fbd7b8588d924cf2d7c3daf9afd49df8b9" +checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.119", + "serde_core", ] [[package]] -name = "derive_utils" -version = "0.16.0" +name = "derive_more" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ - "proc-macro2", - "quote", - "syn 3.0.9", + "derive_more-impl", ] [[package]] -name = "digest" -version = "0.11.3" +name = "derive_more-impl" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", -] - + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.119", +] + +[[package]] +name = "derive_setters" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e6f6fa1f03c14ae082120b84b3c7fbd7b8588d924cf2d7c3daf9afd49df8b9" +dependencies = [ + "darling 0.21.3", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "derive_utils" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.9", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common 0.1.7", +] + +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "const-oid", + "crypto-common 0.2.2", +] + [[package]] name = "dirs" version = "6.0.0" @@ -1191,6 +1576,15 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d57d423b3c82e89b9a24ca3091fee61f456a26edbd28d26c65906f4bc1dcd8f" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-sys" version = "0.5.0" @@ -1232,7 +1626,30 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a" dependencies = [ - "libloading", + "libloading 0.8.9", +] + +[[package]] +name = "dlopen2" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -1256,12 +1673,36 @@ dependencies = [ "litrs", ] +[[package]] +name = "dom_query" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc" +dependencies = [ + "bit-set", + "cssparser", + "foldhash 0.2.0", + "html5ever", + "precomputed-hash", + "selectors", + "tendril", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" +dependencies = [ + "serde", +] + [[package]] name = "dpi" version = "0.1.2" @@ -1306,12 +1747,59 @@ dependencies = [ "linux-raw-sys 0.6.5", ] +[[package]] +name = "dtoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + [[package]] name = "dtor" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edf234dd1594d6dd434a8fb8cada51ddbbc593e40e4a01556a0b31c62da2775b" +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + +[[package]] +name = "embed-resource" +version = "3.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6168487b5e7eb2673e6efe1200b1848016e436a6ca0b8031bf04bd9d493a249f" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 1.1.8+spec-1.1.0", + "vswhom", + "winreg", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + [[package]] name = "endi" version = "1.1.1" @@ -1345,6 +1833,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" +[[package]] +name = "erased-serde" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e59b668157f32d3459d4bd634861a06ffa2503a461ca5f0916b9f0252605e66" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + [[package]] name = "errno" version = "0.3.14" @@ -1421,13 +1920,23 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + [[package]] name = "find-crate" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -1719,6 +2228,115 @@ dependencies = [ "slab", ] +[[package]] +name = "gdk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gdkx11" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +dependencies = [ + "gdk", + "gdkx11-sys", + "gio", + "glib", + "libc", + "x11", +] + +[[package]] +name = "gdkx11-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps", + "x11", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "gethostname" version = "1.1.0" @@ -1775,6 +2393,51 @@ dependencies = [ "weezl", ] +[[package]] +name = "gio" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror 1.0.69", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "gipfel" +version = "0.5.5" +dependencies = [ + "flate2", + "gipfel-core", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew", +] + [[package]] name = "gipfel-app" version = "0.5.5" @@ -1799,13 +2462,21 @@ dependencies = [ name = "gipfel-core" version = "0.5.5" dependencies = [ - "dirs", + "dirs 6.0.0", "image", "kamadak-exif", - "quick-xml", + "quick-xml 0.41.0", "tiff", ] +[[package]] +name = "gipfel-desktop" +version = "0.5.5" +dependencies = [ + "tauri", + "tauri-build", +] + [[package]] name = "gl_generator" version = "0.14.0" @@ -1824,35 +2495,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] -name = "gloo" -version = "0.8.1" +name = "glib" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "gloo-console 0.2.3", - "gloo-dialogs 0.1.1", - "gloo-events 0.1.2", - "gloo-file 0.2.3", - "gloo-history 0.1.5", - "gloo-net 0.3.1", - "gloo-render 0.1.1", - "gloo-storage 0.2.2", - "gloo-timers 0.2.6", - "gloo-utils 0.1.7", - "gloo-worker 0.2.1", + "bitflags 2.13.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror 1.0.69", ] [[package]] -name = "gloo" -version = "0.10.0" +name = "glib-macros" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "gloo-console 0.3.0", - "gloo-dialogs 0.2.0", - "gloo-events 0.2.0", - "gloo-file 0.3.0", - "gloo-history 0.2.2", + "heck 0.4.1", + "proc-macro-crate 2.0.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" + +[[package]] +name = "gloo" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +dependencies = [ + "gloo-console 0.2.3", + "gloo-dialogs 0.1.1", + "gloo-events 0.1.2", + "gloo-file 0.2.3", + "gloo-history 0.1.5", + "gloo-net 0.3.1", + "gloo-render 0.1.1", + "gloo-storage 0.2.2", + "gloo-timers 0.2.6", + "gloo-utils 0.1.7", + "gloo-worker 0.2.1", +] + +[[package]] +name = "gloo" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +dependencies = [ + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.2", "gloo-net 0.4.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", @@ -1994,7 +2718,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils 0.1.7", - "http", + "http 0.2.12", "js-sys", "pin-project", "serde", @@ -2015,7 +2739,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils 0.2.0", - "http", + "http 0.2.12", "js-sys", "pin-project", "serde", @@ -2191,6 +2915,17 @@ dependencies = [ "gl_generator", ] +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + [[package]] name = "gpu-allocator" version = "0.28.0" @@ -2231,6 +2966,58 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5" +[[package]] +name = "gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +dependencies = [ + "atk", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "guillotiere" version = "0.6.2" @@ -2266,6 +3053,12 @@ dependencies = [ "smallvec", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.15.5" @@ -2300,6 +3093,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.5.3" @@ -2329,6 +3128,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "html5ever" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8" +dependencies = [ + "log", + "markup5ever", +] + [[package]] name = "http" version = "0.2.12" @@ -2340,6 +3149,45 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" +dependencies = [ + "bytes", + "http 1.5.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" +dependencies = [ + "bytes", + "futures-core", + "http 1.5.0", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + [[package]] name = "hybrid-array" version = "0.4.15" @@ -2349,6 +3197,49 @@ dependencies = [ "typenum", ] +[[package]] +name = "hyper" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c" +dependencies = [ + "atomic-waker", + "bytes", + "futures-core", + "http 1.5.0", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-util" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" +dependencies = [ + "base64 0.23.1", + "bytes", + "futures-channel", + "futures-util", + "http 1.5.0", + "http-body", + "httparse", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "i18n-config" version = "0.4.8" @@ -2416,6 +3307,30 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "iana-time-zone" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "iced" version = "0.14.0" @@ -2568,7 +3483,7 @@ dependencies = [ "log", "resvg", "rustc-hash 2.1.3", - "softbuffer", + "softbuffer 0.4.1", "tiny-skia 0.11.4", ] @@ -2649,6 +3564,16 @@ dependencies = [ "winit-core", ] +[[package]] +name = "ico" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75e94d66081e4d8dcd098bd8dc5254800fea14a26389b298410158d834de167" +dependencies = [ + "byteorder", + "png 0.18.1", +] + [[package]] name = "icu_collections" version = "2.4.0" @@ -2798,7 +3723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8a9aa791c7b5a71b636b7a68207fdebf171ddfc593d9c8506ec4cbc527b6a84" dependencies = [ "implicit-clone-derive", - "indexmap", + "indexmap 2.14.2", ] [[package]] @@ -2811,6 +3736,17 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + [[package]] name = "indexmap" version = "2.14.2" @@ -2819,6 +3755,17 @@ checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", "hashbrown 0.17.1", + "serde", + "serde_core", +] + +[[package]] +name = "infer" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4200d433cbd5178df7797c9c2e75b348b728e39631cf14520d1e2fc424201f4" +dependencies = [ + "cfb", ] [[package]] @@ -2860,12 +3807,41 @@ dependencies = [ "unic-langid", ] +[[package]] +name = "ipnet" +version = "2.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" + [[package]] name = "itoa" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "javascriptcore-rs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "jiff" version = "0.2.38" @@ -2920,6 +3896,22 @@ dependencies = [ "jiff-tzdb", ] +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys 0.3.1", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + [[package]] name = "jni" version = "0.22.4" @@ -2999,6 +3991,28 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json-patch" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7421438de105a0827e44fadd05377727847d717c80ce29a229f85fd04c427b72" +dependencies = [ + "jsonptr", + "serde", + "serde_json", + "thiserror 2.0.21", +] + +[[package]] +name = "jsonptr" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "kamadak-exif" version = "0.6.1" @@ -3025,7 +4039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading", + "libloading 0.8.9", "pkg-config", ] @@ -3085,6 +4099,30 @@ dependencies = [ "smallvec", ] +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading 0.7.4", + "once_cell", +] + [[package]] name = "libc" version = "0.2.191" @@ -3141,13 +4179,32 @@ dependencies = [ ] [[package]] -name = "libloading" -version = "0.8.9" +name = "libdbus-sys" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043" dependencies = [ - "cfg-if", - "windows-link 0.2.1", + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link 0.2.1", ] [[package]] @@ -3295,6 +4352,17 @@ dependencies = [ "libc", ] +[[package]] +name = "markup5ever" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de" +dependencies = [ + "log", + "tendril", + "web_atoms", +] + [[package]] name = "memchr" version = "2.8.3" @@ -3400,6 +4468,27 @@ dependencies = [ "pxfm", ] +[[package]] +name = "muda" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca139e57da4383727f189e43e66e84fa372347027fc996f9f1a007ec0a37996" +dependencies = [ + "crossbeam-channel", + "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk", + "keyboard-types", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "once_cell", + "png 0.18.1", + "serde", + "thiserror 2.0.21", + "windows-sys 0.61.2", +] + [[package]] name = "mutate_once" version = "0.1.2" @@ -3421,7 +4510,7 @@ dependencies = [ "half", "hashbrown 0.16.1", "hexf-parse", - "indexmap", + "indexmap 2.14.2", "libm", "log", "num-traits", @@ -3462,6 +4551,12 @@ dependencies = [ "jni-sys 0.3.1", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "notify" version = "8.2.1" @@ -3490,6 +4585,12 @@ dependencies = [ "bitflags 2.13.2", ] +[[package]] +name = "num-conv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + [[package]] name = "num-traits" version = "0.2.19" @@ -3575,6 +4676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8" dependencies = [ "objc2-encode", + "objc2-exception-helper", ] [[package]] @@ -3587,10 +4689,10 @@ dependencies = [ "block2 0.5.1", "libc", "objc2 0.5.3", - "objc2-core-data", - "objc2-core-image", + "objc2-core-data 0.2.2", + "objc2-core-image 0.2.2", "objc2-foundation 0.2.2", - "objc2-quartz-core", + "objc2-quartz-core 0.2.2", ] [[package]] @@ -3604,6 +4706,18 @@ dependencies = [ "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +dependencies = [ + "bitflags 2.13.2", + "objc2 0.6.5", + "objc2-foundation 0.3.2", ] [[package]] @@ -3618,6 +4732,16 @@ dependencies = [ "objc2-foundation 0.2.2", ] +[[package]] +name = "objc2-core-data" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" +dependencies = [ + "objc2 0.6.5", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -3637,8 +4761,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ "bitflags 2.13.2", + "dispatch2", "libc", + "objc2 0.6.5", "objc2-core-foundation", + "objc2-io-surface", ] [[package]] @@ -3653,6 +4780,26 @@ dependencies = [ "objc2-metal", ] +[[package]] +name = "objc2-core-image" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +dependencies = [ + "objc2 0.6.5", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-location" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009" +dependencies = [ + "objc2 0.6.5", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-core-services" version = "0.3.2" @@ -3663,6 +4810,18 @@ dependencies = [ "objc2-core-foundation", ] +[[package]] +name = "objc2-core-text" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" +dependencies = [ + "bitflags 2.13.2", + "objc2 0.6.5", + "objc2-core-foundation", + "objc2-core-graphics", +] + [[package]] name = "objc2-core-video" version = "0.3.2" @@ -3680,6 +4839,15 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" +[[package]] +name = "objc2-exception-helper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" +dependencies = [ + "cc", +] + [[package]] name = "objc2-foundation" version = "0.2.2" @@ -3704,6 +4872,17 @@ dependencies = [ "objc2-core-foundation", ] +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags 2.13.2", + "objc2 0.6.5", + "objc2-core-foundation", +] + [[package]] name = "objc2-metal" version = "0.2.2" @@ -3729,6 +4908,18 @@ dependencies = [ "objc2-metal", ] +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.13.2", + "objc2 0.6.5", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-ui-kit" version = "0.3.2" @@ -3736,7 +4927,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.13.2", + "block2 0.6.2", + "objc2 0.6.5", + "objc2-cloud-kit", + "objc2-core-data 0.3.2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-image 0.3.2", + "objc2-core-location", + "objc2-core-text", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e" +dependencies = [ + "objc2 0.6.5", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-web-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +dependencies = [ + "bitflags 2.13.2", + "block2 0.6.2", "objc2 0.6.5", + "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", ] @@ -3808,7 +5032,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "proc-macro2-diagnostics", "quote", @@ -3855,6 +5079,31 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e6eb142958d64335fb0e345c5b9ead2ecd6fc438c307e9d7d3c4fd428dbaf12" +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "parking" version = "2.2.1" @@ -3907,6 +5156,16 @@ dependencies = [ "serde", ] +[[package]] +name = "phf_codegen" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" +dependencies = [ + "phf_generator", + "phf_shared", +] + [[package]] name = "phf_generator" version = "0.13.1" @@ -4013,6 +5272,19 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "plist" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285" +dependencies = [ + "base64 0.23.1", + "indexmap 2.14.2", + "quick-xml 0.42.0", + "serde", + "time", +] + [[package]] name = "png" version = "0.17.16" @@ -4083,6 +5355,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "powerfmt" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -4092,6 +5370,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "presser" version = "0.3.1" @@ -4118,6 +5402,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -4239,6 +5532,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.47" @@ -4397,11 +5699,54 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "ref-cast" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.9", +] + +[[package]] +name = "regex" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + [[package]] name = "regex-automata" version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "renderdoc-sys" @@ -4409,6 +5754,40 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" +[[package]] +name = "reqwest" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" +dependencies = [ + "base64 0.23.1", + "bytes", + "futures-core", + "futures-util", + "http 1.5.0", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "sync_wrapper", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + [[package]] name = "resvg" version = "0.45.1" @@ -4510,7 +5889,7 @@ version = "8.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d84e8ba78bd384263e5922f084cbe1b081c3b7e69add59c8fb097b879ba968a" dependencies = [ - "sha2", + "sha2 0.11.1", "walkdir", ] @@ -4601,18 +5980,69 @@ dependencies = [ ] [[package]] -name = "scoped-tls" -version = "1.0.1" +name = "schemars" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +dependencies = [ + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", + "uuid", +] [[package]] -name = "scopeguard" -version = "1.2.0" +name = "schemars" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.119", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] name = "sctk-adwaita" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4625,6 +6055,25 @@ dependencies = [ "tiny-skia 0.12.0", ] +[[package]] +name = "selectors" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d" +dependencies = [ + "bitflags 2.13.2", + "cssparser", + "derive_more", + "log", + "new_debug_unreachable", + "phf", + "phf_codegen", + "precomputed-hash", + "rustc-hash 2.1.3", + "servo_arc", + "smallvec", +] + [[package]] name = "self_cell" version = "1.3.0" @@ -4636,6 +6085,10 @@ name = "semver" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" +dependencies = [ + "serde", + "serde_core", +] [[package]] name = "serde" @@ -4647,6 +6100,18 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" +dependencies = [ + "erased-serde", + "serde", + "serde_core", + "typeid", +] + [[package]] name = "serde-wasm-bindgen" version = "0.5.0" @@ -4689,6 +6154,17 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "serde_json" version = "1.0.154" @@ -4696,7 +6172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" dependencies = [ "foldhash 0.2.0", - "indexmap", + "indexmap 2.14.2", "itoa", "memchr", "serde", @@ -4715,6 +6191,24 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +dependencies = [ + "serde_core", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4727,6 +6221,81 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9adc193c780ef8f159aee8b61e2d5801aaa555e6eb0947fe45530ec506296f" +dependencies = [ + "base64 0.23.1", + "bs58", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.14.2", + "jiff", + "schemars 0.9.0", + "schemars 1.2.3", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e17bbc68e28663bbbb90df47e058aa7eda4fb445b89fe70457bb94fbccf6e49" +dependencies = [ + "darling 0.24.1", + "proc-macro2", + "quote", + "syn 3.0.9", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "servo_arc" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.1" @@ -4734,8 +6303,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.3.1", + "digest 0.11.3", ] [[package]] @@ -4899,7 +6468,7 @@ dependencies = [ "bytemuck", "cfg_aliases", "cocoa", - "core-graphics", + "core-graphics 0.23.2", "drm", "fastrand", "foreign-types", @@ -4920,6 +6489,54 @@ dependencies = [ "x11rb", ] +[[package]] +name = "softbuffer" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" +dependencies = [ + "bytemuck", + "js-sys", + "ndk", + "objc2 0.6.5", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", + "raw-window-handle", + "redox_syscall 0.5.18", + "tracing", + "wasm-bindgen", + "web-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "soup3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +dependencies = [ + "futures-channel", + "gio", + "glib", + "libc", + "soup3-sys", +] + +[[package]] +name = "soup3-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -4941,6 +6558,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_vcruntime" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff7589a1859b09232522bb9edf076ca7fcf14ded96685d3fa629db73023ffbb7" + [[package]] name = "strict-num" version = "0.1.1" @@ -4950,6 +6573,30 @@ dependencies = [ "float-cmp 0.9.0", ] +[[package]] +name = "string_cache" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] +name = "string_cache_codegen" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", +] + [[package]] name = "strsim" version = "0.11.1" @@ -4983,6 +6630,17 @@ dependencies = [ "zeno", ] +[[package]] +name = "swift-rs" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefd87076fd385308ee4aff597256c902f1fbb4d031de1558efc12f8ffefadd9" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + [[package]] name = "syn" version = "1.0.109" @@ -5015,6 +6673,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "synstructure" version = "0.14.0" @@ -5035,6 +6702,19 @@ dependencies = [ "libc", ] +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml 0.8.23", + "version-compare", +] + [[package]] name = "taffy" version = "0.9.2" @@ -5047,6 +6727,277 @@ dependencies = [ "slotmap", ] +[[package]] +name = "tao" +version = "0.37.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5777b06fe6435126ae8d816eba269e050e1e10d302cf5461e9c49eccabc3548" +dependencies = [ + "bitflags 2.13.2", + "block2 0.6.2", + "core-foundation 0.10.1", + "core-graphics 0.25.0", + "crossbeam-channel", + "dbus", + "dispatch2", + "dlopen2", + "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdkwayland-sys", + "gdkx11-sys", + "gtk", + "jni 0.21.1", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "parking_lot", + "percent-encoding", + "raw-window-handle", + "tao-macros", + "unicode-segmentation", + "url", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7eeb6d99155545da6150a1795945f16ac9c178deb2a5f2e74d776107bd5849" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tauri" +version = "2.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fb0244332cfb9cee7e2a568bf5da29a36ed8fdbd717f6f47a66b6b7b358c072" +dependencies = [ + "anyhow", + "bytes", + "cookie", + "dirs 7.0.0", + "dunce", + "embed_plist", + "getrandom 0.3.4", + "glob", + "gtk", + "heck 0.5.0", + "http 1.5.0", + "jni 0.21.1", + "libc", + "log", + "mime 0.3.17", + "muda", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "percent-encoding", + "plist", + "raw-window-handle", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "swift-rs", + "tauri-build", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "thiserror 2.0.21", + "tokio", + "tray-icon", + "url", + "webkit2gtk", + "webview2-com", + "window-vibrancy", + "windows 0.62.2", +] + +[[package]] +name = "tauri-build" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adddb0e648752aaac5da9c3c3c6a68e1e87cab55e3b757b18a9441ef8c3ac614" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs 7.0.0", + "glob", + "heck 0.5.0", + "json-patch", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "static_vcruntime", + "strsim", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb37631cf71dab5e8ab55e1bdd701e18a52653d90b78e71d0e5598b1e0a61316" +dependencies = [ + "base64 0.23.1", + "brotli", + "ico", + "json-patch", + "plist", + "png 0.18.1", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "sha2 0.10.9", + "syn 2.0.119", + "tauri-utils", + "thiserror 2.0.21", + "time", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc38db58854c10fb5f91a887ed8bf82d3239bb92b5d8db86eda09e96d9963d1" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.119", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-runtime" +version = "2.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9" +dependencies = [ + "cookie", + "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk", + "http 1.5.0", + "jni 0.21.1", + "objc2 0.6.5", + "objc2-ui-kit", + "objc2-web-kit", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror 2.0.21", + "url", + "webkit2gtk", + "webview2-com", + "windows 0.62.2", +] + +[[package]] +name = "tauri-runtime-wry" +version = "2.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1aa9d8b7a120f879f44fdc1053f7b7dbf416bf0bbc6a72b714dec46b782b52f" +dependencies = [ + "gtk", + "http 1.5.0", + "jni 0.21.1", + "log", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "percent-encoding", + "raw-window-handle", + "softbuffer 0.4.8", + "tao", + "tauri-runtime", + "tauri-utils", + "url", + "webkit2gtk", + "webview2-com", + "windows 0.62.2", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "362ab21cd4cc713f2a02b1a9b5688198b1541cfb6907c4281e9190e0f0ef4aa3" +dependencies = [ + "anyhow", + "brotli", + "cargo_metadata", + "ctor 1.0.13", + "dom_query", + "dunce", + "glob", + "http 1.5.0", + "infer", + "json-patch", + "log", + "memchr", + "phf", + "plist", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "swift-rs", + "thiserror 2.0.21", + "toml 1.1.8+spec-1.1.0", + "url", + "urlpattern", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-winres" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c52bb6904475a6ca662f15ef787f18ade61d5740a1ee12c45d3b748efdb6f796" +dependencies = [ + "dunce", + "embed-resource", + "toml 1.1.8+spec-1.1.0", +] + [[package]] name = "tempfile" version = "3.27.0" @@ -5060,6 +7011,15 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "tendril" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fed54709c5b3a53d09bb1c113ea4f5ceafd1e772ddcb0030a82e1d56c087b08" +dependencies = [ + "new_debug_unreachable", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -5123,6 +7083,36 @@ dependencies = [ "zune-jpeg 0.5.15", ] +[[package]] +name = "time" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" + +[[package]] +name = "time-macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tiny-skia" version = "0.11.4" @@ -5181,8 +7171,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a90a0ca3ee6a69f2ad28fd11621a4c3f03b371f366be500b64df260c4ffbafb4" dependencies = [ "as-raw-xcb-connection", - "ctor", - "libloading", + "ctor 0.10.1", + "libloading 0.8.9", "pkg-config", "tracing", ] @@ -5243,6 +7233,19 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e464cf451ba96ebfc6f9b6542f17ee8b8956e33f1e40d9690624e59d7a7f8a4b" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.11" @@ -5252,11 +7255,41 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", + "toml_edit 0.22.27", +] + +[[package]] +name = "toml" +version = "1.1.8+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" +dependencies = [ + "indexmap 2.14.2", + "serde_core", + "serde_spanned 1.1.2", + "toml_datetime 1.1.2+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow 1.0.4", +] + [[package]] name = "toml_datetime" version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] [[package]] name = "toml_datetime" @@ -5269,13 +7302,37 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.14.2", + "toml_datetime 0.6.11", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.14.2", + "toml_datetime 0.6.11", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap", + "indexmap 2.14.2", + "serde", + "serde_spanned 0.6.9", "toml_datetime 0.6.11", - "winnow 0.5.40", + "winnow 0.7.15", ] [[package]] @@ -5284,7 +7341,7 @@ version = "0.25.17+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c" dependencies = [ - "indexmap", + "indexmap 2.14.2", "toml_datetime 1.1.2+spec-1.1.0", "toml_parser", "winnow 1.0.4", @@ -5299,6 +7356,57 @@ dependencies = [ "winnow 1.0.4", ] +[[package]] +name = "toml_writer" +version = "1.1.3+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" +dependencies = [ + "bitflags 2.13.2", + "bytes", + "futures-util", + "http 1.5.0", + "http-body", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + [[package]] name = "tracing" version = "0.1.44" @@ -5331,6 +7439,34 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tray-icon" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b9c52859a94554803ccd4a24b98f74148ebc73b90676d783f3490b1bff9d72" +dependencies = [ + "crossbeam-channel", + "dirs 7.0.0", + "libappindicator", + "muda", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.2", + "once_cell", + "png 0.18.1", + "serde", + "thiserror 2.0.21", + "windows-sys 0.61.2", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "ttf-parser" version = "0.25.1" @@ -5485,13 +7621,25 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "urlpattern" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df16f50ef4cc145211879a3867ba757076b25dfee812040dcb0658bd9ae7904b" +dependencies = [ + "icu_properties", + "regex", + "serde", + "url", +] + [[package]] name = "usvg" version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64", + "base64 0.22.1", "data-url", "flate2", "fontdb", @@ -5524,17 +7672,44 @@ version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" dependencies = [ + "getrandom 0.4.3", "js-sys", "serde_core", "wasm-bindgen", ] +[[package]] +name = "version-compare" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" + [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -5545,6 +7720,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -5616,6 +7800,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-streams" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmtimer" version = "0.4.3" @@ -5749,7 +7946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.41.0", "quote", ] @@ -5785,6 +7982,96 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web_atoms" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8b815c1b593dc0baf78dd0f4fc8fdb2de53198fb1163738093e9a311c33fb3" +dependencies = [ + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", +] + +[[package]] +name = "webkit2gtk" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup3", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pkg-config", + "soup3-sys", + "system-deps", +] + +[[package]] +name = "webview2-com" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f89fca7a704cee10dcb3654c1dbb8941d1783132f1917358af75bec37a7d7e6" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.62.2", + "windows-core 0.62.2", +] + +[[package]] +name = "webview2-com-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "webview2-com-sys" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a07132775117d6065853d9d1178157b8c90e228de47129d6bce2c7edebedfb" +dependencies = [ + "thiserror 2.0.21", + "windows 0.62.2", + "windows-core 0.62.2", +] + [[package]] name = "weezl" version = "0.1.12" @@ -5835,7 +8122,7 @@ dependencies = [ "cfg_aliases", "document-features", "hashbrown 0.16.1", - "indexmap", + "indexmap 2.14.2", "log", "naga", "once_cell", @@ -5904,7 +8191,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading", + "libloading 0.8.9", "log", "metal", "naga", @@ -5972,6 +8259,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "window-vibrancy" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111e51caca442cafd9bab396628ac4d814880eaea4e63dfd76a12e9f342b5580" +dependencies = [ + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", + "raw-window-handle", + "windows-sys 0.61.2", + "windows-version", +] + [[package]] name = "window_clipboard" version = "0.4.1" @@ -6168,6 +8471,15 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -6213,6 +8525,21 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -6279,6 +8606,21 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" +dependencies = [ + "windows-link 0.2.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -6297,6 +8639,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -6315,6 +8663,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -6345,6 +8699,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -6363,6 +8723,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -6381,6 +8747,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -6399,6 +8771,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6425,7 +8803,7 @@ dependencies = [ "bitflags 2.13.2", "cfg_aliases", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "libc", "raw-window-handle", "rustix 1.1.5", @@ -6450,7 +8828,7 @@ source = "git+https://github.com/pop-os/winit.git?rev=9567503#9567503d34130113e3 dependencies = [ "android-activity", "bitflags 2.13.2", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "ndk", "raw-window-handle", "smol_str", @@ -6466,7 +8844,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "dispatch2", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", @@ -6502,7 +8880,7 @@ source = "git+https://github.com/pop-os/winit.git?rev=9567503#9567503d34130113e3 dependencies = [ "bitflags 2.13.2", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "keyboard-types", "raw-window-handle", "smol_str", @@ -6515,7 +8893,7 @@ version = "0.31.0-beta.2" source = "git+https://github.com/pop-os/winit.git?rev=9567503#9567503d34130113e36b0167a2b8829c3756e429" dependencies = [ "bitflags 2.13.2", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "libredox", "orbclient", "raw-window-handle", @@ -6533,7 +8911,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "dispatch2", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -6554,7 +8932,7 @@ dependencies = [ "bitflags 2.13.2", "calloop", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "libc", "memmap2", "raw-window-handle", @@ -6580,7 +8958,7 @@ dependencies = [ "bitflags 2.13.2", "concurrent-queue", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "js-sys", "pin-project", "raw-window-handle", @@ -6600,7 +8978,7 @@ source = "git+https://github.com/pop-os/winit.git?rev=9567503#9567503d34130113e3 dependencies = [ "bitflags 2.13.2", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "raw-window-handle", "smol_str", "tracing", @@ -6618,7 +8996,7 @@ dependencies = [ "bytemuck", "calloop", "cursor-icon", - "dpi", + "dpi 0.1.2 (git+https://github.com/pop-os/winit.git?rev=9567503)", "libc", "percent-encoding", "raw-window-handle", @@ -6641,6 +9019,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +dependencies = [ + "memchr", +] + [[package]] name = "winnow" version = "1.0.4" @@ -6651,16 +9038,13 @@ dependencies = [ ] [[package]] -name = "wipfel" -version = "0.5.5" +name = "winreg" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10" dependencies = [ - "flate2", - "gipfel-core", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew", + "cfg-if", + "windows-sys 0.61.2", ] [[package]] @@ -6675,6 +9059,59 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" +[[package]] +name = "wry" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c50ddad0ef9913bb5496cb9d509a50433a3b78cb0238d61105526589cf0e9" +dependencies = [ + "base64 0.23.1", + "block2 0.6.2", + "cookie", + "crossbeam-channel", + "dirs 7.0.0", + "dom_query", + "dpi 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dunce", + "gdkx11", + "gtk", + "http 1.5.0", + "javascriptcore-rs", + "jni 0.21.1", + "libc", + "ndk", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-ui-kit", + "objc2-web-kit", + "percent-encoding", + "raw-window-handle", + "sha2 0.10.9", + "soup3", + "tao-macros", + "thiserror 2.0.21", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-version", + "x11-dl", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -6695,7 +9132,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading", + "libloading 0.8.9", "once_cell", "rustix 1.1.5", "x11rb-protocol", @@ -6773,7 +9210,7 @@ dependencies = [ "futures", "gloo 0.10.0", "implicit-clone", - "indexmap", + "indexmap 2.14.2", "js-sys", "prokio", "rustversion", diff --git a/Cargo.toml b/Cargo.toml index ab0a71f..72a6df4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" -members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/wipfel"] +members = ["crates/gipfel-core", "crates/gipfel-cli", "crates/gipfel-app", "crates/gipfel", "crates/gipfel-desktop"] # Single source of truth for metadata inherited by every crate via # `version.workspace = true` etc. Bump `version` here on release; the diff --git a/README.md b/README.md index 55aac31..3ecf7a0 100644 --- a/README.md +++ b/README.md @@ -33,27 +33,59 @@ Requirements Installation ------------ -COSMIC desktop application: `cargo build --release -p gipfel-app`. -Then run it with `target/release/gipfel [image.jpg] [--data gipfel.dat]`. +Build the web site (see Build below), serve the resulting `dist/gipfel/` +directory with any static webserver and open it in a browser. Ready-made +desktop installers (.deb, AppImage, Windows installer) are built with the +commands in the Build section. + +Build +----- +All targets share the platform-free library `crates/gipfel-core`; the +browser/WASM front end lives in `crates/gipfel`, the desktop installer +wrapper in `crates/gipfel-desktop`. + +Prerequisites (all targets): + + rustup target add wasm32-unknown-unknown + cargo install wasm-bindgen-cli + +Web (static site, any webserver): + + ./crates/gipfel/build-release.sh # assembles dist/gipfel/ + +dev loop: `./crates/gipfel/serve-here.sh` (refreshes /tmp/gipfel-dist). + +Desktop installers (Tauri, `crates/gipfel-desktop`; needs node/npm once: +`npm i -D @tauri-apps/cli`): + + # Linux .deb + AppImage + sudo apt-get install libwebkit2gtk-4.1-dev libgtk-3-dev librsvg2-dev libxdo-dev + cd crates/gipfel-desktop && npx tauri build --bundles deb,appimage + + # Windows NSIS installer (cross-compiled from Linux) + sudo apt-get install mingw-w64 nsis + rustup target add x86_64-pc-windows-gnu + npx tauri build --target x86_64-pc-windows-gnu --bundles nsis + +Artifacts appear under `target/[x86_64-pc-windows-gnu/]release/bundle/`. +Installers are unsigned. The official targets are Web, Windows and Linux. Running ------- -You should now see a window with controls on the left and the actual picture. -Depending on whether gipfel could find localization data in the image metadata, -you need to set the viewpoint from which the picture was taken. -Alternatively, you can enter the GPS coordinate of the viewpoint directly in -the control window (hit `` for every data field). -You can now use the controls in the control window to modify the view -parameters. - -Play around with these parameters, until you see the names of -mountains, which you already recognize on the picture. -Now middle-click on the small cross at the left of the name to mark it. -It should turn red. Now you can drag it with the left mouse button pressed -to the position of the mountain on the picture. -If you have positioned at least two mountains all other mountains should -move to their correct positions in the picture. -You can try to set more than two mountains to ge a more accurate result. +Open a picture (Open image… or drag & drop it onto the page). Depending +on whether gipfel could find localization data in the image metadata, +you need to set the viewpoint from which the picture was taken, either +in the Latitude/Longitude/Height fields or by pasting GPS coordinates +("47.676,13.32042"). + +Play around with the view parameters (Azimuth, Pitch, Roll, Focal) +until the projected dots roughly match the ridges in the picture. +Hover a dot to see which peak it represents; click a dot to mark it (or +click anywhere in the picture and pick the peak from the searchable +list). Drag a marker onto the position of the mountain in the picture; +right-click removes it. Once at least two mountains are positioned, +gipfel fits the view parameters automatically and moves the remaining +peaks to their correct positions. More markers improve the fit. You may also want to have a look at the (outdated) [screen video](http://www.flpsed.org/images/gipfel.avi) @@ -96,7 +128,7 @@ GPS Tracks ---------- Once you have determined the right parameters using the procedure described above, you can load GPS tracks and display them on the picture. Use the -File->Load Track menu item. GPS tracks should be in GPX format. +"Load GPX Track…" button. GPS tracks should be in GPX format. GPS tracks are displayed with variable width depending on the distance of the way points from the current view point and the scale value. You can also modify the width using the "Track Width" slider. @@ -104,7 +136,7 @@ You can also modify the width using the "Track Width" slider. Loading and Saving Images ------------------------- gipfel allows to save the image parameters in the comment section of -the JPEG image. Use the File->Save Image menu item. +the JPEG image. Use the "Save image…" button. Note, that in the saved image all previous JPEG comments are removed. If you open an image containing gipfel image parameters, they are automatcally set. @@ -115,8 +147,8 @@ gipfel tries to identify objects in its database, that are hidden by others. This is done by assuming that every object/peak has the form of a cone with a fixed steepness. If such imaginary cone would hide the view to a point in the database, gipfel marks it as hidden. Hidden objects are -not shown by default, but you can enable the display of hidden objects using -the Option->Show Hidden menu entry. Hidden objects and hidden GPS way points +not shown by default, but you can enable their display using the +"Show hidden peaks" checkbox. Hidden objects and hidden GPS way points are displayed in blue. Refraction @@ -147,7 +179,7 @@ x0 is the main point offset in X direction. If you mark and position more than 3 mountains on an image and enable distortion fitting, gipfel tries to correct lens distortion. Once you have reasonable values for k0 and k1 for a special camera and -focal length you can save the distortion profile (Distortion/Save Profile). +focal length you can save the distortion profile (Distortion profiles → Save). Whenever you now open an image taken with this camera model and focal length, gipfel will use this distortion profile. Independent of the distortion profiles one can also modify the diff --git a/crates/gipfel-cli/examples/overlay.rs b/crates/gipfel-cli/examples/overlay.rs new file mode 100644 index 0000000..3ce8745 --- /dev/null +++ b/crates/gipfel-cli/examples/overlay.rs @@ -0,0 +1,30 @@ +// Dev helper: project hills for a given viewpoint and print image coords. +// usage: overlay +use gipfel_core::panorama::Panorama; + +fn main() { + let a: Vec = std::env::args().collect(); + let n: Vec = a[1..].iter().map(|s| s.parse().unwrap()).collect(); + let (lat, lon, height, az, pitch, roll, focal, w, h) = + (n[0], n[1], n[2], n[3], n[4], n[5], n[6], n[7], n[8]); + let mut p = Panorama::new(); + p.load_data("gipfel.dat").unwrap(); + p.set_view_lat(lat); + p.set_view_long(lon); + p.set_view_height(height); + p.set_scale(focal * w.max(h) / 36.0); + p.set_center_angle(az); + p.set_pitch_angle(pitch); + p.set_roll_angle(roll); + p.max_view_angle = 60_f64.to_radians(); + p.update_visible_mountains(None); + println!("# az={az} pitch={pitch} scale={}", focal * w.max(h) / 36.0); + for &i in &p.visible { + let hill = &p.hills[i]; + let d = p.get_real_distance(i) / 1000.0; + if hill.x.abs() < w / 2.0 && hill.y.abs() < h / 2.0 && hill.height > 1500.0 { + // convert center-relative coords to full image coords + println!("{:.0} {:.0} {} {:.0}m {:.1}km", hill.x + w / 2.0, hill.y + h / 2.0, hill.name, hill.height, d); + } + } +} diff --git a/crates/gipfel-core/src/metadata.rs b/crates/gipfel-core/src/metadata.rs index 9d73a8d..428cf79 100644 --- a/crates/gipfel-core/src/metadata.rs +++ b/crates/gipfel-core/src/metadata.rs @@ -232,6 +232,22 @@ impl ImageMetaData { } } } + // Phone cameras record the shooting direction as GPSImgDirection. + // Used only when no gipfel comment provided a direction. A magnetic + // reference ('M') is converted to true north with the current + // declination of the Eastern Alps (~+2.4 deg east, IGRF 2020s); + // the residual error stays below typical phone compass noise. + if self.direction.is_nan() { + if let Some(f) = exif.get_field(Tag::GPSImgDirection, In::PRIMARY) { + if let Some(v) = field_tofloat(f, 0) { + let mut dir = v; + if exif_ref_is(&exif, Tag::GPSImgDirectionRef, "M") { + dir += 2.4; + } + self.direction = dir; + } + } + } } } diff --git a/crates/gipfel-core/src/profile.rs b/crates/gipfel-core/src/profile.rs index e8bda68..2eff8f6 100644 --- a/crates/gipfel-core/src/profile.rs +++ b/crates/gipfel-core/src/profile.rs @@ -112,7 +112,19 @@ pub fn sanitize_name(name: &str) -> Result<(), Error> { Ok(()) } -/// Parse a prefs file into ordered (name, profile) pairs. Tolerant: +/// Parse a prefs file into ordered (name, profile) pairs. Tolerant: comments +/// (`;`), the root group `[.]`, blank lines and unknown keys are ignored; +/// values are parsed with Rust's `f64` (superset of C `%g`). +pub fn parse_prefs(text: &str) -> Vec<(String, Profile)> { + parse(text) +} + +/// Serialize profiles in FLTK's layout so the C version can read our file. +pub fn serialize_prefs(profiles: &[(String, Profile)]) -> String { + serialize(profiles) +} + +/// Parse a prefs file into ordered (name, profile) pairs. Tolerant: /// comments (`;`), the root group `[.]`, blank lines and unknown keys are /// ignored; values are parsed with Rust's `f64` (superset of C `%g`). fn parse(text: &str) -> Vec<(String, Profile)> { diff --git a/crates/gipfel-desktop/.cargo/config.toml b/crates/gipfel-desktop/.cargo/config.toml new file mode 100644 index 0000000..10d19b9 --- /dev/null +++ b/crates/gipfel-desktop/.cargo/config.toml @@ -0,0 +1,3 @@ +# cross-link Windows PE binaries with mingw-w64 +[target.x86_64-pc-windows-gnu] +linker = "x86_64-w64-mingw32-gcc" diff --git a/crates/gipfel-desktop/.gitignore b/crates/gipfel-desktop/.gitignore new file mode 100644 index 0000000..6b0406a --- /dev/null +++ b/crates/gipfel-desktop/.gitignore @@ -0,0 +1,4 @@ +dist/ +node_modules/ +package-lock.json +gen/ diff --git a/crates/gipfel-desktop/Cargo.toml b/crates/gipfel-desktop/Cargo.toml new file mode 100644 index 0000000..468bd4c --- /dev/null +++ b/crates/gipfel-desktop/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "gipfel-desktop" +version.workspace = true +edition.workspace = true +license.workspace = true +description = "gipfel — native desktop shell (Tauri) around the WASM front end" + +[build-dependencies] +tauri-build = { version = "2", features = [] } + +[dependencies] +tauri = { version = "2", features = [] } diff --git a/crates/gipfel-desktop/app-icon.png b/crates/gipfel-desktop/app-icon.png new file mode 100644 index 0000000..9c999de Binary files /dev/null and b/crates/gipfel-desktop/app-icon.png differ diff --git a/crates/gipfel-desktop/build-frontend.sh b/crates/gipfel-desktop/build-frontend.sh new file mode 100755 index 0000000..72a1687 --- /dev/null +++ b/crates/gipfel-desktop/build-frontend.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Build the gipfel WASM front end into dist/ for tauri to bundle. +# Runs from crates/gipfel-desktop (tauri beforeBuildCommand). +set -e +HERE="$(cd "$(dirname "$0")" && pwd)" +DIST="$HERE/dist" +mkdir -p "$DIST" +cd "$HERE/../.." +cargo build -p gipfel --target wasm32-unknown-unknown --release +wasm-bindgen --target web --out-dir "$DIST" \ + target/wasm32-unknown-unknown/release/gipfel.wasm +cp crates/gipfel/www/index.html crates/gipfel/www/style.css \ + crates/gipfel/www/loader.js "$DIST/" +gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" +echo "frontend dist ready: $DIST" diff --git a/crates/gipfel-desktop/build.rs b/crates/gipfel-desktop/build.rs new file mode 100644 index 0000000..d860e1e --- /dev/null +++ b/crates/gipfel-desktop/build.rs @@ -0,0 +1,3 @@ +fn main() { + tauri_build::build() +} diff --git a/crates/gipfel-desktop/icons/128x128.png b/crates/gipfel-desktop/icons/128x128.png new file mode 100644 index 0000000..677f7e3 Binary files /dev/null and b/crates/gipfel-desktop/icons/128x128.png differ diff --git a/crates/gipfel-desktop/icons/128x128@2x.png b/crates/gipfel-desktop/icons/128x128@2x.png new file mode 100644 index 0000000..7c6ca8f Binary files /dev/null and b/crates/gipfel-desktop/icons/128x128@2x.png differ diff --git a/crates/gipfel-desktop/icons/32x32.png b/crates/gipfel-desktop/icons/32x32.png new file mode 100644 index 0000000..b89ad45 Binary files /dev/null and b/crates/gipfel-desktop/icons/32x32.png differ diff --git a/crates/gipfel-desktop/icons/64x64.png b/crates/gipfel-desktop/icons/64x64.png new file mode 100644 index 0000000..06e1baa Binary files /dev/null and b/crates/gipfel-desktop/icons/64x64.png differ diff --git a/crates/gipfel-desktop/icons/Square107x107Logo.png b/crates/gipfel-desktop/icons/Square107x107Logo.png new file mode 100644 index 0000000..be100d3 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square107x107Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square142x142Logo.png b/crates/gipfel-desktop/icons/Square142x142Logo.png new file mode 100644 index 0000000..c392f48 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square142x142Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square150x150Logo.png b/crates/gipfel-desktop/icons/Square150x150Logo.png new file mode 100644 index 0000000..bc97d99 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square150x150Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square284x284Logo.png b/crates/gipfel-desktop/icons/Square284x284Logo.png new file mode 100644 index 0000000..c5164ec Binary files /dev/null and b/crates/gipfel-desktop/icons/Square284x284Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square30x30Logo.png b/crates/gipfel-desktop/icons/Square30x30Logo.png new file mode 100644 index 0000000..803d0b5 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square30x30Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square310x310Logo.png b/crates/gipfel-desktop/icons/Square310x310Logo.png new file mode 100644 index 0000000..61b7cb9 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square310x310Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square44x44Logo.png b/crates/gipfel-desktop/icons/Square44x44Logo.png new file mode 100644 index 0000000..0632827 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square44x44Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square71x71Logo.png b/crates/gipfel-desktop/icons/Square71x71Logo.png new file mode 100644 index 0000000..959fa73 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square71x71Logo.png differ diff --git a/crates/gipfel-desktop/icons/Square89x89Logo.png b/crates/gipfel-desktop/icons/Square89x89Logo.png new file mode 100644 index 0000000..a40b586 Binary files /dev/null and b/crates/gipfel-desktop/icons/Square89x89Logo.png differ diff --git a/crates/gipfel-desktop/icons/StoreLogo.png b/crates/gipfel-desktop/icons/StoreLogo.png new file mode 100644 index 0000000..2f6d80f Binary files /dev/null and b/crates/gipfel-desktop/icons/StoreLogo.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/crates/gipfel-desktop/icons/android/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..2ffbf24 --- /dev/null +++ b/crates/gipfel-desktop/icons/android/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher.png b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..89cf08d Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..6e365db Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_round.png b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..569b423 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-hdpi/ic_launcher_round.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher.png b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..f694785 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..248af68 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_round.png b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..624ac76 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-mdpi/ic_launcher_round.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher.png b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..9b8f176 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..b60251d Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_round.png b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..2f3158a Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher.png b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..bbac643 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..c13ec89 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..48d697d Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher.png b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..1ac2c2b Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..4a7c684 Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d6dfa8d Binary files /dev/null and b/crates/gipfel-desktop/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/crates/gipfel-desktop/icons/android/values/ic_launcher_background.xml b/crates/gipfel-desktop/icons/android/values/ic_launcher_background.xml new file mode 100644 index 0000000..16cdd5a --- /dev/null +++ b/crates/gipfel-desktop/icons/android/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/crates/gipfel-desktop/icons/icon.icns b/crates/gipfel-desktop/icons/icon.icns new file mode 100644 index 0000000..a467c34 Binary files /dev/null and b/crates/gipfel-desktop/icons/icon.icns differ diff --git a/crates/gipfel-desktop/icons/icon.ico b/crates/gipfel-desktop/icons/icon.ico new file mode 100644 index 0000000..cc0ac92 Binary files /dev/null and b/crates/gipfel-desktop/icons/icon.ico differ diff --git a/crates/gipfel-desktop/icons/icon.png b/crates/gipfel-desktop/icons/icon.png new file mode 100644 index 0000000..6a3880e Binary files /dev/null and b/crates/gipfel-desktop/icons/icon.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-20x20@1x.png b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@1x.png new file mode 100644 index 0000000..d563874 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@1x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x-1.png b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x-1.png new file mode 100644 index 0000000..09ff5d1 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x-1.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x.png new file mode 100644 index 0000000..09ff5d1 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-20x20@3x.png b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@3x.png new file mode 100644 index 0000000..d137cbf Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-20x20@3x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-29x29@1x.png b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@1x.png new file mode 100644 index 0000000..9dbc33f Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@1x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x-1.png b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x-1.png new file mode 100644 index 0000000..3cb954c Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x-1.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x.png new file mode 100644 index 0000000..3cb954c Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-29x29@3x.png b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@3x.png new file mode 100644 index 0000000..9fae2c7 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-29x29@3x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-40x40@1x.png b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@1x.png new file mode 100644 index 0000000..09ff5d1 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@1x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x-1.png b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x-1.png new file mode 100644 index 0000000..8255b8c Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x-1.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x.png new file mode 100644 index 0000000..8255b8c Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-40x40@3x.png b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@3x.png new file mode 100644 index 0000000..a8dbcb6 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-40x40@3x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-512@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-512@2x.png new file mode 100644 index 0000000..90fba83 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-512@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-60x60@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-60x60@2x.png new file mode 100644 index 0000000..a8dbcb6 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-60x60@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-60x60@3x.png b/crates/gipfel-desktop/icons/ios/AppIcon-60x60@3x.png new file mode 100644 index 0000000..036dede Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-60x60@3x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-76x76@1x.png b/crates/gipfel-desktop/icons/ios/AppIcon-76x76@1x.png new file mode 100644 index 0000000..5888f0f Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-76x76@1x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-76x76@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-76x76@2x.png new file mode 100644 index 0000000..7675933 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-76x76@2x.png differ diff --git a/crates/gipfel-desktop/icons/ios/AppIcon-83.5x83.5@2x.png b/crates/gipfel-desktop/icons/ios/AppIcon-83.5x83.5@2x.png new file mode 100644 index 0000000..21a1598 Binary files /dev/null and b/crates/gipfel-desktop/icons/ios/AppIcon-83.5x83.5@2x.png differ diff --git a/crates/gipfel-desktop/package.json b/crates/gipfel-desktop/package.json new file mode 100644 index 0000000..466edf2 --- /dev/null +++ b/crates/gipfel-desktop/package.json @@ -0,0 +1,14 @@ +{ + "name": "gipfel-desktop", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "type": "commonjs", + "devDependencies": { + "@tauri-apps/cli": "^2.12.4" + } +} diff --git a/crates/gipfel-desktop/src/main.rs b/crates/gipfel-desktop/src/main.rs new file mode 100644 index 0000000..a6cd4ff --- /dev/null +++ b/crates/gipfel-desktop/src/main.rs @@ -0,0 +1,11 @@ +//! gipfel desktop shell: a webview window around the static WASM build +//! in `dist/` (produced by build-frontend.sh). All real work happens in +//! the wasm front end; this binary only hosts it. + +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + +fn main() { + tauri::Builder::default() + .run(tauri::generate_context!()) + .expect("error while running gipfel"); +} diff --git a/crates/gipfel-desktop/tauri.conf.json b/crates/gipfel-desktop/tauri.conf.json new file mode 100644 index 0000000..0f434f3 --- /dev/null +++ b/crates/gipfel-desktop/tauri.conf.json @@ -0,0 +1,37 @@ +{ + "$schema": "https://schema.tauri.app/config/2", + "productName": "gipfel", + "mainBinaryName": "gipfel", + "version": "0.5.5", + "identifier": "org.flpsed.gipfel", + "build": { + "frontendDist": "dist", + "beforeBuildCommand": "sh build-frontend.sh" + }, + "app": { + "windows": [ + { + "title": "gipfel — Photogrammetry for Mountain Images", + "width": 1280, + "height": 860, + "resizable": true + } + ], + "security": { + "csp": null + } + }, + "bundle": { + "active": true, + "targets": "all", + "category": "Utility", + "shortDescription": "Mountain photo peak identification (photogrammetry)", + "longDescription": "gipfel: open a mountain photo, identify peaks, fit the camera projection and save annotated images. All processing is local; images never leave the machine.", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/icon.png", + "icons/icon.ico" + ] + } +} diff --git a/crates/gipfel/Cargo.toml b/crates/gipfel/Cargo.toml new file mode 100644 index 0000000..55b4e05 --- /dev/null +++ b/crates/gipfel/Cargo.toml @@ -0,0 +1,50 @@ +[package] +name = "gipfel" +version.workspace = true +edition.workspace = true +license.workspace = true +description = "gipfel — web based photogrammetry for mountain images" + +[dependencies] +gipfel-core = { path = "../gipfel-core" } +flate2 = "1" +js-sys = "0.3" +wasm-bindgen = "0.2" +wasm-bindgen-futures = "0.4" +yew = { version = "0.21", features = ["csr"] } + +[dependencies.web-sys] +version = "0.3" +features = [ + "Blob", + "BlobPropertyBag", + "CanvasRenderingContext2d", + "DataTransfer", + "CssStyleDeclaration", + "Document", + "DomRect", + "DragEvent", + "Element", + "Event", + "EventTarget", + "File", + "FileList", + "HtmlCanvasElement", + "HtmlElement", + "HtmlInputElement", + "HtmlSelectElement", + "ImageBitmap", + "Location", + "UrlSearchParams", + "InputEvent", + "MouseEvent", + "PointerEvent", + "Request", + "Response", + "ResizeObserver", + "Storage", + "TextMetrics", + "Url", + "Window", + "WheelEvent", +] diff --git a/crates/gipfel/README.md b/crates/gipfel/README.md new file mode 100644 index 0000000..37c09ea --- /dev/null +++ b/crates/gipfel/README.md @@ -0,0 +1,47 @@ +# wipfel + +Browser front end for gipfel (WASM, Yew + canvas 2D). See +[`/wasm-plan.md`](../../wasm-plan.md) for the overall plan and milestones. + +**Status: W1 (scaffold + image display) done** — open/drag-drop a JPEG, +pan (drag) and zoom (wheel, cursor-anchored). Peak identification, +fitting and saving arrive in W2/W3. + +## Development + +Prerequisites: [rustup](https://rustup.rs) and trunk: + +```sh +cargo install --locked trunk +``` + +Serve with hot reload: + +```sh +cd crates/wipfel +trunk serve --port 8090 # then open http://localhost:8090 +``` + +Release build (static output in `dist/`, serveable by any web server): + +```sh +trunk build --release +``` + +## Layout + +| File | Purpose | +|---|---| +| `src/main.rs` | entry point | +| `src/app.rs` | root component: sidebar, file loading, state | +| `src/canvas_view.rs` | viewport canvas: bitmap blit, pan/zoom | +| `src/bridge.rs` | JS glue: image decode, blob read, canvas ctx | +| `index.html` | trunk entry point (canonical trunk layout) | +| `www/style.css` | stylesheet (trunk asset) | + +## Notes + +- The base image is decoded by the browser (`createImageBitmap`), not + by the `image` crate — faster decode and GPU-backed blitting. +- The crate compiles natively (`cargo check -p wipfel`) so it can + be checked in CI without a wasm toolchain; runtime is wasm-only. diff --git a/crates/gipfel/build-release.sh b/crates/gipfel/build-release.sh new file mode 100755 index 0000000..1e429ca --- /dev/null +++ b/crates/gipfel/build-release.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Build gipfel and assemble a deployable static site in dist/gipfel/. +# Everything the app loads (wasm, hill database, stylesheet) is fetched +# relative to the page URL, so the directory can be mounted under any +# path on any static server. +set -e +cd "$(dirname "$0")/../.." +ROOT="$(pwd -P)" +# sanity check: refuse to run anywhere that is not the repo root +[ -f "$ROOT/Cargo.toml" ] && [ -d "$ROOT/crates/gipfel" ] || { + echo "error: $ROOT does not look like the gipfel repo root" >&2 + exit 1 +} +DIST="$ROOT/dist/gipfel" +# belt and braces: the only path this script may ever delete +case "$DIST" in + "$ROOT"/dist/gipfel) ;; + *) echo "error: refusing to touch unexpected path $DIST" >&2; exit 1 ;; +esac + +# size-optimized build for the web (the workspace default profile +# targets native binaries); --remove-name-section drops the debug +# symbol names wasm-bindgen adds for devtools +CARGO_PROFILE_RELEASE_OPT_LEVEL=z cargo build -p gipfel --target wasm32-unknown-unknown --release + +# stage into a fresh temp dir and swap it in only on success, so a +# failing build never destroys the previous site and the old site is +# removed at the last possible moment +mkdir -p "$ROOT/dist" +TMP="$(mktemp -d "$ROOT/dist/.gipfel-stage.XXXXXX")" +trap 'rm -rf "$TMP"' EXIT INT TERM + +wasm-bindgen --remove-name-section --target web --out-dir "$TMP" \ + target/wasm32-unknown-unknown/release/gipfel.wasm +# the loader page (not the trunk entry point, which is dev-only) +rm -f "$TMP"/gipfel.d.ts "$TMP"/gipfel_bg.wasm.d.ts +cp crates/gipfel/www/index.html crates/gipfel/www/style.css crates/gipfel/www/loader.js "$TMP/" +gzip -9 -n -c gipfel.dat > "$TMP/gipfel.dat.gz" + +rm -rf "$DIST" +chmod 755 "$TMP" +mv "$TMP" "$DIST" +trap - EXIT INT TERM + +echo "site assembled in $DIST ($(du -sh "$DIST" | cut -f1)):" +ls "$DIST" diff --git a/crates/gipfel/index.html b/crates/gipfel/index.html new file mode 100644 index 0000000..bdd883a --- /dev/null +++ b/crates/gipfel/index.html @@ -0,0 +1,11 @@ + + + + + + gipfel — Photogrammetry for Mountain Images + + + + + diff --git a/crates/gipfel/serve-here.sh b/crates/gipfel/serve-here.sh new file mode 100755 index 0000000..2eaaf4d --- /dev/null +++ b/crates/gipfel/serve-here.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Build gipfel for wasm and refresh the static dist dir served from +# /tmp/gipfel-dist (python http.server on :8090). Dev-only helper. +set -e +cd "$(dirname "$0")/../.." +cargo build -p gipfel --target wasm32-unknown-unknown --release +DIST=/tmp/gipfel-dist +mkdir -p "$DIST" +wasm-bindgen --target web --out-dir "$DIST" target/wasm32-unknown-unknown/release/gipfel.wasm +cp crates/gipfel/www/index.html crates/gipfel/www/style.css crates/gipfel/www/loader.js "$DIST/" +gzip -9 -n -c gipfel.dat > "$DIST/gipfel.dat.gz" +echo "dist refreshed: $(ls -la "$DIST" | awk '{s+=$5} END {print s" bytes"}')" diff --git a/crates/gipfel/src/app.rs b/crates/gipfel/src/app.rs new file mode 100644 index 0000000..7479b8e --- /dev/null +++ b/crates/gipfel/src/app.rs @@ -0,0 +1,1460 @@ +//! 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::hill::{FLAG_DUPLIC, FLAG_HIDDEN, FLAG_TRACK_POINT, FLAG_VISIBLE}; +use gipfel_core::track as gpx; +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; +use web_sys::{DragEvent, Event, HtmlCanvasElement, HtmlInputElement, InputEvent, MouseEvent}; +use yew::prelude::*; + +use crate::bridge; +use crate::canvas_view::{CanvasView, DotView, MarkerView, TrackView, ViewCallbacks, ViewState}; +use crate::compass::{alph_at_img_x, Compass, CompassData}; +use crate::markers::{self, Marker}; +use crate::widgets::{NumItem, SliderItem, TextItem}; + +/// sidebar-editable view parameters (degrees / meters / mm) +#[derive(Clone, Copy, PartialEq)] +struct UiParams { + lat: f64, + lon: f64, + height: f64, + az: f64, + focal: f64, + pitch: f64, + roll: f64, + /// visibility UI value: 0.11 - height_dist_ratio (right = more visible) + vis: f64, + label_font: f32, +} + +impl Default for UiParams { + fn default() -> Self { + UiParams { + lat: 0.0, + lon: 0.0, + height: 0.0, + az: 0.0, + focal: 50.0, + pitch: 0.0, + roll: 0.0, + vis: 0.04, + label_font: 12.0, + } + } +} + +/// view parameter overrides from the URL (degrees / mm), applied on +/// top of whatever the image metadata provides +#[derive(Clone, Copy, Default)] +struct Overrides { + az: Option, + pitch: Option, + roll: Option, + focal: Option, + vis: Option, +} + +/// open Find Peak popup: anchor (screen + image coords) and search query +#[derive(Clone, PartialEq)] +struct FindPeak { + sx: f64, + sy: f64, + ix: f64, + iy: f64, + query: String, +} + +/// Read a query parameter from the page URL (e.g. `/?file=test.jpg`). +fn url_param(name: &str) -> Option { + let search = bridge::window().location().search().ok()?; + let params = web_sys::UrlSearchParams::new_with_str(&search).ok()?; + params.get(name) +} + +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}")) +} + +/// localStorage key holding the distortion profile store, in the same +/// FLTK prefs format the desktop app uses on disk (so files can be +/// exported/imported between the two). +const PREFS_KEY: &str = "gipfel-distortion-profiles"; + +fn load_prefs() -> Vec<(String, gipfel_core::profile::Profile)> { + bridge::store_get(PREFS_KEY) + .map(|t| gipfel_core::profile::parse_prefs(&t)) + .unwrap_or_default() +} + +fn save_prefs(list: &[(String, gipfel_core::profile::Profile)]) -> Result<(), String> { + bridge::store_set(PREFS_KEY, &gipfel_core::profile::serialize_prefs(list)) +} + +#[derive(Properties, PartialEq)] +struct FpProps { + fp: FindPeak, + items: Vec<(String, usize)>, + on_pick: Callback, + on_query: Callback, + on_close: Callback<()>, +} + +/// searchable Find Peak dialog: type to filter, click to select +#[function_component(FindPeakPanel)] +fn find_peak_panel(p: &FpProps) -> Html { + let input_ref = use_node_ref(); + // focus the search box when the dialog opens + { + let input_ref = input_ref.clone(); + use_effect_with((), move |_| { + if let Some(i) = input_ref.cast::() { + let _ = i.focus(); + } + }); + } + let on_query = { + let on_query = p.on_query.clone(); + Callback::from(move |e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + on_query.emit(input.value()); + }) + }; + let on_close = { + let on_close = p.on_close.clone(); + Callback::from(move |_: MouseEvent| on_close.emit(())) + }; + html! { + <> +
+
+
{ "Find Peak" }
+
+ +
+
+ { + for p.items.iter().map(|(label, idx)| { + let onclick = { + let on_pick = p.on_pick.clone(); + let i = *idx; + Callback::from(move |_: MouseEvent| on_pick.emit(i)) + }; + html! { + + } + }) + } + if p.items.is_empty() { +

{ "no matches" }

+ } +
+
+ +
+
+ + } +} + +#[function_component(App)] +pub fn app() -> Html { + let bitmap = use_state(|| None::); + let view = use_state(ViewState::default); + // Live view state for the event callbacks. A UseStateHandle cloned + // into a callback derefs to its render-time snapshot (documented + // Yew behaviour), so consecutive read-modify-writes within one + // frame clobber each other — this silently killed pinch zoom, where + // the pan emit reverted the zoom emit of the same event. The + // mirror is the live source of truth; every write goes through + // apply_view, which also pushes to the use_state for rendering. + let view_live = use_mut_ref(ViewState::default); + let apply_view: Rc = { + let view = view.clone(); + let view_live = view_live.clone(); + Rc::new(move |f: &dyn Fn(&mut ViewState)| { + let mut v = (*view_live.borrow()).clone(); + f(&mut v); + *view_live.borrow_mut() = v.clone(); + view.set(v); + }) + }; + 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); + let hover = use_state(|| Option::::None); + let vp = use_state(UiParams::default); + let img_size = use_state(|| (0u32, 0u32)); + let find_peak = use_state(|| Option::::None); + let show_hidden = use_state(|| false); + let peak_labels = use_state(|| true); + // collapsible control panel (desktop nav bar behaviour): open at + // start so the image picker is reachable even on phones; it + // collapses automatically once an image is loaded on a narrow screen + let nav_open = use_state(|| true); + // hill indices of the GPS track, in file order + let track = use_state(Vec::::new); + let track_width = use_state(|| 200.0f64); + let track_file_ref = use_node_ref(); + // optional alternative hill database (e.g. a regional list) + let db_file_ref = use_node_ref(); + // set once the user pans or zooms by hand; auto-fit is then suppressed + // until the next image load + let user_moved = use_mut_ref(|| false); + // view parameter overrides from the URL query string + let overrides = use_mut_ref(Overrides::default); + // original bytes + name of the loaded image, kept for "Save image" + // (the annotated JPEG is the source image plus a gipfel comment) + let orig = use_mut_ref(|| Option::<(Vec, String)>::None); + // EXIF metadata of the loaded image (camera name for profile matching) + let img_md = use_mut_ref(ImageMetaData::new); + // distortion profile store (localStorage, FLTK prefs format) + let profile_name = use_state(String::new); + let profiles = use_state(Vec::::new); + let profile_overwrite = use_mut_ref(|| 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). + // The live counter lives in a RefCell: a UseStateHandle cloned into + // these persistent closures would deref to its render-time snapshot + // and stall the bump after the first resize. + let tick_live = use_mut_ref(|| 0u32); + { + let tick = tick.clone(); + let live = tick_live.clone(); + use_effect_with((), move |_| { + let closure = Closure::wrap(Box::new(move || { + let v = { + let mut l = live.borrow_mut(); + *l += 1; + *l + }; + tick.set(v); + }) as Box); + let _ = bridge::window() + .add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref()); + // the listener is never removed (app lifetime); leak the closure + std::mem::forget(closure); + }); + } + + // 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 { + // aapt gunzips .gz assets, so an APK ships the plain + // gipfel.dat while the web dist ships gipfel.dat.gz + let raw = match bridge::fetch_bytes("gipfel.dat.gz").await { + Ok(gz) => gunzip(&gz)?, + Err(_) => bridge::fetch_bytes("gipfel.dat").await?, + }; + 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(); + let canvas_ref = canvas_ref.clone(); + let apply = apply_view.clone(); + Callback::from(move |_: MouseEvent| { + let Some(bmp) = bitmap.as_ref() else { return }; + let (cw, ch) = canvas_ref + .cast::() + .map(|c| (c.client_width() as f64, c.client_height() as f64)) + .unwrap_or((800.0, 600.0)); + let (iw, ih) = (bmp.width() as f64, bmp.height() as f64); + if iw <= 0.0 || ih <= 0.0 || cw <= 0.0 || ch <= 0.0 { + return; + } + let scale = (cw / iw).min(ch / ih); + apply(&move |v| { + v.scale = scale; + v.ox = (cw - iw * scale) / 2.0; + v.oy = (ch - ih * scale) / 2.0; + }); + }) + }; + + // Keep the fit correct even when layout was not ready at load time: + // a ResizeObserver fires once with the element's initial size right + // after it starts observing, then on every later resize (window + // resize, sidebar collapse, ...). Always bump the redraw tick so the + // canvas backing store tracks its CSS size — otherwise the browser + // stretches the stale bitmap — and additionally re-fit whenever the + // user has not panned or zoomed by hand since the last image load + // (this is also what makes the very first image appear). + { + let canvas_ref = canvas_ref.clone(); + let fit = fit.clone(); + let bitmap = bitmap.clone(); + let user_moved = user_moved.clone(); + let tick = tick.clone(); + use_effect_with((*bitmap).is_some(), move |has_image| { + let observer = if *has_image { + canvas_ref + .cast::() + .and_then(|c| { + let fit2 = fit.clone(); + let um = user_moved.clone(); + let tick2 = tick.clone(); + let live2 = tick_live.clone(); + let closure = wasm_bindgen::closure::Closure::wrap(Box::new( + move |_entries: js_sys::Array, _obs: web_sys::ResizeObserver| { + let v = { + let mut l = live2.borrow_mut(); + *l += 1; + *l + }; + tick2.set(v); + if !*um.borrow() { + fit2.emit(MouseEvent::new("fit").unwrap()); + } + }, + ) as Box); + let ro = + web_sys::ResizeObserver::new(closure.as_ref().unchecked_ref()).ok()?; + let _ = ro.observe(&c); + // the observer does not own the closure; keep both + // alive until this effect is torn down + Some((ro, closure)) + }) + } else { + None + }; + move || drop(observer) + }); + } + + // 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(); + let vp = vp.clone(); + let img_size = img_size.clone(); + Rc::new(move |mk: &[Marker]| { + if mk.is_empty() { + fit_info.set(String::new()); + return; + } + let info = { + let mut p = pan.borrow_mut(); + match markers::refit(&mut p, mk, *fit_distortion) { + Ok(()) => { + // push the fitted values into the slider state, + // otherwise Azimuth/Pitch/Roll/Focal keep showing + // the pre-fit numbers + let mut u = *vp; + u.az = p.get_center_angle().rem_euclid(360.0); + u.pitch = p.get_pitch_angle(); + u.roll = p.get_roll_angle(); + let w = img_size.0.max(1) as f64; + u.focal = (p.get_scale() * 36.0 / w).clamp(1.0, 300.0); + vp.set(u); + 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() + ) + } + Err(e) => format!("fit failed: {e}"), + } + }; + fit_info.set(info); + }) + }; + + // place a marker for a hill at an image position and refit + let mark_peak = { + let markers = markers.clone(); + let do_refit = do_refit.clone(); + Callback::from(move |(idx, ix, iy): (usize, f64, f64)| { + let mut mk = (*markers).clone(); + mk.retain(|m| m.hill != idx); + mk.push(Marker { hill: idx, x: ix, y: iy }); + do_refit(&mk); + markers.set(mk); + }) + }; + + // 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(); + let vp = vp.clone(); + let img_size = img_size.clone(); + let find_peak = find_peak.clone(); + let user_moved = user_moved.clone(); + let nav_open = nav_open.clone(); + let overrides = overrides.clone(); + let orig = orig.clone(); + let img_md = img_md.clone(); + let profile_name = profile_name.clone(); + let profiles = profiles.clone(); + Callback::from(move |(bytes, name): (Vec, String)| { + let (bitmap, status, fit, pan, markers, fit_info) = + (bitmap.clone(), status.clone(), fit.clone(), pan.clone(), markers.clone(), fit_info.clone()); + let vp = vp.clone(); + let img_size = img_size.clone(); + let find_peak = find_peak.clone(); + let user_moved = user_moved.clone(); + let nav_open = nav_open.clone(); + let overrides = overrides.clone(); + let orig = orig.clone(); + let img_md = img_md.clone(); + let profile_name = profile_name.clone(); + let profiles = profiles.clone(); + spawn_local(async move { + match bridge::decode_bitmap(&bytes).await { + Ok(bmp) => { + // narrow screens: give the canvas the room once + // the setup phase is over + let narrow = bridge::window() + .inner_width() + .ok() + .and_then(|w| w.as_f64()) + .unwrap_or(1200.0) + < 900.0; + if narrow { + nav_open.set(false); + } + 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); + // explicit URL parameters win over the metadata, + // e.g. /?file=img.jpg&pitch=-20 for a photo whose + // EXIF lacks (or fakes) the camera orientation + { + let ov = *overrides.borrow(); + let mut p = pan.borrow_mut(); + if let Some(v) = ov.az { + p.set_center_angle(v); + } + if let Some(v) = ov.pitch { + p.set_pitch_angle(v); + } + if let Some(v) = ov.roll { + p.set_roll_angle(v); + } + if let Some(v) = ov.focal { + p.set_scale(v * w.max(h) as f64 / 36.0); + } + if let Some(v) = ov.vis { + // same mapping as the Visibility slider + p.set_height_dist_ratio((0.11 - v).clamp(0.01, 0.1)); + } + } + // keep the source bytes and EXIF for "Save image" + *orig.borrow_mut() = Some((bytes.clone(), name.clone())); + *img_md.borrow_mut() = md.clone(); + // distortion profile: prefill the name field with + // the camera/focal auto-match and apply it when a + // stored profile of that name exists (desktop does + // the same on image load) + { + let auto = gipfel_core::metadata::distortion_profile_name(&md); + profile_name.set(auto.clone().unwrap_or_default()); + let all = load_prefs(); + profiles.set(all.iter().map(|(n, _)| n.clone()).collect()); + if let Some(n) = &auto { + if let Some((_, pr)) = all.iter().find(|(m, _)| m == n) { + pan.borrow_mut().set_distortion_params(pr.k0, pr.k1, pr.x0); + } + } + } + let vis = pan.borrow().visible.len(); + let u = { + let p = pan.borrow(); + UiParams { + lat: p.get_view_lat(), + lon: p.get_view_long(), + height: p.get_view_height(), + az: p.get_center_angle().rem_euclid(360.0), + focal: (p.get_scale() * 36.0 / w as f64).clamp(1.0, 300.0), + pitch: p.get_pitch_angle(), + roll: p.get_roll_angle(), + vis: (0.11 - p.height_dist_ratio).clamp(0.01, 0.1), + label_font: vp.label_font, + } + }; + vp.set(u); + img_size.set((w, h)); + 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()); + find_peak.set(None); + *user_moved.borrow_mut() = false; + bitmap.set(Some(bmp)); + fit.emit(MouseEvent::new("fit").unwrap()); + // same nudge as the desktop app: re-fit shortly + // after the first paint so the image is guaranteed + // to appear even if layout was not ready yet + { + let fit = fit.clone(); + spawn_local(async move { + let _ = wasm_bindgen_futures::JsFuture::from( + bridge::delay_promise(120), + ) + .await; + fit.emit(MouseEvent::new("fit").unwrap()); + }); + } + } + Err(e) => status.set(format!("Failed to load {name}: {e}")), + } + }); + }) + }; + + // Auto-load an image given as ?file= so a photo can + // be opened by URL alone, e.g. /?file=test.jpg. It goes through the + // normal load pipeline, so EXIF viewpoint/focal metadata is applied + // exactly as for a picked file. + { + let load_bytes = load_bytes.clone(); + let status = status.clone(); + let overrides = overrides.clone(); + use_effect_with((), move |_| { + let Some(path) = url_param("file") else { return }; + if path.is_empty() || path.starts_with("http") || path.contains(":/") { + status.set("?file= must be a same-origin path".to_string()); + return; + } + let name = path.rsplit('/').next().unwrap_or(&path).to_string(); + *overrides.borrow_mut() = Overrides { + az: url_param("az").and_then(|s| s.parse().ok()), + pitch: url_param("pitch").and_then(|s| s.parse().ok()), + roll: url_param("roll").and_then(|s| s.parse().ok()), + focal: url_param("focal").and_then(|s| s.parse().ok()), + vis: url_param("vis").and_then(|s| s.parse().ok()), + }; + let (load_bytes, status) = (load_bytes.clone(), status.clone()); + let path2 = path.clone(); + spawn_local(async move { + match bridge::fetch_bytes(&path).await { + Ok(bytes) => load_bytes.emit((bytes, name)), + Err(e) => status.set(format!("Could not fetch {path2}: {e}")), + } + }); + }); + } + + let read_file = { + let load_bytes = load_bytes.clone(); + let status = status.clone(); + Rc::new(move |file: web_sys::File| { + let (load_bytes, status) = (load_bytes.clone(), status.clone()); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => load_bytes.emit((bytes, name)), + Err(e) => status.set(format!("Failed to read {name}: {e}")), + } + }); + }) + }; + + let on_file_change = { + let read_file = read_file.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Some(file) = input.files().and_then(|fl| fl.item(0)) { + read_file(file); + } + }) + }; + + let on_drop = { + let read_file = read_file.clone(); + 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)) + { + Some(file) => read_file(file), + None => status.set("Dropped item was not a file.".to_string()), + } + }) + }; + let on_dragover = Callback::from(|e: DragEvent| e.prevent_default()); + + let open_picker = { + let file_ref = file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = file_ref.cast::() { + input.click(); + } + }) + }; + + let open_track_picker = { + let track_file_ref = track_file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = track_file_ref.cast::() { + input.click(); + } + }) + }; + + let open_db_picker = { + let db_file_ref = db_file_ref.clone(); + Callback::from(move |_: MouseEvent| { + if let Some(input) = db_file_ref.cast::() { + input.click(); + } + }) + }; + + // replace the hill database at runtime (e.g. everest.dat for the + // Khumbu); markers and track reference hill indices and are dropped + let on_db_file_change = { + let pan = pan.clone(); + let db_status = db_status.clone(); + let markers = markers.clone(); + let track = track.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + let Some(file) = input.files().and_then(|f| f.item(0)) else { + return; + }; + let (pan, db_status, markers, track) = ( + pan.clone(), + db_status.clone(), + markers.clone(), + track.clone(), + ); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => { + // accept plain .dat and gzipped variants + let raw = match bytes.first() { + Some(0x1f) if bytes.get(1) == Some(&0x8b) => match gunzip(&bytes) { + Ok(r) => r, + Err(err) => { + db_status.set(format!("gunzip failed: {err}")); + return; + } + }, + _ => bytes, + }; + // NOTE: the borrow must end before the match arm, + // which calls pan.borrow() itself (nested borrow + // would panic and trap the whole wasm module) + let res = pan.borrow_mut().load_data_from_bytes(&raw); + match res { + Ok(()) => { + markers.set(Vec::new()); + track.set(Vec::new()); + let n = pan.borrow().hills.len(); + db_status.set(format!("Hill database {name}: {n} peaks")); + } + Err(err) => db_status.set(format!("Database failed: {err}")), + } + } + Err(err) => db_status.set(format!("Failed to read {name}: {err}")), + } + }); + input.set_value(""); // allow re-selecting the same file + }) + }; + + // parse a GPX file and swap it into the panorama as track-point hills + // (always appended last, so marker hill indices never shift) + let on_track_file_change = { + let pan = pan.clone(); + let track = track.clone(); + let status = status.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + let Some(file) = input.files().and_then(|f| f.item(0)) else { + return; + }; + let (pan, track, status) = (pan.clone(), track.clone(), status.clone()); + let name = file.name(); + spawn_local(async move { + match bridge::read_blob(&file).await { + Ok(bytes) => match gpx::load_gpx_from_bytes(&bytes, 2000) { + Ok(hills) => { + let n = hills.len(); + { + let p = &mut *pan.borrow_mut(); + p.remove_hills(FLAG_TRACK_POINT); + p.add_hills(&hills); + track.set((p.hills.len() - n..p.hills.len()).collect()); + } + status.set(format!("Track {name}: {n} points")); + } + Err(err) => status.set(format!("GPX failed: {err}")), + }, + Err(err) => status.set(format!("Failed to read {name}: {err}")), + } + }); + input.set_value(""); // allow re-selecting the same file + }) + }; + + // "Save image": re-encode the original JPEG with the current fit as + // gipfel comment (same bytes + format as the desktop app writes), + // delivered as a browser download. + let on_save_image = { + let orig = orig.clone(); + let img_md = img_md.clone(); + let pan = pan.clone(); + let img_size = img_size.clone(); + let status = status.clone(); + Callback::from(move |_: MouseEvent| { + let Some((bytes, name)) = orig.borrow().clone() else { + status.set("No image loaded.".to_string()); + return; + }; + // mirror of the desktop md_from_state; the comment keeps the + // historical scale * 35 / max(w,h) focal encoding so saved + // files stay interchangeable with the desktop versions + let mut out = ImageMetaData::new(); + { + let m = img_md.borrow(); + out.manufacturer = m.manufacturer.clone(); + out.model = m.model.clone(); + } + { + let p = pan.borrow(); + out.longitude = p.get_view_long(); + out.latitude = p.get_view_lat(); + out.height = p.get_view_height(); + out.direction = p.get_center_angle(); + out.pitch = p.get_pitch_angle(); + out.roll = p.get_roll_angle(); + out.focal_length_35mm = + p.get_scale() * 35.0 / (img_size.0.max(img_size.1) as f64).max(1.0); + out.projection_type = p.projection_type as i32; + out.k0 = p.parms.k0; + out.k1 = p.parms.k1; + out.x0 = p.parms.x0; + } + match out.save_image_to_bytes(&bytes) { + Ok(jpg) => { + let stem = name + .rsplit_once('.') + .map(|(s, _)| s.to_string()) + .unwrap_or_else(|| name.clone()); + let outname = format!("{stem}-gipfel.jpg"); + match bridge::download(&outname, &jpg, "image/jpeg") { + Ok(()) => status.set(format!("Saved {outname} (browser download).")), + Err(e) => status.set(format!("Download failed: {e}")), + } + } + Err(e) => status.set(format!("Save failed: {e} (input must be JPEG)")), + } + }) + }; + + // distortion profiles: localStorage store in FLTK prefs format + let refresh_profiles = { + let profiles = profiles.clone(); + Rc::new(move || { + profiles.set(load_prefs().into_iter().map(|(n, _)| n).collect()) + }) + }; + let apply_profile = { + let pan = pan.clone(); + let status = status.clone(); + Rc::new(move |name: &str| { + match load_prefs().into_iter().find(|(n, _)| n == name) { + Some((_, p)) => { + pan.borrow_mut().set_distortion_params(p.k0, p.k1, p.x0); + status.set(format!("Loaded distortion profile '{name}'.")); + } + None => status.set(format!("Profile '{name}' not found.")), + } + }) + }; + let on_profile_name = { + let profile_name = profile_name.clone(); + let profile_overwrite = profile_overwrite.clone(); + Callback::from(move |e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + profile_name.set(input.value()); + *profile_overwrite.borrow_mut() = false; + }) + }; + let on_profile_save = { + let profile_name = profile_name.clone(); + let pan = pan.clone(); + let status = status.clone(); + let profile_overwrite = profile_overwrite.clone(); + let refresh = refresh_profiles.clone(); + Callback::from(move |_: MouseEvent| { + let name = profile_name.trim().to_string(); + if name.is_empty() { + status.set("Enter a profile name.".into()); + return; + } + if let Err(e) = gipfel_core::profile::sanitize_name(&name) { + status.set(format!("Invalid profile name: {e}")); + return; + } + let prof = { + let p = pan.borrow(); + gipfel_core::profile::Profile { + k0: p.parms.k0, + k1: p.parms.k1, + x0: p.parms.x0, + } + }; + let mut all = load_prefs(); + let exists = all.iter().any(|(n, _)| *n == name); + if exists && !*profile_overwrite.borrow() { + *profile_overwrite.borrow_mut() = true; + status.set(format!("Profile '{name}' exists — press Save again to overwrite.")); + return; + } + all.retain(|(n, _)| *n != name); + all.push((name.clone(), prof)); + match save_prefs(&all) { + Ok(()) => { + *profile_overwrite.borrow_mut() = false; + refresh(); + status.set(format!("Saved distortion profile '{name}'.")); + } + Err(e) => status.set(format!("Profile save failed: {e}")), + } + }) + }; + let on_profile_load = { + let profile_name = profile_name.clone(); + let apply = apply_profile.clone(); + Callback::from(move |_: MouseEvent| apply(profile_name.trim())) + }; + let on_profile_select = { + let profile_name = profile_name.clone(); + let apply = apply_profile.clone(); + Callback::from(move |e: Event| { + let sel: web_sys::HtmlSelectElement = e.target_unchecked_into(); + let name = sel.value(); + profile_name.set(name.clone()); + apply(&name); + }) + }; + + 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); + }) + }; + + // sidebar parameter editing: update UI state and apply to the panorama + macro_rules! param_cb { + ($field:ident, $apply:expr) => {{ + let vp = vp.clone(); + let pan = pan.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.$field = v; + vp.set(u); + let f: &dyn Fn(&mut Panorama, f64) = &$apply; + f(&mut pan.borrow_mut(), v); + }) + }}; + } + let on_lat = param_cb!(lat, |p: &mut Panorama, v| p.set_view_lat(v)); + let on_lon = param_cb!(lon, |p, v| p.set_view_long(v)); + let on_height = param_cb!(height, |p, v| p.set_view_height(v)); + // GPS paste field: "47.676,13.32042" — the format gallery apps show + // for coordinates; height stays a separate field + let on_gps = { + let vp = vp.clone(); + let pan = pan.clone(); + let status = status.clone(); + Callback::from(move |text: String| { + let parts: Vec = text + .replace([';', ' '], ",") + .split(',') + .filter(|p| !p.trim().is_empty()) + .filter_map(|p| p.trim().parse::().ok()) + .collect(); + if parts.len() < 2 || parts[0].abs() > 90.0 || parts[1].abs() > 180.0 { + status.set("GPS: expected \"lat,lon\" like 47.676,13.32042".to_string()); + return; + } + let mut u = *vp; + u.lat = parts[0]; + u.lon = parts[1]; + let mut p = pan.borrow_mut(); + p.set_view_lat(parts[0]); + p.set_view_long(parts[1]); + vp.set(u); + status.set(format!("Viewpoint: {:.5}, {:.5}", parts[0], parts[1])); + }) + }; + let on_az = param_cb!(az, |p, v| p.set_center_angle(v)); + let on_pitch = param_cb!(pitch, |p, v| p.set_pitch_angle(v)); + let on_roll = param_cb!(roll, |p, v| p.set_roll_angle(v)); + let on_vis = param_cb!(vis, |p, v| p.set_height_dist_ratio(0.11 - v)); + let on_focal = { + let vp = vp.clone(); + let pan = pan.clone(); + let img_size = img_size.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.focal = v; + vp.set(u); + let w = img_size.0 as f64; + if w > 0.0 { + pan.borrow_mut().set_scale(v * w / 36.0); + } + }) + }; + let on_font = { + let vp = vp.clone(); + Callback::from(move |v: f64| { + let mut u = *vp; + u.label_font = v as f32; + vp.set(u); + }) + }; + let on_show_hidden = { + let show_hidden = show_hidden.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + show_hidden.set(input.checked()); + }) + }; + let on_peak_labels = { + let peak_labels = peak_labels.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + peak_labels.set(input.checked()); + }) + }; + let on_track_width = { + let track_width = track_width.clone(); + Callback::from(move |v: f64| track_width.set(v)) + }; + + // compass strip: shares the image transform, drag changes azimuth + let compass_data = { + let p = pan.borrow(); + CompassData { + ptype: p.projection_type, + parms: p.parms, + center_deg: p.get_center_angle(), + zoom: view.scale, + cx: view.ox + img_size.0 as f64 * view.scale / 2.0, + max_view_angle: p.max_view_angle, + } + }; + let compass_change = { + let pan = pan.clone(); + let vp = vp.clone(); + Callback::from(move |deg: f64| { + pan.borrow_mut().set_center_angle(deg); + let mut u = *vp; + u.az = deg.rem_euclid(360.0); + vp.set(u); + }) + }; + + let fp_close = { + let find_peak = find_peak.clone(); + Callback::from(move |_: ()| find_peak.set(None)) + }; + + // Find Peak picker: searchable list over the geographically close hills + // (same candidate set and filtering as the desktop dialog) + let findpeak_popup = if let Some(fp) = &*find_peak { + let items: Vec<(String, usize)> = { + let p = pan.borrow(); + let q = fp.query.to_uppercase(); + let mut entries: Vec<(String, usize)> = p + .close + .iter() + .filter(|&&i| { + let h = &p.hills[i]; + h.flags & (FLAG_DUPLIC | FLAG_TRACK_POINT) == 0 + && (q.is_empty() || h.name.to_uppercase().contains(&q)) + }) + .map(|&i| { + ( + format!("{} ({} m)", p.hills[i].name, p.hills[i].height as i64), + i, + ) + }) + .collect(); + entries.sort_by(|a, b| a.0.cmp(&b.0)); + entries.truncate(300); + entries + }; + let on_pick = { + let mark = mark_peak.clone(); + let find_peak = find_peak.clone(); + let (ix, iy) = (fp.ix, fp.iy); + Callback::from(move |hill: usize| { + mark.emit((hill, ix, iy)); + find_peak.set(None); + }) + }; + let on_query = { + let find_peak = find_peak.clone(); + Callback::from(move |q: String| { + if let Some(mut fp) = (*find_peak).clone() { + fp.query = q; + find_peak.set(Some(fp)); + } + }) + }; + html! { + + } + } else { + Html::default() + }; + + let callbacks = ViewCallbacks { + pan: { + let apply = apply_view.clone(); + let user_moved = user_moved.clone(); + Callback::from(move |(dx, dy): (f64, f64)| { + *user_moved.borrow_mut() = true; + apply(&move |v| { + v.ox += dx; + v.oy += dy; + }); + }) + }, + zoom: { + let apply = apply_view.clone(); + let user_moved = user_moved.clone(); + Callback::from(move |(cx, cy, factor): (f64, f64, f64)| { + *user_moved.borrow_mut() = true; + apply(&move |v| { + let ns = (v.scale * factor).clamp(0.02, 64.0); + let k = ns / v.scale; + v.ox = cx - (cx - v.ox) * k; + v.oy = cy - (cy - v.oy) * k; + v.scale = ns; + }); + }) + }, + pinch: { + let apply = apply_view.clone(); + let user_moved = user_moved.clone(); + Callback::from(move |(cx, cy, factor, dx, dy): (f64, f64, f64, f64, f64)| { + *user_moved.borrow_mut() = true; + // zoom and pan in ONE update: two separate updates would + // each start from the same stale snapshot and clobber + apply(&move |v| { + let ns = (v.scale * factor).clamp(0.02, 64.0); + let k = ns / v.scale; + v.ox = cx - (cx - v.ox) * k + dx; + v.oy = cy - (cy - v.oy) * k + dy; + v.scale = ns; + }); + }) + }, + click: { + let pan = pan.clone(); + let view = view.clone(); + let mark = mark_peak.clone(); + let find_peak = find_peak.clone(); + let img_size = img_size.clone(); + let show_hidden = show_hidden.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let scale = view.scale; + // unambiguous click right on a peak: mark directly + // (borrow must be released before mark -> do_refit!) + let near = { + let p = pan.borrow(); + markers::nearest_hill(&p, ix, iy, 10.0 / scale, *show_hidden) + }; + if let Some(idx) = near { + find_peak.set(None); + mark.emit((idx, ix, iy)); + return; + } + // otherwise open the Find Peak picker (searchable, like the + // desktop dialog): the correct peak may project far away + // while the viewpoint is still rough + let (w, h) = (img_size.0 as f64, img_size.1 as f64); + find_peak.set(Some(FindPeak { + sx: (ix + w / 2.0) * scale + view.ox, + sy: (iy + h / 2.0) * scale + view.oy, + ix, + iy, + query: String::new(), + })); + }) + }, + 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()); + } + }) + }, + hover: { + let pan = pan.clone(); + let view = view.clone(); + let hover = hover.clone(); + let show_hidden = show_hidden.clone(); + Callback::from(move |(ix, iy): (f64, f64)| { + let p = pan.borrow(); + let name = markers::nearest_hill(&p, ix, iy, 20.0 / view.scale, *show_hidden) + .map(|i| { + let h = &p.hills[i]; + format!( + "{} · {:.0} m · distance {:.2} km", + h.name, + h.height, + p.get_real_distance(i) / 1000.0 + ) + }); + hover.set(name); + }) + }, + hover_end: { + let hover = hover.clone(); + Callback::from(move |_: ()| hover.set(None)) + }, + }; + + // Lens FOV visibility limit, port of the desktop bump(): the angle at + // which the (possibly distorted) projection reaches the image edge. + // Peaks beyond it cannot be inside the photo even if the fitted + // distortion folds their projection back into the image. Running this + // every render is idempotent and cheap; visibility is only rebuilt + // when the limit actually changed. + { + let mut p = pan.borrow_mut(); + let limit = if img_size.0 > 0 { + let c = p.parms.a_center; + let proj = gipfel_core::projection::projection_from_type(p.projection_type); + let a_edge = alph_at_img_x(p.projection_type, &*proj, &p.parms, img_size.0 as f64 / 2.0, c); + (a_edge - c).abs() + } else { + 0.0 + }; + if (limit - p.max_view_angle).abs() > 1e-9 { + p.max_view_angle = limit; + let known: Vec = markers.iter().map(|m| m.hill).collect(); + p.update_visible_mountains(Some(&known)); + } + } + + // overlay data for the canvas + let marker_views: Vec = { + let p = pan.borrow(); + markers + .iter() + .map(|m| MarkerView { + hill: m.hill, + x: m.x, + y: m.y, + name: p.hills[m.hill].name.clone(), + }) + .collect() + }; + let candidates: Vec = { + let p = pan.borrow(); + let marked: Vec = markers.iter().map(|m| m.hill).collect(); + p.visible + .iter() + .filter(|&&i| { + p.hills[i].flags & (FLAG_DUPLIC | FLAG_TRACK_POINT) == 0 + && (*show_hidden || p.hills[i].flags & FLAG_HIDDEN == 0) + }) + .map(|&i| DotView { + x: p.hills[i].x, + y: p.hills[i].y, + hidden: p.hills[i].flags & FLAG_HIDDEN != 0, + marked: marked.contains(&i), + name: p.hills[i].name.clone(), + }) + .collect() + }; + let track_views: Vec = { + let p = pan.borrow(); + track + .iter() + .filter(|&&i| p.hills[i].flags & FLAG_VISIBLE != 0) + .map(|&i| { + let h = &p.hills[i]; + // C: scale * track_width / (dist_m * 10), distance in meters + let dist_m = p.get_real_distance(i).max(1.0); + TrackView { + x: h.x, + y: h.y, + hidden: h.flags & FLAG_HIDDEN != 0, + width: (p.get_scale() * *track_width / (dist_m * 10.0)).clamp(1.0, 1000.0), + } + }) + .collect() + }; + + let collapse_cb = { + let nav_open = nav_open.clone(); + Callback::from(move |_: MouseEvent| nav_open.set(false)) + }; + let expand_cb = { + let nav_open = nav_open.clone(); + Callback::from(move |_: MouseEvent| nav_open.set(true)) + }; + + let zoom_pct = (view.scale * 100.0).round(); + let n_markers = markers.len(); + + html! { +
+ +
+
+ if !*nav_open { + + } +
{ (*status).clone() }
+ + { findpeak_popup.clone() } +
+ if bitmap.is_some() { + + } +
+
+ } +} diff --git a/crates/gipfel/src/bridge.rs b/crates/gipfel/src/bridge.rs new file mode 100644 index 0000000..2a23c46 --- /dev/null +++ b/crates/gipfel/src/bridge.rs @@ -0,0 +1,119 @@ +//! Small JS helpers: window access, browser-native image decode, blob +//! reads, canvas context — the hand-written JS boundary of the app. + +use js_sys::Uint8Array; +use wasm_bindgen::JsCast; +use wasm_bindgen_futures::JsFuture; +use web_sys::{Blob, CanvasRenderingContext2d, HtmlCanvasElement, ImageBitmap, Window}; + +pub fn window() -> Window { + web_sys::window().expect("no global window") +} + +/// Decode image bytes into a browser-native (GPU-backed) bitmap. +/// The browser does the JPEG decode and keeps the pixels where canvas +/// blitting is fast — cheaper than any pure-Rust path in wasm. +pub async fn decode_bitmap(bytes: &[u8]) -> Result { + let array = js_sys::Array::new(); + array.push(&Uint8Array::from(bytes).buffer()); + let blob = Blob::new_with_u8_array_sequence(&array).map_err(|_| "blob failed".to_string())?; + let promise = window() + .create_image_bitmap_with_blob(&blob) + .map_err(|_| "createImageBitmap failed".to_string())?; + let value = JsFuture::from(promise) + .await + .map_err(|e| format!("decode failed: {e:?}"))?; + value + .dyn_into::() + .map_err(|_| "decode produced non-bitmap".to_string()) +} + +/// Read a File/Blob fully into memory. +pub async fn read_blob(blob: &Blob) -> Result, String> { + let buf = JsFuture::from(blob.array_buffer()) + .await + .map_err(|e| format!("read failed: {e:?}"))?; + Ok(Uint8Array::new(&buf).to_vec()) +} + +/// Offer `bytes` as a browser download under the given file name. +pub fn download(filename: &str, bytes: &[u8], mime: &str) -> Result<(), String> { + let array = js_sys::Array::new(); + array.push(&Uint8Array::from(bytes).buffer()); + let opts = web_sys::BlobPropertyBag::new(); + opts.set_type(mime); + let blob = Blob::new_with_u8_array_sequence_and_options(&array, &opts) + .map_err(|_| "blob failed".to_string())?; + let url = web_sys::Url::create_object_url_with_blob(&blob) + .map_err(|_| "object url failed".to_string())?; + let doc = window().document().ok_or("no document")?; + let a = doc.create_element("a").map_err(|_| "no anchor".to_string())?; + a.set_attribute("href", &url).map_err(|_| "href".to_string())?; + a.set_attribute("download", filename).map_err(|_| "download".to_string())?; + if let Ok(el) = a.dyn_into::() { + el.click(); + } + let _ = web_sys::Url::revoke_object_url(&url); + Ok(()) +} + +/// localStorage read (None when unavailable or unset). +pub fn store_get(key: &str) -> Option { + let store = window().local_storage().ok()??; + store.get_item(key).ok().flatten() +} + +/// localStorage write. +pub fn store_set(key: &str, value: &str) -> Result<(), String> { + let store = window() + .local_storage() + .map_err(|_| "no localStorage")? + .ok_or("no localStorage")?; + store + .set_item(key, value) + .map_err(|_| "localStorage denied or full".to_string()) +} + +/// Fetch a URL (same-origin) into memory. +pub async fn fetch_bytes(url: &str) -> Result, 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()) +} + +/// setTimeout as an awaitable Promise. +pub fn delay_promise(ms: i32) -> js_sys::Promise { + js_sys::Promise::new(&mut |resolve, _reject| { + let _ = window().set_timeout_with_callback_and_timeout_and_arguments_0(&resolve, ms); + }) +} + +pub fn ctx2d(canvas: &HtmlCanvasElement) -> Option { + canvas + .get_context("2d") + .ok() + .flatten() + .and_then(|c| c.dyn_into::().ok()) +} + +/// Read a CSS custom property from :root (follows the active +/// prefers-color-scheme), with a fallback when unavailable. +pub fn css_var(name: &str, fallback: &str) -> String { + window() + .document() + .and_then(|d| window().get_computed_style(&d.document_element()?).ok().flatten()) + .and_then(|s| s.get_property_value(name).ok()) + .map(|v| v.trim().to_string()) + .filter(|v| !v.is_empty()) + .unwrap_or_else(|| fallback.to_string()) +} diff --git a/crates/gipfel/src/canvas_view.rs b/crates/gipfel/src/canvas_view.rs new file mode 100644 index 0000000..df46b5c --- /dev/null +++ b/crates/gipfel/src/canvas_view.rs @@ -0,0 +1,686 @@ +//! Viewport canvas: browser-native bitmap blitted with a pan/zoom +//! transform, plus the marker overlay and its interactions. + +use web_sys::{HtmlCanvasElement, ImageBitmap, MouseEvent, PointerEvent, WheelEvent}; +use yew::prelude::*; + +use crate::bridge; + +/// Image -> screen transform: `screen = img * scale + (ox, oy)`. +/// Same convention as the desktop viewport widget. +#[derive(Clone, Debug, PartialEq, Default)] +pub struct ViewState { + pub scale: f64, + pub ox: f64, + pub oy: f64, +} + +/// A marker in center-relative image coordinates. +#[derive(Clone, Debug, PartialEq)] +pub struct MarkerView { + pub hill: usize, + pub x: f64, + pub y: f64, + pub name: String, +} + +/// A visible (unmarked or marked) peak drawn as a guide dot. +#[derive(Clone, Debug, PartialEq)] +pub struct DotView { + pub x: f64, + pub y: f64, + /// hidden by nearer terrain (drawn grey) + pub hidden: bool, + /// already carries a user marker (no duplicate label) + pub marked: bool, + pub name: String, +} + +/// One GPS track point in center-relative image coordinates; `width` is +/// the projected stroke width in image pixels (C: scale*width/(dist_m*10)). +#[derive(Clone, Debug, PartialEq)] +pub struct TrackView { + pub x: f64, + pub y: f64, + pub hidden: bool, + pub width: f64, +} + +#[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)>, + /// pointer moved over the image (not dragging): (x, y) center-relative + pub hover: Callback<(f64, f64)>, + /// pointer left the canvas + pub hover_end: Callback<()>, + /// two-finger pinch: (center x, center y, factor, pan dx, pan dy). + /// Zoom and pan must land in ONE state update: two consecutive + /// read-modify-writes clobber each other, because a UseStateHandle + /// cloned into a callback derefs to its render-time snapshot. + pub pinch: Callback<(f64, f64, f64, f64, f64)>, +} + +#[derive(Properties, PartialEq)] +pub struct Props { + pub bitmap: Option, + pub view: ViewState, + pub callbacks: ViewCallbacks, + pub canvas_ref: NodeRef, + /// bumped on window resize to force a redraw + pub tick: u32, + pub markers: Vec, + /// GPS track points in file order + pub track: Vec, + /// guide dots for all visible hills + pub candidates: Vec, + /// draw name labels for unmarked visible peaks too + pub peak_labels: bool, + /// marker label font size, screen px + pub label_font: f32, +} + +#[derive(Clone, PartialEq)] +enum DragMode { + Pan, + Marker(usize), +} + +#[derive(PartialEq)] +struct DragState { + mode: Option, + last: (f64, f64), + start: (f64, f64), + moved: bool, + /// all active pointers (id, client position); >1 while pinching + pts: Vec<(i32, (f64, f64))>, + /// pinch geometry: (distance, center x, center y), canvas-relative + pinch: Option<(f64, f64, f64)>, +} + +#[function_component(CanvasView)] +pub fn canvas_view(props: &Props) -> Html { + let drag = use_mut_ref(|| DragState { + mode: None, + last: (0.0, 0.0), + start: (0.0, 0.0), + moved: false, + pts: Vec::new(), + pinch: None, + }); + // 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(); + let markers = props.markers.clone(); + let track = props.track.clone(); + let candidates = props.candidates.clone(); + let label_font = props.label_font; + let peak_labels = props.peak_labels; + use_effect_with( + ( + bitmap, + view, + props.tick, + markers.clone(), + track.clone(), + candidates.clone(), + label_font, + peak_labels, + ), + move |(bitmap, view, _tick, markers, track, candidates, label_font, peak_labels)| { + let Some(canvas) = canvas_ref.cast::() 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); + // transparent clear: the CSS background of .canvaswrap + // (a theme variable) shows through + ctx.clear_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, + 0.0, + dpr * view.scale, + dpr * view.ox, + 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; + + // GPS track: consecutive points joined with round-cap + // strokes scaled by distance (desktop parity: red, or + // blue where the point is hidden by terrain) + for w in track.windows(2) { + let (a, b) = (&w[0], &w[1]); + let color = if a.hidden { "rgb(51, 102, 255)" } else { "rgb(255, 51, 51)" }; + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str(color)); + ctx.set_line_width((a.width * view.scale).max(1.0)); + ctx.set_line_cap("round"); + ctx.begin_path(); + ctx.move_to(sx(a.x), sy(a.y)); + ctx.line_to(sx(b.x), sy(b.y)); + ctx.stroke(); + } + ctx.set_line_cap("butt"); + + // guide dots for all visible peaks: dark outline ring + + // bright core so they stay visible on any photo content; + // peaks hidden by nearer terrain are drawn grey + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); + for d in candidates.iter() { + let (px, py) = (sx(d.x), sy(d.y)); + if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { + continue; + } + ctx.begin_path(); + let _ = ctx.arc(px, py, 4.5, 0.0, std::f64::consts::TAU); + ctx.fill(); + } + for d in candidates.iter() { + let (px, py) = (sx(d.x), sy(d.y)); + if px < -6.0 || py < -6.0 || px > cw + 6.0 || py > ch + 6.0 { + continue; + } + let color = if d.hidden { "rgb(150, 150, 150)" } else { "rgb(110, 231, 183)" }; + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(color)); + ctx.begin_path(); + let _ = ctx.arc(px, py, 2.5, 0.0, std::f64::consts::TAU); + ctx.fill(); + } + + // labels: markers always; unmarked visible peaks when + // peak_labels is on. One combined collision-avoiding + // layout pass sorted by screen x (port of the desktop + // viewport drawing). + if !markers.is_empty() || *peak_labels { + let label_font = *label_font; + let line_h = label_font * 1.3 + 2.0; + ctx.set_font(&format!("{label_font:.0}px system-ui, sans-serif")); + + struct Item { + x: f64, + y: f64, + name: String, + marker: bool, + } + let mut items: Vec = markers + .iter() + .map(|m| Item { + x: m.x, + y: m.y, + name: m.name.clone(), + marker: true, + }) + .collect(); + if *peak_labels { + for d in candidates.iter() { + if d.hidden || d.marked || d.name.is_empty() { + continue; + } + items.push(Item { + x: d.x, + y: d.y, + name: d.name.clone(), + marker: false, + }); + } + } + + // layout runs in screen space, sorted by x + // descending (right to left): the desktop processes + // hills in alpha-descending order, which puts the + // leftmost peak on top of a collision stack + let mut order: Vec = (0..items.len()) + .filter(|&i| { + items[i].x.abs() * 2.0 <= bitmap.width() as f64 + && items[i].y.abs() * 2.0 <= bitmap.height() as f64 + }) + .collect(); + order.sort_by(|&a, &b| sx(items[b].x).total_cmp(&sx(items[a].x))); + let xs: Vec = order.iter().map(|&i| sx(items[i].x) as f32).collect(); + let ys: Vec = order.iter().map(|&i| sy(items[i].y) as f32).collect(); + let widths: Vec = order + .iter() + .map(|&i| { + ctx.measure_text(&items[i].name) + .map(|m| m.width() as f32) + .unwrap_or_else(|_| items[i].name.len() as f32 * 7.0) + }) + .collect(); + let in_img = vec![true; order.len()]; + let entries = layout_label_y(&xs, &ys, &widths, &in_img, line_h); + + // leaders: vertical + horizontal line connecting each + // label to its peak (C++ draws these for every + // labeled peak); markers yellow with a small cross, + // unmarked peaks a muted pale green + ctx.set_line_width(1.0); + for (k, &i) in order.iter().enumerate() { + let (px, py) = (sx(items[i].x), sy(items[i].y)); + let (lx, ly) = entries[k]; + let label_line = py + ly as f64 - line_h as f64; + let color = if items[i].marker { + "rgb(255, 230, 51)" + } else { + "rgba(196, 240, 214, 0.75)" + }; + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str(color)); + ctx.begin_path(); + if items[i].marker { + ctx.move_to(px - 4.0, py); + ctx.line_to(px + 4.0, py); + } + ctx.move_to(px, py); + ctx.line_to(px, label_line); + ctx.move_to(px, label_line); + ctx.line_to(px + lx as f64, label_line); + ctx.stroke(); + } + // marker crosses (always red) + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str("rgb(255, 64, 64)")); + ctx.set_line_width(1.5); + for &i in &order { + if !items[i].marker { + continue; + } + let (px, py) = (sx(items[i].x), sy(items[i].y)); + 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(); + } + // labels: white on dark shadow, right-aligned at the + // leader end (markers) or just right of the dot + for (k, &i) in order.iter().enumerate() { + if items[i].name.is_empty() { + continue; + } + let (px, py) = (sx(items[i].x), sy(items[i].y)); + let (lx, ly) = entries[k]; + let label_line = py + ly as f64 - line_h as f64; + let tx = px + lx as f64 - widths[k] as f64; + let ty = label_line - 3.0; + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str("rgba(0, 0, 0, 0.85)")); + ctx.fill_text(&items[i].name, tx + 1.0, ty + 1.0).ok(); + let color = if items[i].marker { "white" } else { "rgb(196, 240, 214)" }; + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(color)); + ctx.fill_text(&items[i].name, tx, ty).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::() + .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 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(); + let rect = canvas_ref + .cast::() + .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 n = { + let mut d = drag.borrow_mut(); + d.pts.retain(|(id, _)| *id != e.pointer_id()); + d.pts.push((e.pointer_id(), pos)); + let n = d.pts.len(); + if n >= 2 { + // second finger: switch to pinch, cancel any pan/marker + // drag so the view does not jump + d.mode = None; + d.pinch = None; + d.moved = true; + } else { + d.mode = Some(mode); + d.last = pos; + d.start = pos; + d.moved = false; + } + n + }; + // capture only the primary pointer; capturing every finger + // confuses some mobile browsers + if n == 1 { + if let Some(c) = canvas_ref.cast::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } + } + }) + }; + + let on_pointermove = { + let drag = drag.clone(); + let pan_cb = props.callbacks.pan.clone(); + let pinch_cb = props.callbacks.pinch.clone(); + let marker_drag = props.callbacks.marker_drag.clone(); + let hover = props.callbacks.hover.clone(); + let to_img = to_img.clone(); + let canvas_ref = props.canvas_ref.clone(); + let scale = props.view.scale; + Callback::from(move |e: PointerEvent| { + // update the pointer table and handle two-finger pinch + let pinch_ev = { + let mut d = drag.borrow_mut(); + let pos = (e.client_x() as f64, e.client_y() as f64); + match d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { + Some(p) => p.1 = pos, + // a touch pointermove for a pointer we never saw go + // down (lost pointerdown, e.g. swallowed by the + // browser) — join it so pinch still works + None if e.pointer_type() == "touch" && e.buttons() != 0 => { + d.pts.push((e.pointer_id(), pos)); + } + None => {} + } + if d.pts.len() >= 2 { + let (x1, y1) = d.pts[0].1; + let (x2, y2) = d.pts[1].1; + let rect = canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect()); + let (rl, rt) = match rect { + Some(r) => (r.left(), r.top()), + None => (0.0, 0.0), + }; + let dist = ((x2 - x1).powi(2) + (y2 - y1).powi(2)).sqrt(); + let cx = (x1 + x2) / 2.0 - rl; + let cy = (y1 + y2) / 2.0 - rt; + let ev = match d.pinch { + Some((od, ocx, ocy)) if od > 1.0 && dist > 1.0 => { + Some((dist / od, cx, cy, cx - ocx, cy - ocy)) + } + _ => None, + }; + d.pinch = Some((dist, cx, cy)); + d.moved = true; + (ev, true) + } else { + (None, false) + } + }; + let in_pinch = pinch_ev.1; + if in_pinch { + if let Some((factor, cx, cy, dx, dy)) = pinch_ev.0 { + pinch_cb.emit((cx, cy, factor, dx, dy)); + } + return; + } + let mut d = drag.borrow_mut(); + let mode = match &d.mode { + Some(m) => m.clone(), + None => { + // free hover: report position for peak identification + let (ix, iy) = to_img(e.client_x() as f64, e.client_y() as f64); + hover.emit((ix, iy)); + 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; + } + match mode { + DragMode::Pan => pan_cb.emit((dx, dy)), + DragMode::Marker(i) => marker_drag.emit((i, dx / scale, dy / scale)), + } + }) + }; + + let on_pointerleave = { + let hover_end = props.callbacks.hover_end.clone(); + Callback::from(move |_: PointerEvent| hover_end.emit(())) + }; + + let on_pointerup = { + 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| { + let (mode, moved) = { + let mut d = drag.borrow_mut(); + d.pts.retain(|(id, _)| *id != e.pointer_id()); + if d.pts.len() < 2 { + d.pinch = None; + } + let mode = d.mode.take(); + let moved = d.moved; + if d.pts.len() == 1 { + // one finger left after pinch: resume panning from + // there, never treat it as a click + d.mode = Some(DragMode::Pan); + d.last = d.pts[0].1; + d.moved = true; + } + (mode, moved) + }; + if let Some(c) = canvas_ref.cast::() { + let _ = c.release_pointer_capture(e.pointer_id()); + } + 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 |e: PointerEvent| { + let mut d = drag.borrow_mut(); + // do NOT clear the whole table: when a mobile browser + // "cancels" the first finger as the second arrives, a + // blanket clear would make a pinch impossible to form + d.pts.retain(|(id, _)| *id != e.pointer_id()); + if d.pts.len() < 2 { + d.pinch = None; + } + if d.pts.is_empty() { + d.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(); + Callback::from(move |e: WheelEvent| { + e.prevent_default(); + let cx = e.client_x() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().left()) + .unwrap_or(0.0); + let cy = e.client_y() as f64 + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().top()) + .unwrap_or(0.0); + let factor = 1.0015f64.powf(-(e.delta_y() as f64)); + zoom.emit((cx, cy, factor)); + }) + }; + + html! { + + } +} + +/// Port of the desktop `viewport::layout_label_y`: place labels right of +/// their crosses, pushing colliding ones up; iterate to a fixed point +/// (the C single pass can leave overlaps). Inputs must be sorted by x. +fn layout_label_y( + xs: &[f32], + ys: &[f32], + widths: &[f32], + in_img: &[bool], + line_h: f32, +) -> Vec<(f32, f32)> { + let n = xs.len(); + let mut label_x = vec![0.0f32; n]; + let mut label_y = vec![0.0f32; n]; + let cross = 4.0f32; + let overlap = |a1: f32, l1: f32, a2: f32, l2: f32| a1 <= a2 + l2 && a1 + l1 >= a2; + + for i in 0..n { + if !in_img[i] { + continue; + } + label_x[i] = widths[i] + 1.0; + label_y[i] = 0.0; + + let mut colliding: Vec = Vec::new(); + for j in (0..i).rev() { + if !in_img[j] { + continue; + } + if overlap(xs[i], label_x[i], xs[j] - cross, label_x[j]) { + colliding.push(j); + } else { + break; + } + } + colliding.sort_by(|&a, &b| { + let ya = ys[a] + label_y[a]; + let yb = ys[b] + label_y[b]; + yb.total_cmp(&ya) + }); + for _round in 0..64 { + let mut pushed = false; + for &j in &colliding { + if overlap( + ys[i] + label_y[i] - line_h, + line_h, + ys[j] + label_y[j] - line_h, + line_h, + ) || overlap(ys[i] + label_y[i] - line_h, line_h, ys[j] - cross, 2.0 * cross) + { + let ny = (ys[j] + label_y[j] - ys[i] - line_h - 2.0).round(); + if ny < label_y[i] { + label_y[i] = ny; + pushed = true; + } + } + } + if !pushed { + break; + } + } + } + + (0..n).map(|i| (label_x[i], label_y[i])).collect() +} diff --git a/crates/gipfel/src/compass.rs b/crates/gipfel/src/compass.rs new file mode 100644 index 0000000..5e91c9a --- /dev/null +++ b/crates/gipfel/src/compass.rs @@ -0,0 +1,351 @@ +//! Compass strip (canvas port of the desktop `compass.rs`, Aligned style): +//! shares the image's horizontal transform so each direction sits above +//! its position in the image; drag horizontally to change the view azimuth. + +use web_sys::{HtmlCanvasElement, PointerEvent};use yew::prelude::*; + +use gipfel_core::projection::{projection_from_type, ProjArgs, Projection, ProjectionType, ViewParams}; + +use crate::bridge; + +pub const STRIP_H: f64 = 56.0; + +/// Damped, clamped Newton iteration for a scalar inverse projection: find +/// `a` such that `f(a) ≈ target` (identical to the desktop solver). +pub fn newton_inverse( + target: f64, + mut f: impl FnMut(f64) -> Option, + seed: f64, + lo: f64, + hi: f64, +) -> f64 { + let mut a = seed.clamp(lo, hi); + for _ in 0..6 { + let Some(y) = f(a) else { break }; + let resid = y - target; + let h = 1e-5; + let (Some(y1), Some(y2)) = (f(a + h), f(a - h)) else { + break; + }; + let d = (y1 - y2) / (2.0 * h); + if !d.is_finite() || d.abs() < 1e-9 { + break; + } + let step = (resid / d).clamp(-0.3, 0.3); + a = (a - step).clamp(lo, hi); + if step.abs() < 1e-10 { + break; + } + } + a +} + +/// azimuth whose image x is `x_img`, measured with `c_ref` as center angle +pub fn alph_at_img_x( + ptype: ProjectionType, + proj: &dyn Projection, + p: &ViewParams, + x_img: f64, + c_ref: f64, +) -> f64 { + let mut p = *p; + p.a_center = c_ref; + let seed = match ptype { + ProjectionType::Rectilinear => c_ref + (x_img / p.scale).atan(), + ProjectionType::Cylindrical => c_ref + x_img / p.scale, + }; + let (lo, hi) = match ptype { + ProjectionType::Rectilinear => (c_ref - 1.55, c_ref + 1.55), + ProjectionType::Cylindrical => (c_ref - 3.1, c_ref + 3.1), + }; + newton_inverse( + x_img, + |a| Some(proj.mac_x(ProjArgs::from_params(&p, a, 0.0))), + seed, + lo, + hi, + ) +} + +const DIRS: [(f64, &str); 8] = [ + (0.0, "N"), + (45.0, "NE"), + (90.0, "E"), + (135.0, "SE"), + (180.0, "S"), + (225.0, "SW"), + (270.0, "W"), + (315.0, "NW"), +]; + +/// everything the strip needs; all plain data so Yew can diff it +#[derive(Clone, Copy, PartialEq)] +pub struct CompassData { + pub ptype: ProjectionType, + pub parms: ViewParams, + pub center_deg: f64, + pub zoom: f64, + /// screen x of the image center (strip shares the image transform) + pub cx: f64, + /// lens FOV half-angle limit, radians (0 = none) + pub max_view_angle: f64, +} + +#[derive(Properties, PartialEq)] +pub struct Props { + pub data: CompassData, + /// bumped on window resize to force a redraw + pub tick: u32, + /// new azimuth in degrees while dragging + pub on_change: Callback, +} + +#[function_component(Compass)] +pub fn compass(props: &Props) -> Html { + let canvas_ref = use_node_ref(); + let drag = use_mut_ref(|| Option::<(f64, f64)>::None); // (press x, center_deg) + + let d = props.data; + + // draw + { + let canvas_ref = canvas_ref.clone(); + use_effect_with((d, props.tick), move |(d, _tick)| { + let Some(canvas) = canvas_ref.cast::() else { + return; + }; + let Some(ctx) = bridge::ctx2d(&canvas) else { + return; + }; + let dpr = bridge::window().device_pixel_ratio(); + let w = canvas.client_width() as f64; + let bw = (w * dpr).max(1.0) as u32; + let bh = (STRIP_H * 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(dpr, 0.0, 0.0, dpr, 0.0, 0.0); + + // theme colors come from the CSS variables, so the strip + // follows light/dark preference like the rest of the UI + let on = bridge::css_var("--compass-fg", "rgb(217, 217, 217)"); + let bg = bridge::css_var("--compass-bg", "rgb(41, 41, 41)"); + let divider = bridge::css_var("--compass-divider", "rgb(82, 82, 82)"); + let red = "rgb(255, 102, 64)"; + + let fill = |c: &str| { + #[allow(deprecated)] + ctx.set_fill_style(&wasm_bindgen::JsValue::from_str(c)); + }; + let stroke = |c: &str, width: f64| { + #[allow(deprecated)] + ctx.set_stroke_style(&wasm_bindgen::JsValue::from_str(c)); + ctx.set_line_width(width); + }; + + fill(&bg); + ctx.fill_rect(0.0, 0.0, w, STRIP_H); + stroke(÷r, 1.0); + ctx.begin_path(); + ctx.move_to(0.0, 0.5); + ctx.line_to(w, 0.5); + ctx.stroke(); + + let label_y = 17.0f64; // text baseline of the direction row + let y0 = (STRIP_H - 10.0).round(); // baseline of the ticks + let tri_y = 25.0f64; + let z = d.zoom; + let proj = projection_from_type(d.ptype); + let cx = d.cx; + let c = d.parms.a_center; + + let x_img_at = |alph: f64| proj.get_coordinates(alph, 0.0, &d.parms).0; + + // adaptive tick step: first that yields >= 6 px spacing + let ppd = ((x_img_at(c + 1f64.to_radians()) - x_img_at(c - 1f64.to_radians())) + * z + / 2.0) + .abs(); + let step = [1.0f64, 2.0, 5.0, 10.0, 15.0, 30.0, 45.0, 90.0] + .into_iter() + .find(|s| s * ppd >= 6.0) + .unwrap_or(90.0); + + let a_lo = alph_at_img_x(d.ptype, &*proj, &d.parms, -cx / z, c) + .min(c - std::f64::consts::PI); + let a_hi = alph_at_img_x(d.ptype, &*proj, &d.parms, (w - cx) / z, c) + .max(c + std::f64::consts::PI); + // rectilinear folds directions behind the camera onto the same + // pixels; also clamp to the lens FOV (distortion can fold + // out-of-view directions back onto the strip) + let mut fold = match d.ptype { + ProjectionType::Rectilinear => 1.535, + ProjectionType::Cylindrical => std::f64::consts::PI, + }; + if d.max_view_angle > 0.0 { + fold = fold.min(d.max_view_angle); + } + let a_lo = a_lo.max(c - fold); + let a_hi = a_hi.min(c + fold); + + // baseline + stroke(&on, 1.0); + ctx.begin_path(); + ctx.move_to(0.0, y0 + 0.5); + ctx.line_to(w, y0 + 0.5); + ctx.stroke(); + + // ticks + let step_rad = step.to_radians(); + let mut a = (a_lo / step_rad).floor() * step_rad; + while a <= a_hi { + let x = cx + x_img_at(a) * z; + if x.is_finite() && x >= -1.0 && x <= w + 1.0 { + let rem = a.to_degrees().rem_euclid(45.0); + let major = rem.min(45.0 - rem) < step / 2.0; + let x = x.round(); + ctx.begin_path(); + ctx.move_to(x, y0); + ctx.line_to(x, y0 - if major { 12.0 } else { 6.0 }); + ctx.stroke(); + } + a += step_rad; + } + + // direction labels + ctx.set_font("13px system-ui, sans-serif"); + ctx.set_text_align("center"); + for (deg, name) in DIRS { + let alph = deg.to_radians(); + let rel = (alph - c + std::f64::consts::PI).rem_euclid(std::f64::consts::TAU) + - std::f64::consts::PI; + if rel.abs() > fold { + continue; + } + let x = cx + x_img_at(alph) * z; + if !x.is_finite() || x < -20.0 || x > w + 20.0 { + continue; + } + fill(if deg == 0.0 { red } else { &on }); + ctx.fill_text(name, x, label_y).ok(); + } + ctx.set_text_align("start"); + + // center marker: triangle + hairline + azimuth readout + fill(red); + ctx.begin_path(); + ctx.move_to(cx - 6.0, tri_y); + ctx.line_to(cx + 6.0, tri_y); + ctx.line_to(cx, tri_y + 8.0); + ctx.close_path(); + ctx.fill(); + stroke(red, 1.0); + ctx.begin_path(); + ctx.move_to(cx.round(), tri_y + 8.0); + ctx.line_to(cx.round(), y0); + ctx.stroke(); + fill(red); + ctx.fill_text(&format!("{:05.1}°", d.center_deg.rem_euclid(360.0)), cx + 10.0, tri_y + 9.0) + .ok(); + }); + } + + let local_x = { + let canvas_ref = canvas_ref.clone(); + move |client_x: f64| { + client_x + - canvas_ref + .cast::() + .map(|c| c.get_bounding_client_rect().left()) + .unwrap_or(0.0) + } + }; + + let on_pointerdown = { + let drag = drag.clone(); + let canvas_ref = canvas_ref.clone(); + let center_deg = props.data.center_deg; + Callback::from(move |e: PointerEvent| { + e.prevent_default(); + if let Some(c) = canvas_ref.cast::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } + *drag.borrow_mut() = Some((e.client_x() as f64, center_deg)); + }) + }; + let on_pointermove = { + let drag = drag.clone(); + let on_change = props.on_change.clone(); + let d = props.data; + Callback::from(move |e: PointerEvent| { + let Some((x0, c0_deg)) = *drag.borrow() else { + return; + }; + let proj = projection_from_type(d.ptype); + let c0 = c0_deg.to_radians(); + let lx0 = local_x(e.client_x() as f64); + let a0 = alph_at_img_x(d.ptype, &*proj, &d.parms, (x0 - d.cx) / d.zoom, c0); + let a1 = alph_at_img_x(d.ptype, &*proj, &d.parms, (lx0 - d.cx) / d.zoom, c0); + on_change.emit((c0 - (a1 - a0)).to_degrees()); + }) + }; + let on_pointerup = { + let drag = drag.clone(); + let canvas_ref = canvas_ref.clone(); + Callback::from(move |e: PointerEvent| { + *drag.borrow_mut() = None; + if let Some(c) = canvas_ref.cast::() { + let _ = c.release_pointer_capture(e.pointer_id()); + } + }) + }; + + html! { + + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn roundtrip(ptype: ProjectionType, k0: f64, k1: f64, x0: f64) { + let proj = projection_from_type(ptype); + let mut parms = ViewParams::new(); + parms.a_center = 0.3; + parms.scale = 3000.0; + parms.k0 = k0; + parms.k1 = k1; + parms.x0 = x0; + for x in [-2500.0, -800.0, -50.0, 0.0, 120.0, 900.0, 2400.0] { + let a = alph_at_img_x(ptype, &*proj, &parms, x, parms.a_center); + let (x2, _) = proj.get_coordinates(a, 0.0, &parms); + assert!( + (x2 - x).abs() < 1e-6, + "{ptype:?} x={x}: round-trips to {x2} (alph {a})" + ); + } + } + + #[test] + fn inverse_rectilinear() { + roundtrip(ProjectionType::Rectilinear, 0.0, 0.0, 0.0); + } + #[test] + fn inverse_rectilinear_distorted() { + roundtrip(ProjectionType::Rectilinear, 0.002, -0.0003, 0.01); + } + #[test] + fn inverse_cylindrical() { + roundtrip(ProjectionType::Cylindrical, 0.0, 0.0, 0.0); + } +} diff --git a/crates/gipfel/src/main.rs b/crates/gipfel/src/main.rs new file mode 100644 index 0000000..741393b --- /dev/null +++ b/crates/gipfel/src/main.rs @@ -0,0 +1,10 @@ +mod app; +mod bridge; +mod canvas_view; +mod compass; +mod markers; +mod widgets; + +fn main() { + yew::Renderer::::new().render(); +} diff --git a/crates/gipfel/src/markers.rs b/crates/gipfel/src/markers.rs new file mode 100644 index 0000000..b8c00aa --- /dev/null +++ b/crates/gipfel/src/markers.rs @@ -0,0 +1,66 @@ +//! 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. +/// Same graduated behavior as the original: 1 marker fits the center +/// angle, 2 add the scale, 4+ the full viewpoint (+ distortion when +/// unlocked and enough markers). +pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Result<(), String> { + if markers.is_empty() { + 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. Hills hidden by the +/// occlusion heuristic are skipped unless `show_hidden`. +pub fn nearest_hill( + pan: &Panorama, + x: f64, + y: f64, + max_dist: f64, + show_hidden: bool, +) -> Option { + let mut best = None; + let mut best_d = max_dist; + for &i in &pan.visible { + let flags = pan.hills[i].flags; + if flags & gipfel_core::hill::FLAG_DUPLIC != 0 + || flags & gipfel_core::hill::FLAG_TRACK_POINT != 0 + { + continue; + } + if !show_hidden && flags & gipfel_core::hill::FLAG_HIDDEN != 0 { + continue; + } + 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 +} diff --git a/crates/gipfel/src/widgets.rs b/crates/gipfel/src/widgets.rs new file mode 100644 index 0000000..93e2cdc --- /dev/null +++ b/crates/gipfel/src/widgets.rs @@ -0,0 +1,106 @@ +//! Small form controls: full-width slider with value readout above +//! (mirrors the desktop `slider_item` layout) and a numeric input row. + +use web_sys::{HtmlInputElement, InputEvent}; +use yew::prelude::*; + +#[derive(Properties, PartialEq)] +pub struct SliderProps { + pub label: AttrValue, + /// formatted value shown right of the label + pub display: AttrValue, + pub value: f64, + pub min: f64, + pub max: f64, + pub step: f64, + pub onchange: Callback, +} + +#[function_component(SliderItem)] +pub fn slider_item(p: &SliderProps) -> Html { + // live update while dragging (oninput), not only on release + let oninput = { + let onchange = p.onchange.clone(); + Callback::from(move |e: InputEvent| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Ok(v) = input.value().parse::() { + onchange.emit(v); + } + }) + }; + html! { +
+
+ { p.label.as_ref().to_string() } + { p.display.as_ref().to_string() } +
+ +
+ } +} + +/// single-line text row (e.g. paste a GPS string) +#[derive(Properties, PartialEq)] +pub struct TextProps { + pub label: AttrValue, + pub placeholder: AttrValue, + pub onchange: Callback, +} + +#[function_component(TextItem)] +pub fn text_item(p: &TextProps) -> Html { + let onchange = { + let onchange = p.onchange.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + onchange.emit(input.value()); + }) + }; + html! { + + } +} + +#[derive(Properties, PartialEq)] +pub struct NumProps { + pub label: AttrValue, + pub value: f64, + pub step: f64, + #[prop_or(2)] + pub decimals: usize, + pub onchange: Callback, +} + +#[function_component(NumItem)] +pub fn num_item(p: &NumProps) -> Html { + let onchange = { + let onchange = p.onchange.clone(); + Callback::from(move |e: Event| { + let input: HtmlInputElement = e.target_unchecked_into(); + if let Ok(v) = input.value().parse::() { + onchange.emit(v); + } + }) + }; + let display = format!("{:.*}", p.decimals, p.value); + html! { + + } +} diff --git a/crates/gipfel/www/index.html b/crates/gipfel/www/index.html new file mode 100644 index 0000000..3356815 --- /dev/null +++ b/crates/gipfel/www/index.html @@ -0,0 +1,24 @@ + + + + + + + + + + gipfel — Photogrammetry for Mountain Images + + + + + + diff --git a/crates/gipfel/www/loader.js b/crates/gipfel/www/loader.js new file mode 100644 index 0000000..5fbd558 --- /dev/null +++ b/crates/gipfel/www/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline - - diff --git a/crates/wipfel/www/loader.js b/crates/wipfel/www/loader.js deleted file mode 100644 index 8880478..0000000 --- a/crates/wipfel/www/loader.js +++ /dev/null @@ -1,4 +0,0 @@ -// External loader so the page needs no inline + + diff --git a/dist/gipfel/loader.js b/dist/gipfel/loader.js new file mode 100644 index 0000000..5fbd558 --- /dev/null +++ b/dist/gipfel/loader.js @@ -0,0 +1,4 @@ +// External loader so the page needs no inline - - diff --git a/dist/wipfel/loader.js b/dist/wipfel/loader.js deleted file mode 100644 index 8880478..0000000 --- a/dist/wipfel/loader.js +++ /dev/null @@ -1,4 +0,0 @@ -// External loader so the page needs no inline