merge with develop

Author: Ylannl

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Native GLB generation in Rust through `cityjson-convert`.
 - Optional intermediary tile materialization in CityJSONSeq format for debugging.
+- Opt-in `--include-parent-attributes` handling for 3DBAG/roofer-style parent-child datasets, copying inherited parent attributes onto geometry-bearing CityObjects before GLB export.
 - Support for regular CityJSON documents, CityJSONSeq documents, and the legacy CityJSONFeature-files as input, via the `cityjson-index` crate.
 - A `just ci-check` recipe and a GitHub Actions workflow that runs it.
 - ADRs and supporting documentation for the new `cityjson-index`/CityJSONSeq input model and grid traversal changes.

README.md

@@ -248,6 +248,15 @@ For example:
 
 `tyler … --object-attribute bouwjaar:int --object-attribute objectid:int --object-attribute bagpandid:string --object-attribute bgt_type:string`
 
+Some datasets, such as 3DBAG or roofer exports, store the attributes on a parent `Building`
+while the geometry lives on the child `BuildingPart`. In that case, enable
+`--include-parent-attributes` so Tyler copies inherited parent attributes onto the
+geometry-bearing child before GLB conversion.
+
+For example:
+
+`tyler … --object-type Building --object-type BuildingPart --include-parent-attributes`
+
 #### Colors
 
 Colors on the glTF features are set with the `--color-<cityobject type>` arguments.

justfile

@@ -28,8 +28,11 @@ test:
     cargo test --workspace --all-targets --all-features
 
 # Clean the workspace by removing all build artifacts and test artifacts.
-clean:
+clean: clean-output
     cargo clean
+
+# Clean the test output directories.
+clean-output:
     rm -rf tests/output
     rm -rf cityjson-convert/tests/output
 

src/cli.rs

@@ -103,6 +103,10 @@ pub struct Cli {
     /// Write the per-tile CityJSONFeature streams used for GLB conversion to output/inputs/.
     #[arg(long)]
     pub debug_tile_inputs: bool,
+    /// Copy inherited parent attributes onto geometry-bearing CityObjects before GLB conversion.
+    /// This is useful for 3DBAG/roofer-style parent-child models where attributes live on the parent.
+    #[arg(long)]
+    pub include_parent_attributes: bool,
     /// Maximum error that is allowed in mesh simplification to reduce the number of vertices. Value should be a float that represents that maximum allowed error in meters. Ignored for building object types.
     #[arg(long, default_value = "1.0")]
     pub simplification_max_error: Option<f64>,
@@ -363,6 +367,15 @@ mod tests {
         assert!(otypes.contains(&crate::parser::CityObjectType::PlantCover));
     }
 
+    #[test]
+    fn verify_include_parent_attributes_flag() {
+        let dataset_dir = legacy_dataset_dir();
+        let mut args = required_args(&dataset_dir);
+        args.push("--include-parent-attributes".to_string());
+        let cli = Cli::try_parse_from(args).unwrap();
+        assert!(cli.include_parent_attributes);
+    }
+
     #[test]
     fn verify_single_input_arg_for_dataset_root() {
         let cli = Cli::try_parse_from(dataset_args()).unwrap();