Fix for #82 (#83)

#82 でマージを失敗して main のビルドが通らない状態になっています。修正します。

nusamai-plateau/examples/parse.rs

@@ -20,7 +20,7 @@ fn example_toplevel_dispatcher<R: BufRead>(
 
     match st.parse_children(|st| match st.current_path() {
         b"core:cityObjectMember" => {
-            let mut cityobj: nusamai_plateau::models::CityObject = Default::default();
+            let mut cityobj: nusamai_plateau::models::TopLevelCityObject = Default::default();
             cityobj.parse(st)?;
             let geometries = st.collect_geometries();
 

nusamai-plateau/src/models/cityfurniture.rs

@@ -49,8 +49,8 @@ pub struct CityFurniture {
     pub frn_facility_id_attribute: Option<uro::FacilityIdAttribute>,
 
     #[citygml(path = b"uro:frnFacilityAttribute")]
-    pub frn_facility_attribute: Vec<uro::FacilityAttribute>,
+    pub frn_facility_attribute: Vec<uro::FacilityAttributeProperty>,
 
     #[citygml(path = b"uro:frnDmAttribute")]
-    pub frn_dm_attribute: Vec<uro::DmAttribute>,
+    pub frn_dm_attribute: Vec<uro::DmAttributeProperty>,
 }

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

@@ -1,13 +1,19 @@
 //! Urban Object Module
 
 mod city_furniture;
-mod common;
+mod dm;
+mod facility;
+mod facility_id;
+mod facility_type;
 mod other_construction;
 mod underground_building;
 mod utility_network;
 
 pub use city_furniture::*;
-pub use common::*;
+pub use dm::*;
+pub use facility::*;
+pub use facility_id::*;
+pub use facility_type::*;
 pub use other_construction::*;
 pub use underground_building::*;
 // pub use utility_network::*;

nusamai/src/source/citygml.rs

@@ -71,7 +71,7 @@ fn toplevel_dispatcher<R: BufRead>(
                 Ok(())
             }
             b"core:cityObjectMember" => {
-                let mut cityobj: nusamai_plateau::models::CityObject = Default::default();
+                let mut cityobj: nusamai_plateau::models::TopLevelCityObject = Default::default();
                 cityobj.parse(st)?;
                 let geometries = st.collect_geometries();