feat(anatomy): an unnamed trigger carries the opened view's name per language
This commit is contained in:
1 parent
d8e9bd391a
commit
6882c6da4a
5 files changed
+168
-29
No files matched your search
@@ -5,7 +5,9 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use super::svg::{Element, Node};
|
||||
use crate::domain::sheet::{AnatomicalSheetDocument, Annotation, Geometry, Laterality, SheetView};
|
||||
use crate::domain::sheet::{
|
||||
AnatomicalSheetDocument, Annotation, Geometry, Laterality, LocalizedText, SheetView,
|
||||
};
|
||||
use crate::json::js_number;
|
||||
|
||||
pub const FALLBACK_COLOR: &str = "#888888";
|
||||
@@ -39,11 +41,7 @@ pub fn render_layer(
|
||||
.iter()
|
||||
.map(|c| (c.id.as_str(), c.color.as_deref()))
|
||||
.collect(),
|
||||
view_names: document
|
||||
.views
|
||||
.iter()
|
||||
.map(|v| (v.id(), v.name().fr.as_str()))
|
||||
.collect(),
|
||||
view_names: document.views.iter().map(|v| (v.id(), v.name())).collect(),
|
||||
states,
|
||||
};
|
||||
let children = document
|
||||
@@ -64,7 +62,7 @@ struct Context<'a> {
|
||||
twin_opacity: &'static str,
|
||||
/// Last duplicate wins, as a JavaScript `Map` built from the list.
|
||||
categories: HashMap<&'a str, Option<&'a str>>,
|
||||
view_names: HashMap<&'a str, &'a str>,
|
||||
view_names: HashMap<&'a str, &'a LocalizedText>,
|
||||
states: &'a HashSet<&'a str>,
|
||||
}
|
||||
|
||||
@@ -107,18 +105,14 @@ impl Context<'_> {
|
||||
let mut data: Attrs = vec![("data-anno-id", annotation.id().to_owned())];
|
||||
match annotation {
|
||||
Annotation::DetailTrigger(t) => {
|
||||
let opened = self
|
||||
.view_names
|
||||
.get(t.opens_view_id.as_str())
|
||||
.copied()
|
||||
.unwrap_or("");
|
||||
let opened = self.view_names.get(t.opens_view_id.as_str()).copied();
|
||||
data.push(("data-anno-kind", "detail_trigger".to_owned()));
|
||||
data.push(("data-anno-lateral", laterality(t.laterality).to_owned()));
|
||||
data.push(("data-anno-opens-view", t.opens_view_id.clone()));
|
||||
let names = t
|
||||
.name
|
||||
.as_ref()
|
||||
.map_or((opened, opened), |n| (n.fr.as_str(), n.en.as_str()));
|
||||
let names = match &t.name {
|
||||
Some(n) => (n.fr.as_str(), n.en.as_str()),
|
||||
None => opened.map_or(("", ""), localized_names),
|
||||
};
|
||||
data.push(("data-anno-name-fr", names.0.to_owned()));
|
||||
data.push(("data-anno-name-en", names.1.to_owned()));
|
||||
}
|
||||
@@ -182,6 +176,23 @@ impl Context<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
/// A trigger without a name of its own takes the opened view's name in each language
|
||||
/// (owner decision 2026-10-15; until R3 both attributes carried the French name). A language
|
||||
/// left empty falls back to the other one.
|
||||
fn localized_names(name: &LocalizedText) -> (&str, &str) {
|
||||
let fr = if name.fr.is_empty() {
|
||||
&name.en
|
||||
} else {
|
||||
&name.fr
|
||||
};
|
||||
let en = if name.en.is_empty() {
|
||||
&name.fr
|
||||
} else {
|
||||
&name.en
|
||||
};
|
||||
(fr, en)
|
||||
}
|
||||
|
||||
fn value_of<'a>(attrs: &'a Attrs, name: &str) -> &'a str {
|
||||
attrs
|
||||
.iter()
|
||||
@@ -268,3 +279,26 @@ pub fn view_box_of(view: &SheetView) -> Option<String> {
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn text(fr: &str, en: &str) -> LocalizedText {
|
||||
LocalizedText {
|
||||
fr: fr.to_owned(),
|
||||
en: en.to_owned(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_unnamed_trigger_takes_the_opened_view_name_in_each_language() {
|
||||
assert_eq!(localized_names(&text("Tête", "Head")), ("Tête", "Head"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_missing_language_falls_back_to_the_other() {
|
||||
assert_eq!(localized_names(&text("Tête", "")), ("Tête", "Tête"));
|
||||
assert_eq!(localized_names(&text("", "Head")), ("Head", "Head"));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user