Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7a65c69
fix(engine): refuse unusable field photo destinations
giswqs Nov 15, 2026
cabb3a7
fix(engine): count distinct link chart endpoints at capacity
giswqs Nov 15, 2026
b794b4d
fix(engine): keep connection key redaction consistent
giswqs Nov 15, 2026
938f160
fix(engine): keep unreadable model connections from retargeting
giswqs Nov 15, 2026
5f5fca0
perf(engine): bound repeated preference sibling scans
giswqs Nov 15, 2026
dac46ab
fix(engine): preserve raster owners and subtype fills
giswqs Nov 15, 2026
7cd230b
fix(engine): retain imported history trust with null steps
giswqs Nov 15, 2026
f2de1f2
fix(engine): report package omissions and reject ambiguous coordinates
giswqs Nov 15, 2026
5e068b9
fix(build): align fuzz source policy with published terrio-crs
giswqs Nov 15, 2026
1ad9a8d
Merge remote-tracking branch 'origin/main' into sweep/engine-correctn…
giswqs Nov 15, 2026
3e79eb3
Address review feedback
giswqs Nov 15, 2026
553f24b
refactor(render): expose the terrain DEM height sampler
giswqs Nov 15, 2026
d33d7d9
fix(engine): guard saved terrain and relief capabilities
giswqs Nov 15, 2026
357b986
fix(ci): validate project fixtures with the custom file extension
giswqs Nov 15, 2026
88da0e5
fix(engine): preserve field identity and validate deferred terrain
giswqs Nov 15, 2026
366f3e5
Merge remote-tracking branch 'origin/main' into sweep/engine-correctn…
giswqs Nov 15, 2026
eb7a0a8
Merge branch 'main' into sweep/engine-correctness-2026-11-15
giswqs Nov 15, 2026
53f38c8
fix(engine): report ignored names for converted layer parts
giswqs Nov 15, 2026
6b658f0
Merge remote-tracking branch 'origin/sweep/engine-correctness-2026-11…
giswqs Nov 15, 2026
6bcd7b6
fix(engine): report public query options lost with credentials
giswqs Nov 15, 2026
97263e4
Address field recovery, terrain state and query privacy review
giswqs Nov 15, 2026
275777c
Merge remote-tracking branch 'origin/main' into sweep/engine-correctn…
giswqs Nov 15, 2026
8e81106
fix: retain terrain test compatibility and reject incomplete legacy o…
giswqs Nov 15, 2026
a5ffce6
fix(engine): keep field return and terrain maintenance ownership narrow
giswqs Nov 15, 2026
7ccb510
fix(engine): preserve terrain bounds after an authorized scoped undo
giswqs Nov 15, 2026
39e50c4
docs: clarify offline area identity compatibility
giswqs Nov 15, 2026
7f9e082
test: recognize the item output parameter dispatcher
giswqs Nov 15, 2026
c1cf6a4
fix(engine): exclude declared query keys from public omissions
giswqs Nov 15, 2026
3b2e832
style: format query credential notice regression
giswqs Nov 15, 2026
157df07
Merge remote-tracking branch 'origin/main' into sweep/engine-correctn…
giswqs Nov 15, 2026
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
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ repos:
name: fixture projects match the project schema
files: ^schema/fixtures/.*\.rgis$
types: [file]
# The upstream JSON/YAML tags do not recognize our .rgis extension.
types_or: []
args: ["--schemafile", "schema/project.schema.json", "--default-filetype", "json"]
- repo: local
hooks:
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions crates/engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ url = { workspace = true }
proptest = { workspace = true }

