From dcfaf89aadd5b49795403ad6517db49b32cc5d33 Mon Sep 17 00:00:00 2001
From: Taku Fukada <naninunenor@gmail.com>
Date: Tue, 19 Dec 2023 10:20:45 +0900
Subject: [PATCH] hotfix for #82

---
 nusamai-plateau/examples/parse.rs           |  2 +-
 nusamai-plateau/src/models/cityfurniture.rs |  4 ++--
 nusamai-plateau/src/models/iur/uro/mod.rs   | 10 ++++++++--
 nusamai/src/source/citygml.rs               |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/nusamai-plateau/examples/parse.rs b/nusamai-plateau/examples/parse.rs
index ae69234af..2f33a54b2 100644
--- a/nusamai-plateau/examples/parse.rs
+++ b/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();
 
diff --git a/nusamai-plateau/src/models/cityfurniture.rs b/nusamai-plateau/src/models/cityfurniture.rs
index 5953c9487..247cd4dc4 100644
--- a/nusamai-plateau/src/models/cityfurniture.rs
+++ b/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>,
 }
diff --git a/nusamai-plateau/src/models/iur/uro/mod.rs b/nusamai-plateau/src/models/iur/uro/mod.rs
index 8e9b01990..f0652f384 100644
--- a/nusamai-plateau/src/models/iur/uro/mod.rs
+++ b/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::*;
diff --git a/nusamai/src/source/citygml.rs b/nusamai/src/source/citygml.rs
index 93659d9b6..5ccc6d332 100644
--- a/nusamai/src/source/citygml.rs
+++ b/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();