define many models

MIERUNE · Dec 29, 2023 · b8e2f3d · b8e2f3d
1 parent 3ce0640
commit b8e2f3d
Show file tree

Hide file tree

Showing 26 changed files with 13,783 additions and 237 deletions.
diff --git a/nusamai-citygml/macros/src/derive.rs b/nusamai-citygml/macros/src/derive.rs
@@ -170,7 +170,7 @@ fn generate_citygml_impl_for_struct(
                     add_arm(2, b"lod2Geometry", "Geometry"); // only in CityGML 2.0
                     add_arm(3, b"lod3Geometry", "Geometry"); // only in CityGML 2.0
                     add_arm(4, b"lod4Geometry", "Geometry"); // only in CityGML 2.0
-                    add_arm(1, b"tin", "Triangulated");
+                    add_arm(0, b"tin", "Triangulated");
 
                     geom_into_object_expr = quote! {
                         Some(self.#field_ident)

diff --git a/nusamai-plateau/src/models/building.rs b/nusamai-plateau/src/models/building.rs
diff --git a/nusamai-plateau/src/models/cityfurniture.rs b/nusamai-plateau/src/models/cityfurniture.rs
@@ -12,23 +12,23 @@ pub struct CityFurniture {
     #[citygml(path = b"frn:usage")]
     pub usage: Vec<Code>,
 
-    #[citygml(path = b"uro:cityFurnitureDetailAttribute")]
-    pub city_furniture_detail_attribute: Vec<uro::CityFurnitureDetailAttribute>,
-
     #[citygml(
         path = b"uro:cityFurnitureDataQualityAttribute/uro:CityFurnitureDataQualityAttribute"
     )]
     pub city_furniture_data_quality_attribute: Option<uro::CityFurnitureDataQualityAttribute>,
 
-    #[citygml(path = b"uro:frnFacilityTypeAttribute")]
-    pub frn_facility_type_attribute: Vec<uro::FacilityTypeAttribute>,
+    #[citygml(path = b"uro:cityFurnitureDetailAttribute/uro:CityFurnitureDetailAttribute")]
+    pub city_furniture_detail_attribute: Vec<uro::CityFurnitureDetailAttribute>,
 
-    #[citygml(path = b"uro:frnFacilityIdAttribute")]
-    pub frn_facility_id_attribute: Option<uro::FacilityIdAttribute>,
+    #[citygml(path = b"uro:frnDmAttribute")]
+    pub frn_dm_attribute: Vec<uro::DmAttributeProperty>, // -> uro:DmAttribute
 
     #[citygml(path = b"uro:frnFacilityAttribute")]
-    pub frn_facility_attribute: Vec<uro::FacilityAttributeProperty>,
+    pub frn_facility_attribute: Vec<uro::FacilityAttributeProperty>, // -> uro:FacilityAttribute
 
-    #[citygml(path = b"uro:frnDmAttribute")]
-    pub frn_dm_attribute: Vec<uro::DmAttributeProperty>,
+    #[citygml(path = b"uro:frnFacilityIdAttribute")]
+    pub frn_facility_id_attribute: Option<uro::FacilityIdAttributeProperty>, // -> uro:FacilityIdAttribute
+
+    #[citygml(path = b"uro:frnFacilityTypeAttribute/uro:FacilityTypeAttribute")]
+    pub frn_facility_type_attribute: Vec<uro::FacilityTypeAttribute>,
 }
diff --git a/nusamai-plateau/src/models/core.rs b/nusamai-plateau/src/models/core.rs
@@ -0,0 +1,6 @@
+use nusamai_citygml::citygml_data;
+
+#[citygml_data(name = "core:Address")]
+pub struct Address {
+    // TODO
+}
diff --git a/nusamai-plateau/src/models/iur/urf/landslide.rs b/nusamai-plateau/src/models/iur/urf/landslide.rs
diff --git a/nusamai-plateau/src/models/iur/urf/mod.rs b/nusamai-plateau/src/models/iur/urf/mod.rs
@@ -1,5 +1,5 @@
 //! Urban Object Module
 
-mod landslide;
+mod zone;
 
-pub use landslide::*;
+pub use zone::*;