Skip to content

Commit

Permalink
地下街モデルのuro:BuildingDataQualityAttributeの対応 (#694)
Browse files Browse the repository at this point in the history
<!-- Close or Related Issues -->
Close #0

### What I did(変更内容)
<!-- Please describe the motivation behind this PR and the changes it
introduces. -->
<!-- どのような変更をしますか? 目的は? -->

- 竹芝の地下街モデルの対応
  - uro:BuildingDataQualityAttributeの定義の追加
  - uro:bldgDataQualityAttributeの定義の追加
- shp変換時の属性名の短縮定義を追加

対象のファイル
```
53393690_ubld_6697_40_op.gml
53393690_ubld_6697_41_op.gml
53393690_ubld_6697_42_op.gml
```


### Notes(連絡事項)
<!-- If manual testing is required, please describe the procedure. -->
<!-- 手動での動作確認が必要なら手順を簡単に伝えてください。そのほか連絡事項など。 -->

None / なし
  • Loading branch information
satoshi7190 authored Jan 27, 2025
1 parent 561163a commit 387960c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
21 changes: 21 additions & 0 deletions nusamai-plateau/src/models/iur/uro/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,27 @@ pub struct DataQualityAttribute {

#[citygml(path = b"uro:publicSurveyDataQualityAttribute/uro:PublicSurveyDataQualityAttribute")]
pub public_survey_data_quality_attribute: Option<PublicSurveyDataQualityAttribute>,

#[citygml(path = b"uro:BuildingDataQualityAttribute")]
pub building_data_quality_attribute: Option<BuildingDataQualityAttribute>,
}

#[citygml_data(name = "uro:BuildingDataQualityAttribute")]
pub struct BuildingDataQualityAttribute {
#[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:appearanceSrcDesc")]
pub appearance_src_desc: Vec<Code>,

#[citygml(path = b"uro:lod1HeightType")]
pub lod1_height_type: Option<Code>,

#[citygml(path = b"uro:lodType")]
pub lod_type: Vec<Code>,
}

#[citygml_data(name = "uro:PublicSurveyDataQualityAttribute")]
Expand Down
3 changes: 3 additions & 0 deletions nusamai-plateau/src/models/iur/uro/underground_building.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ pub struct UndergroundBuilding {
#[citygml(path = b"uro:bldgDataQualityAttribute/uro:DataQualityAttribute")]
pub bldg_data_quality_attribute: Option<uro::DataQualityAttribute>,

#[citygml(path = b"uro:buildingDataQualityAttribute")]
pub building_data_quality_attribute: Option<uro::DataQualityAttribute>,

#[citygml(path = b"uro:buildingDisasterRiskAttribute")]
#[citygml(path = b"uro:bldgDisasterRiskAttribute")]
pub bldg_disaster_risk_attribute: Vec<uro::DisasterRiskAttributeProperty>, // -> uro:DisasterRiskAttribute
Expand Down
2 changes: 1 addition & 1 deletion nusamai-plateau/src/models/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub enum TopLevelCityObject {
// i-UR urban objects
//
#[citygml(path = b"uro:UndergroundBuilding")]
UndergroundBuilding(uro::UndergroundBuilding),
UndergroundBuilding(Box<uro::UndergroundBuilding>),
#[citygml(path = b"uro:Appurtenance")]
Appurtenance(uro::Appurtenance),
#[citygml(path = b"uro:Cable")]
Expand Down
2 changes: 2 additions & 0 deletions nusamai/src/transformer/transform/shp_field_dict.json
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,8 @@
"frnKeyValuePairAttribute": "frnKVPair",
"tranKeyValuePairAttribute": "tranKVPair",
"tranUsecaseAttribute": "tranUC",
"BuildingDataQualityAttribute": "bldgDQual",
"bldgDataQualityAttribute": "bldgDQual",
"geometrySrcDescLod0": "geomSrcDL0",
"geometrySrcDescLod1": "geomSrcDL1",
"geometrySrcDescLod2": "geomSrcDL2",
Expand Down

0 comments on commit 387960c

Please sign in to comment.