Skip to content

fix(labels): the class rule note only with more than one visible class #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giswqs merged 1 commit into from
Oct 27, 2026
Merged

fix(labels): the class rule note only with more than one visible class #994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions crates/ui-egui/src/labelpane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@ fn field(app: &mut RustGisApp, ui: &mut Ui, l: &Layer, c: &Class) {
fn sql(app: &mut RustGisApp, ui: &mut Ui, l: &Layer, c: &Class, t: &Tokens) {
let labels = &l.labels;
// One note, about what decides the labels first: labels off, then a hidden class, then
// the other classes. Each is a whole sentence, as joined ones would read in the wrong
// order right to left.
// other visible classes (those the map draws, Default included). Each is a whole sentence,
// as joined ones would read in the wrong order right to left.
if !labels.enabled {
ui.label(RichText::new(tl!("Labels are off for this layer: the clause applies once they are on.")).small().color(t.text_dim));
} else if !c.it.visible {
Expand All @@ -485,7 +485,7 @@ fn sql(app: &mut RustGisApp, ui: &mut Ui, l: &Layer, c: &Class, t: &Tokens) {
run(app, "labels.class.update", c.params(json!({"visible": true})));
}
});
} else if !labels.classes.is_empty() {
} else if labels.in_order().filter(|k| k.visible).count() > 1 {
let said = tl!("Each class labels the features its own clause matches, so a feature can get a label from more than one.");
ui.label(RichText::new(said).small().color(t.text_dim));
}
Expand Down Expand Up @@ -1251,7 +1251,7 @@ mod tests {
}

/// The SQL Query section of the Content tab has one note, on what decides the labels first:
/// labels off, then a hidden Default (Show labels shows it again), then the other classes.
/// labels off, then a hidden Default (Show labels shows it again), then other visible classes.
#[test]
fn the_sql_tab_says_what_else_decides_the_labels() {
let mut app = with_cities();
Expand All @@ -1271,6 +1271,10 @@ mod tests {
let l = &h.state().session.map().layer(h.state().session.active_layer.unwrap()).unwrap().labels;
assert!(l.default.visible);
assert!(h.query_by_label_contains(rule).is_some());
// A hidden extra class labels nothing, so only Default labels: no rule either.
h.state_mut().run("labels.class.update", json!({"class": "Big", "visible": false})).unwrap();
h.run();
assert!(h.query_by_label_contains(rule).is_none(), "no rule note with one visible class");
}

/// A draft belongs to its layer in its project: another project, though it reuses the
Expand Down
Loading