# Time slider animations as GIFs (exported by the desktop app only).
Comment thread
giswqs marked this conversation as resolved.
Resolved
[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { version = "0.4", features = ["wasm_js"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
getrandom = "0.4"
image = { workspace = true, features = ["gif"] }

# The live PostGIS tests make their own tables, and change rows as someone else would.
Expand Down
27 changes: 23 additions & 4 deletions crates/engine/src/cmd/connections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ fn new(s: &mut Session, p: &Value) -> CmdResult {
..Connection::default()
};
login_fields(p, &mut c)?;
let key_hint = (c.auth.trim().is_empty() || c.auth.trim().eq_ignore_ascii_case("query")).then(|| c.key_name.trim().to_string());
let explicit = !c.name.trim().is_empty();
let redactions = s.connections.redaction_counts();
let (c, stripped) = s.connections.add(c, explicit)?;
Expand All @@ -215,19 +216,20 @@ fn new(s: &mut Session, p: &Value) -> CmdResult {
}
resolve_keys(s, &address_keys(&c.address));
resolve_origins(s, &[&c]);
Ok(shown_stripped(s, &c, stripped, ps(p, "address").unwrap_or("")))
Ok(shown_stripped(s, &c, stripped, ps(p, "address").unwrap_or(""), key_hint.as_deref()))
}

/// A connection as `shown` gives it, and what was left out of its address: `stripped`, and the
/// names of the key parameters (`strippedParameters`, no values) a query login could send, when
/// it isn't one already. What was left out is also said as a notice, so the CLI and Python hear
/// it as the app does.
fn shown_stripped(s: &mut Session, c: &Connection, stripped: bool, given: &str) -> Value {
fn shown_stripped(s: &mut Session, c: &Connection, stripped: bool, given: &str, key_hint: Option<&str>) -> Value {
use crate::notice_text::NoticeText;
let mut out = shown(s, c);
if stripped {
out["stripped"] = json!(true);
let names = if c.auth == "query" { Vec::new() } else { crate::connections::stripped_parameters(given, &c.address) };
let names =
if c.auth == "query" { Vec::new() } else { crate::connections::stripped_parameters_with_hint(given, &c.address, key_hint) };
let said = if names.is_empty() {
NoticeText::format("A password or token in the address was left out of the saved connection definition.", [])
} else {
Expand All @@ -237,6 +239,22 @@ fn shown_stripped(s: &mut Session, c: &Connection, stripped: bool, given: &str)
)
};
s.notify_text(said, false);
let (count, collateral) = crate::connections::collateral_parameters(given, &c.address, key_hint);
if count > 0 {
let args = [
("connection", crate::project::short_name(&c.name).into()),
("count", count.to_string().into()),
("names", collateral.join(", ").into()),
];
let text = if collateral.is_empty() {
"Connection '{connection}': {count} public query component(s) were also left out with credential-bearing pairs; use ampersand separators to keep public options"
} else {
"Connection '{connection}': {count} public query component(s) were also left out with credential-bearing pairs (first names: {names}); use ampersand separators to keep public options"
};
s.notify_text(NoticeText::format(text, args), false);
out["omittedPublicParameterCount"] = json!(count);
out["omittedPublicParameters"] = json!(collateral);
}
if !names.is_empty() {
out["strippedParameters"] = json!(names);
}
Expand Down Expand Up @@ -270,6 +288,7 @@ fn edit(s: &mut Session, p: &Value) -> CmdResult {
c.options = options(v)?;
}
login_fields(p, &mut c)?;
let key_hint = (c.auth.trim().is_empty() || c.auth.trim().eq_ignore_ascii_case("query")).then(|| c.key_name.trim().to_string());
// Validate everything, then locate the commit target before touching the store.
let (mut prepared, stripped) = s.connections.prepare_update(&old.id, c)?;
let database_changed = DATABASE_KINDS.contains(&old.kind.as_str()) && old.address != prepared.address;
Expand Down Expand Up @@ -325,7 +344,7 @@ fn edit(s: &mut Session, p: &Value) -> CmdResult {
s3::disconnect(&c.name);
}
}
Ok(shown_stripped(s, &c, stripped, ps(p, "address").unwrap_or("")))
Ok(shown_stripped(s, &c, stripped, ps(p, "address").unwrap_or(""), key_hint.as_deref()))
}

fn duplicate(s: &mut Session, p: &Value) -> CmdResult {
Expand Down
5 changes: 4 additions & 1 deletion crates/engine/src/cmd/design.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,10 @@ fn subtypes(s: &mut Session, p: &Json) -> CmdResult {
let base = l.renderer.base_symbol();
// The classes come from every feature, so a definition query doesn't drop any; the
// features past them are counted among those it lets through, which are drawn.
let (r, rest) = rustgis_map::Renderer::unique_counted(&l.dataset, &[], &fname, rustgis_map::Ramp::default(), base)?;
let (mut r, rest) = rustgis_map::Renderer::unique_counted(&l.dataset, &[], &fname, rustgis_map::Ramp::default(), base)?;
if l.no_fill == Some(rustgis_map::NoFill::Symbols) {
r.map_symbols(super::layer::show_fill);
}
let rows = l.visible_rows();
past = PastClasses { features: drawn_past(&l.dataset, &r, &fname, &rows), ..rest };
l.renderer = r;
Expand Down
Loading
Loading