PLATEAUモデル: 都市設備（CityFurniture）の実装 - 続き

nusamai-plateau/citygml/src/values.rs

@@ -4,6 +4,8 @@ use crate::CityGMLElement;
 pub use chrono::NaiveDate;
 use std::io::BufRead;
 
+pub type Date = chrono::NaiveDate;
+
 impl CityGMLElement for String {
     #[inline]
     fn parse<R: BufRead>(&mut self, st: &mut SubTreeReader<R>) -> Result<(), ParseError> {
@@ -166,11 +168,11 @@ impl CityGMLElement for Measure {
     }
 }
 
-impl CityGMLElement for NaiveDate {
+impl CityGMLElement for Date {
     #[inline]
     fn parse<R: BufRead>(&mut self, st: &mut SubTreeReader<R>) -> Result<(), ParseError> {
         let text = st.parse_text()?;
-        match NaiveDate::parse_from_str(text, "%Y-%m-%d") {
+        match Date::parse_from_str(text, "%Y-%m-%d") {
             Ok(v) => {
                 *self = v;
                 Ok(())

nusamai-plateau/src/models/cityfurniture.rs

@@ -1,4 +1,5 @@
-use citygml::{CityGMLElement, Code, GeometryRef};
+use super::iur::uro;
+use citygml::{CityGMLElement, Code, Date, GeometryRef};
 
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Default, Debug, CityGMLElement)]
@@ -9,6 +10,21 @@ pub struct CityFurniture {
     #[citygml(path = b"@gml:id")]
     id: Option<String>,
 
+    #[citygml(path = b"gml:identifier")]
+    identifier: Option<String>,
+
+    #[citygml(path = b"gml:name")]
+    name: Option<String>,
+
+    #[citygml(path = b"gml:description")]
+    description: Option<String>,
+
+    #[citygml(path = b"core:creationDate")]
+    creation_date: Option<Date>,
+
+    #[citygml(path = b"core:terminationDate")]
+    termination_date: Option<Date>,
+
     #[citygml(path = b"frn:class")]
     pub class: Option<Code>,
 
@@ -17,4 +33,24 @@ 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:frnFacilityIdAttribute")]
+    pub frn_facility_id_attribute: Option<uro::FacilityIdAttribute>,
+
+    #[citygml(path = b"uro:frnFacilityAttribute")]
+    pub frn_facility_attribute: Vec<uro::FacilityAttribute>,
+
+    #[citygml(path = b"uro:frnDmAttribute")]
+    pub frn_dm_attribute: Vec<uro::DmAttribute>,
 }

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

@@ -1,6 +1,5 @@
-pub mod landslide;
-pub mod underground_building;
-pub mod utility_network;
+//! i-UR (i-Urban Revitalization) Urban Planning ADE
+//!
 
-pub use landslide::SedimentDisasterProneArea;
-pub use underground_building::UndergroundBuilding;
+pub mod urf;
+pub mod uro;

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

@@ -0,0 +1,5 @@
+//! Urban Object Module
+
+mod landslide;
+
+pub use landslide::*;

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

@@ -0,0 +1,30 @@
+use citygml::{CityGMLElement, Code};
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct CityFurnitureDetailAttribute {
+    #[citygml(path = b"uro:facilityType")]
+    pub facility_type: Option<Code>,
+
+    #[citygml(path = b"uro:description")]
+    pub description: Option<String>,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct CityFurnitureDataQualityAttribute {
+    #[citygml(path = b"uro:srcScale")]
+    pub src_scale: Vec<Code>,
+
+    #[citygml(path = b"uro:geometrySrcDesc")]
+    pub geometry_src_desc: Vec<Code>,
+
+    #[citygml(path = b"uro:thematicSrcDesc")]
+    pub thematic_src_desc: Vec<Code>,
+
+    #[citygml(path = b"uro:appearanceSrcDesc")]
+    pub appearance_src_desc: Vec<Code>,
+
+    #[citygml(path = b"uro:lodType")]
+    pub lod_type: Option<String>, // TODO: uro:CityFurnitureLODType(enumerations)
+}

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

@@ -0,0 +1,65 @@
+use citygml::{CityGMLElement, Code};
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct FacilityTypeAttribute {
+    #[citygml(path = b"uro:class")]
+    pub class: Option<Code>,
+
+    #[citygml(path = b"uro:function")]
+    pub function: Vec<Code>,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct FacilityIdAttribute {
+    #[citygml(path = b"uro:id")]
+    pub id: Option<String>,
+
+    #[citygml(path = b"uro:partId")]
+    pub part_id: Option<String>,
+
+    #[citygml(path = b"uro:branchId")]
+    pub branch_id: Option<String>,
+
+    #[citygml(path = b"uro:prefecture")]
+    pub prefecture: Vec<Code>,
+
+    #[citygml(path = b"uro:city")]
+    pub city: Vec<Code>,
+
+    #[citygml(path = b"uro:route")]
+    pub route: Option<String>,
+
+    #[citygml(path = b"uro:startPost")]
+    pub start_post: Option<String>,
+
+    #[citygml(path = b"uro:endPost")]
+    pub end_post: Option<String>,
+
+    #[citygml(path = b"uro:startLat")]
+    pub start_lat: Option<f64>,
+
+    #[citygml(path = b"uro:startLong")]
+    pub start_long: Option<f64>,
+
+    #[citygml(path = b"uro:alternativeName")]
+    pub alternative_name: Vec<String>,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct DmAttribute {
+    #[citygml(path = b"uro:dmCode")]
+    pub dm_code: Code,
+
+    #[citygml(path = b"uro:meshCode")]
+    pub mesh_code: Vec<Code>,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, CityGMLElement)]
+pub struct FacilityAttribute {
+    #[citygml(path = b"uro:facilityId")]
+    pub facility_id: Option<String>,
+}

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

@@ -0,0 +1,13 @@
+//! Urban Object Module
+
+mod city_furniture;
+mod common;
+mod other_construction;
+mod underground_building;
+mod utility_network;
+
+pub use city_furniture::*;
+pub use common::*;
+pub use other_construction::*;
+pub use underground_building::*;
+// pub use utility_network::*;

nusamai-plateau/src/models/mod.rs

@@ -5,7 +5,6 @@ pub mod cityobjectgroup;
 pub mod generics;
 pub mod iur;
 pub mod landuse;
-pub mod other_construction;
 pub mod relief;
 pub mod transportation;
 pub mod tunnel;
@@ -17,10 +16,9 @@ pub use building::Building;
 pub use cityfurniture::CityFurniture;
 pub use cityobjectgroup::CityObjectGroup;
 pub use generics::GenericCityObject;
-pub use iur::landslide::SedimentDisasterProneArea;
-pub use iur::underground_building::UndergroundBuilding;
+pub use iur::urf;
+pub use iur::uro;
 pub use landuse::LandUse;
-pub use other_construction::OtherConstruction;
 pub use relief::ReliefFeature;
 pub use transportation::{Railway, Road, Square, Track, Waterway};
 pub use tunnel::Tunnel;
@@ -77,14 +75,14 @@ pub enum CityObject {
     // i-UR urban objects
     //
     #[citygml(path = b"uro:OtherConstruction")]
-    OtherConstruction(OtherConstruction),
+    OtherConstruction(uro::OtherConstruction),
     #[citygml(path = b"uro:UndergroundBuilding")]
-    UndergroundBuilding(UndergroundBuilding),
+    UndergroundBuilding(uro::UndergroundBuilding),
     //
     // i-UR urban functions
     //
     #[citygml(path = b"urf:SedimentDisasterProneArea")]
-    SedimentDisasterProneArea(SedimentDisasterProneArea),
+    SedimentDisasterProneArea(urf::SedimentDisasterProneArea),
     //
     // and more ...
 }