diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2026-11-10 09:12:35 +0100 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2026-11-10 09:12:35 +0100 |
| commit | 0b0663e0c9dc664f35ffead3b395ffd2009fd98c (patch) | |
| tree | f9e10437ebe7e13e527ce1a6a2b456c105bcc5c0 /crates/gipfel-core | |
| parent | 02546370ec4458eef59a8f636fe05b57961d56ab (diff) | |
| parent | 31a47fc4393856a0a0380b2fdcf79f9dac72ad56 (diff) | |
Merge branch 'wasm-spike'
# Conflicts:
# crates/gipfel-core/src/metadata.rs
Diffstat (limited to 'crates/gipfel-core')
| -rw-r--r-- | crates/gipfel-core/src/hill.rs | 22 | ||||
| -rw-r--r-- | crates/gipfel-core/src/metadata.rs | 83 | ||||
| -rw-r--r-- | crates/gipfel-core/src/panorama.rs | 10 | ||||
| -rw-r--r-- | crates/gipfel-core/src/profile.rs | 14 | ||||
| -rw-r--r-- | crates/gipfel-core/src/track.rs | 33 |
5 files changed, 139 insertions, 23 deletions
diff --git a/crates/gipfel-core/src/hill.rs b/crates/gipfel-core/src/hill.rs index b40eb1d..254a9e4 100644 --- a/crates/gipfel-core/src/hill.rs +++ b/crates/gipfel-core/src/hill.rs @@ -2,9 +2,6 @@ //! //! Faithful port of gipfel's `Hill.cxx`. -use std::fs::File; -use std::io::{BufRead, BufReader}; - pub const FLAG_DUPLIC: u32 = 1 << 0; pub const FLAG_KNOWN: u32 = 1 << 1; pub const FLAG_HIDDEN: u32 = 1 << 2; @@ -80,16 +77,20 @@ fn atof(s: &str) -> f64 { 0.0 } -/// Load a hill database. Two line formats are accepted: +/// Load a hill database from a file path. +pub fn load(path: &str) -> std::io::Result<Vec<Hill>> { + load_from_bytes(&std::fs::read(path)?) +} + +/// Load a hill database from raw bytes. Two line formats are accepted: /// - `SHORT,NAME,DESC,LAT,LON,HEIGHT` (6 fields) /// - `LAT,LON,HEIGHT` (3 fields, track point) -pub fn load(path: &str) -> std::io::Result<Vec<Hill>> { - let file = File::open(path)?; +/// +/// Byte-oriented entry point (no filesystem): used by the WASM build and +/// by tests. The database is Latin-1; bytes decode to Unicode code points. +pub fn load_from_bytes(raw: &[u8]) -> std::io::Result<Vec<Hill>> { let mut hills = Vec::new(); - - // the database is Latin-1; decode to Unicode code points - for line in BufReader::new(file).split(b'\n') { - let raw = line?; + for raw in raw.split(|b| *b == b'\n') { let line: String = raw.iter().map(|b| *b as char).collect(); // strsep() semantics: split into at most 10 fields, keeping empties let vals: Vec<&str> = line.split(',').take(10).collect(); @@ -112,7 +113,6 @@ pub fn load(path: &str) -> std::io::Result<Vec<Hill>> { hills.push(h); } } - Ok(hills) } diff --git a/crates/gipfel-core/src/metadata.rs b/crates/gipfel-core/src/metadata.rs index 9da4f50..d9c98f9 100644 --- a/crates/gipfel-core/src/metadata.rs +++ b/crates/gipfel-core/src/metadata.rs @@ -3,9 +3,6 @@ //! //! Faithful port of gipfel's `ImageMetaData.cxx`. -use std::fs::File; -use std::io::{BufReader, Write}; - use exif::{In, Tag, Value}; pub const NAN: f64 = f64::NAN; @@ -71,6 +68,16 @@ impl ImageMetaData { self.load_image_exif(path); } + /// Like [`ImageMetaData::load_image`] but from raw bytes (no filesystem); + /// used by the WASM build. + pub fn load_image_from_bytes(&mut self, bytes: &[u8]) { + *self = ImageMetaData::new(); + if let Some(com) = read_jpeg_comment_from_bytes(bytes) { + self.parse_gipfel_comment(&com); + } + self.load_image_exif_bytes(bytes); + } + /// Write the gipfel comment into a copy of `in_img`, saved as `out_img`. /// Writes atomically via a temp file, like the C original. pub fn save_image(&self, in_img: &str, out_img: &str) -> std::io::Result<()> { @@ -81,6 +88,12 @@ impl ImageMetaData { Ok(()) } + /// Like [`ImageMetaData::save_image`] but bytes in / bytes out (no + /// filesystem); used by the WASM build. + pub fn save_image_to_bytes(&self, in_bytes: &[u8]) -> std::io::Result<Vec<u8>> { + write_jpeg_comment_to_bytes(in_bytes, self.format_comment().as_bytes()) + } + pub fn format_comment(&self) -> String { format!( "gipfel: longitude {}, latitude {}, height {}, direction {}, nick {}, tilt {}, focal_length_35mm {}, projection type {}, k0 {}, k1 {}, x0 {}", @@ -155,8 +168,12 @@ impl ImageMetaData { } fn load_image_exif(&mut self, path: &str) { - let Ok(file) = File::open(path) else { return }; - let mut reader = BufReader::new(file); + let Ok(bytes) = std::fs::read(path) else { return }; + self.load_image_exif_bytes(&bytes); + } + + fn load_image_exif_bytes(&mut self, bytes: &[u8]) { + let mut reader = std::io::Cursor::new(bytes); let Ok(exif) = exif::Reader::new().read_from_container(&mut reader) else { return; }; @@ -215,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; + } + } + } } } @@ -372,6 +405,11 @@ fn marker_len_ok(marker: u8) -> bool { /// Return the payload of the first COM segment before SOS, if any. pub fn read_jpeg_comment(path: &str) -> Option<Vec<u8>> { let bytes = std::fs::read(path).ok()?; + read_jpeg_comment_from_bytes(&bytes) +} + +/// Byte-oriented twin of [`read_jpeg_comment`] (no filesystem; WASM-safe). +pub fn read_jpeg_comment_from_bytes(bytes: &[u8]) -> Option<Vec<u8>> { if bytes.len() < 2 || bytes[0] != 0xFF || bytes[1] != 0xD8 { return None; } @@ -412,6 +450,13 @@ pub fn read_jpeg_comment(path: &str) -> Option<Vec<u8>> { /// fresh COM segment right after SOI. pub fn write_jpeg_comment(in_img: &str, out_img: &str, comment: &[u8]) -> std::io::Result<()> { let bytes = std::fs::read(in_img)?; + let out = write_jpeg_comment_to_bytes(&bytes, comment)?; + std::fs::write(out_img, out) +} + +/// Byte-oriented twin of [`write_jpeg_comment`] (no filesystem; WASM-safe): +/// drop all COM segments and insert a fresh COM segment after the last APPn. +pub fn write_jpeg_comment_to_bytes(bytes: &[u8], comment: &[u8]) -> std::io::Result<Vec<u8>> { if bytes.len() < 2 || bytes[0] != 0xFF || bytes[1] != 0xD8 { return Err(std::io::Error::new(std::io::ErrorKind::InvalidInput, "not a JPEG file")); } @@ -475,9 +520,7 @@ pub fn write_jpeg_comment(in_img: &str, out_img: &str, comment: &[u8]) -> std::i out.extend_from_slice(&bytes[copy_rest_from..]); - let mut f = File::create(out_img)?; - f.write_all(&out)?; - f.flush() + Ok(out) } /// Read raw image dimensions (width, height) of a JPEG. @@ -725,3 +768,27 @@ mod tests { assert!((pan.get_scale() - 50.0 * 1000.0 / 35.0).abs() < 1e-9); } } + +#[cfg(test)] +mod save_tests { + use super::*; + + #[test] + fn comment_roundtrip_preserves_projection_type() { + let mut md = ImageMetaData::new(); + md.longitude = 10.5; + md.latitude = 47.0; + md.height = 2993.0; + md.direction = 57.4; + md.pitch = -20.0; + md.roll = 0.3; + md.focal_length_35mm = 27.0; + md.projection_type = 1; // cylindrical + // minimal valid JPEG (SOI, empty COM, EOI) + let jpg = b"\xff\xd8\xff\xfe\x00\x02\xff\xd9"; + let out = md.save_image_to_bytes(jpg).unwrap(); + let mut md2 = ImageMetaData::new(); + md2.load_image_from_bytes(&out); + assert_eq!(md2.projection_type, 1, "projection type lost in comment roundtrip"); + } +} diff --git a/crates/gipfel-core/src/panorama.rs b/crates/gipfel-core/src/panorama.rs index 1af64bf..b8ce342 100644 --- a/crates/gipfel-core/src/panorama.rs +++ b/crates/gipfel-core/src/panorama.rs @@ -74,6 +74,16 @@ impl Panorama { Ok(()) } + /// Like [`Panorama::load_data`] but from raw bytes (no filesystem); + /// used by the WASM build. + pub fn load_data_from_bytes(&mut self, raw: &[u8]) -> std::io::Result<()> { + let mut hills = crate::hill::load_from_bytes(raw)?; + crate::hill::mark_duplicates(&mut hills, 0.00001); + self.hills = hills; + self.update_angles(); + Ok(()) + } + pub fn add_hills(&mut self, extra: &[Hill]) { self.hills.extend_from_slice(extra); crate::hill::mark_duplicates(&mut self.hills, 0.00001); 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-core/src/track.rs b/crates/gipfel-core/src/track.rs index 5450aa8..f7bf755 100644 --- a/crates/gipfel-core/src/track.rs +++ b/crates/gipfel-core/src/track.rs @@ -32,7 +32,18 @@ pub fn load_gpx(path: &str, max_points: usize) -> Result<Vec<Hill>, String> { if size.len() > MAX_GPX_BYTES { return Err(format!("{path}: file too large ({} bytes)", size.len())); } - let data = std::fs::read_to_string(path).map_err(|e| format!("{path}: {e}"))?; + let data = std::fs::read(path).map_err(|e| format!("{path}: {e}"))?; + load_gpx_from_bytes(&data, max_points).map_err(|e| format!("{path}: {e}")) +} + +/// Parse GPX from raw bytes. Same hardening as [`load_gpx`]: size cap, +/// no entity expansion, `<ele>` accepted only as direct child of +/// `<trkpt>`. Used directly by the browser front end. +pub fn load_gpx_from_bytes(data: &[u8], max_points: usize) -> Result<Vec<Hill>, String> { + if data.len() as u64 > MAX_GPX_BYTES { + return Err(format!("file too large ({} bytes)", data.len())); + } + let data = String::from_utf8_lossy(data); let mut reader = quick_xml::Reader::from_str(&data); reader.config_mut().trim_text(true); @@ -55,7 +66,7 @@ pub fn load_gpx(path: &str, max_points: usize) -> Result<Vec<Hill>, String> { } loop { - match reader.read_event().map_err(|e| format!("{path}: {e}"))? { + match reader.read_event().map_err(|e| e.to_string())? { Event::Eof => break, Event::Empty(e) => { if e.local_name().as_ref() == b"trkpt" { @@ -112,7 +123,7 @@ pub fn load_gpx(path: &str, max_points: usize) -> Result<Vec<Hill>, String> { } if pts.is_empty() { - return Err(format!("{path}: no track points")); + return Err("no track points".to_string()); } let stride = pts.len().div_ceil(max_points.max(1)); @@ -173,6 +184,22 @@ mod tests { } #[test] + fn gpx_from_bytes_matches_path_api() { + // the browser front end feeds raw bytes directly + let gpx = br#"<?xml version="1.0" encoding="UTF-8"?> +<gpx version="1.1"><trk><trkseg> + <trkpt lat="47.36" lon="11.15"><ele>2100</ele></trkpt> + <trkpt lat="47.37" lon="11.16"><ele>2150</ele></trkpt> +</trkseg></trk></gpx>"#; + let hills = load_gpx_from_bytes(gpx, 100).unwrap(); + assert_eq!(hills.len(), 2); + assert!(hills.iter().all(|h| h.is_track_point())); + assert!((hills[0].phi - 47.36f64.to_radians()).abs() < 1e-12); + assert!((hills[1].height - 2150.0).abs() < 1e-9); + assert!(load_gpx_from_bytes(b"<gpx></gpx>", 10).is_err()); // no points + } + + #[test] fn gpx_vendor_extensions_ignored() { // Garmin-style files are full of vendor extension blocks; they must // not confuse the parser (and must not contribute elevation). |
