PLATEAU V4に対応

nusamai-plateau/src/models/iur/uro/common.rs

@@ -14,6 +14,26 @@ pub struct DataQualityAttribute {
     #[citygml(path = b"uro:appearanceSrcDesc")]
     pub appearance_src_desc: Vec<Code>,
 
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:geometrySrcDescLod0")]
+    pub geometry_src_desc_lod0: Vec<Code>,
+
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:geometrySrcDescLod1", required)]
+    pub geometry_src_desc_lod1: Vec<Code>,
+
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:geometrySrcDescLod2")]
+    pub geometry_src_desc_lod2: Vec<Code>,
+
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:geometrySrcDescLod3")]
+    pub geometry_src_desc_lod3: Vec<Code>,
+
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:geometrySrcDescLod4")]
+    pub geometry_src_desc_lod4: Vec<Code>,
+
     #[citygml(path = b"uro:geometrySrcDesc0")]
     pub geometry_src_desc0: Vec<Code>,
 

nusamai-plateau/src/models/iur/uro/dem.rs

@@ -0,0 +1,10 @@
+use nusamai_citygml::{citygml_feature, CityGmlElement};
+
+use super::common::DataQualityAttribute;
+
+#[allow(non_camel_case_types)]
+#[citygml_feature(name = "uro:demDataQualityAttribute")]
+pub struct demDataQualityAttribute {
+    #[citygml(path = b"uro:DataQualityAttribute", required)]
+    pub data_quality_attribute: Option<DataQualityAttribute>,
+}

nusamai-plateau/src/models/iur/uro/mod.rs

@@ -4,6 +4,7 @@ mod bridge;
 mod building;
 mod city_furniture;
 mod common;
+mod dem;
 mod disaster_risk;
 mod dm;
 mod facility;
@@ -24,6 +25,7 @@ pub use bridge::*;
 pub use building::*;
 pub use city_furniture::*;
 pub use common::*;
+pub use dem::*;
 pub use disaster_risk::*;
 pub use dm::*;
 pub use facility::*;

nusamai-plateau/src/models/relief.rs

@@ -11,6 +11,10 @@ pub struct ReliefFeature {
 
     #[citygml(path = b"dem:reliefComponent", required)]
     pub relief_component: Vec<ReliefComponentProperty>, // -> dem:_ReliefComponent
+
+    // PLATEAU 4.x
+    #[citygml(path = b"uro:demDataQualityAttribute", required)]
+    pub dem_data_quality_attribute: Option<uro::demDataQualityAttribute>,
 }
 
 #[citygml_property(name = "dem:_ReliefComponentProperty")]

nusamai/src/sink/cesiumtiles/gltf.rs

@@ -238,7 +238,7 @@
             .extensions
             .as_ref()
             .and_then(|ext| ext.ext_texture_webp.as_ref())
-            .map_or(false, |_| true)
+            .is_some_and(|_| true)
     });
 
     let extensions_used = {

nusamai/src/transformer/transform/shp_field_dict.json

@@ -863,5 +863,18 @@
   "bldgUsecaseAttribute": "bldgUC",
   "frnKeyValuePairAttribute": "frnKVPair",
   "tranKeyValuePairAttribute": "tranKVPair",
-  "tranUsecaseAttribute": "tranUC"
+  "tranUsecaseAttribute": "tranUC",
+  "geometrySrcDescLod0": "geomSrcDL0",
+  "geometrySrcDescLod1": "geomSrcDL1",
+  "geometrySrcDescLod2": "geomSrcDL2",
+  "geometrySrcDescLod3": "geomSrcDL3",
+  "geometrySrcDescLod4": "geomSrcDL4",
+  "DataQualityAttribute": "dataQual",
+  "demDataQualityAttribute": "demDQual",
+  "wtrDataQualityAttribute": "wtrDQual",
+  "wtrKeyValuePairAttribute": "wtrKVPair",
+  "dataQualityAttribute": "dataQual",
+  "urbanParkAttribute": "urbPark",
+  "luseKeyValuePairAttribute": "luseKVPair",
+  "vegKeyValuePairAttribute": "vegKVPair"
 }