From 80c023030cc3c76cbe7c42fd3c328d76cb1dc518 Mon Sep 17 00:00:00 2001 From: satoshi komatsu <84182110+satoshi7190@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:36:00 +0900 Subject: [PATCH 1/2] Upgrade libwebkit2gt (#695) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #0 ### What I did（変更内容） - actionsのTest Librariesが動くように修正 ### Notes（連絡事項） None / なし --- .github/workflows/test_libs.yml | 2 +- nusamai/src/sink/cesiumtiles/gltf.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_libs.yml b/.github/workflows/test_libs.yml index 747d7b1c..88e7f38a 100644 --- a/.github/workflows/test_libs.yml +++ b/.github/workflows/test_libs.yml @@ -33,7 +33,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt install -y libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov - name: Test diff --git a/nusamai/src/sink/cesiumtiles/gltf.rs b/nusamai/src/sink/cesiumtiles/gltf.rs index d711c72f..43e30040 100644 --- a/nusamai/src/sink/cesiumtiles/gltf.rs +++ b/nusamai/src/sink/cesiumtiles/gltf.rs @@ -238,7 +238,7 @@ pub fn write_gltf_glb( .extensions .as_ref() .and_then(|ext| ext.ext_texture_webp.as_ref()) - .map_or(false, |_| true) + .is_some_and(|_| true) }); let extensions_used = { From 561163aef98e4969735ac43c1917ccbc249d5f67 Mon Sep 17 00:00:00 2001 From: satoshi komatsu <84182110+satoshi7190@users.noreply.github.com> Date: Fri, 24 Jan 2025 21:17:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?PLATEAU=20V4=E3=81=AB=E5=AF=BE=E5=BF=9C=20(?= =?UTF-8?q?#691)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #686 ### What I did（変更内容） - タイトルの通り - v4で追加されたschemaの定義を追加 - shp変換時の属性名の短縮定義を追加 ### Notes（連絡事項） 確認時に実行したコマンド ``` cargo run --sink -t use_lod=max_lod --output ``` - v4テストデータの　bldg、dem、fld、frn、lsld、tran、urf、vegのデータで全てのsinkで動作を確認済み - 使用したテストデータはテクスチャが存在しないため、テクスチャ付きの変換の確認はできていない --- nusamai-plateau/src/models/iur/uro/common.rs | 20 +++++++++++++++++++ nusamai-plateau/src/models/iur/uro/dem.rs | 10 ++++++++++ nusamai-plateau/src/models/iur/uro/mod.rs | 2 ++ nusamai-plateau/src/models/relief.rs | 4 ++++ .../transformer/transform/shp_field_dict.json | 15 +++++++++++++- 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 nusamai-plateau/src/models/iur/uro/dem.rs diff --git a/nusamai-plateau/src/models/iur/uro/common.rs b/nusamai-plateau/src/models/iur/uro/common.rs index 0e34aa24..5e0478d1 100644 --- a/nusamai-plateau/src/models/iur/uro/common.rs +++ b/nusamai-plateau/src/models/iur/uro/common.rs @@ -14,6 +14,26 @@ pub struct DataQualityAttribute { #[citygml(path = b"uro:appearanceSrcDesc")] pub appearance_src_desc: Vec, + // PLATEAU 4.x + #[citygml(path = b"uro:geometrySrcDescLod0")] + pub geometry_src_desc_lod0: Vec, + + // PLATEAU 4.x + #[citygml(path = b"uro:geometrySrcDescLod1", required)] + pub geometry_src_desc_lod1: Vec, + + // PLATEAU 4.x + #[citygml(path = b"uro:geometrySrcDescLod2")] + pub geometry_src_desc_lod2: Vec, + + // PLATEAU 4.x + #[citygml(path = b"uro:geometrySrcDescLod3")] + pub geometry_src_desc_lod3: Vec, + + // PLATEAU 4.x + #[citygml(path = b"uro:geometrySrcDescLod4")] + pub geometry_src_desc_lod4: Vec, + #[citygml(path = b"uro:geometrySrcDesc0")] pub geometry_src_desc0: Vec, diff --git a/nusamai-plateau/src/models/iur/uro/dem.rs b/nusamai-plateau/src/models/iur/uro/dem.rs new file mode 100644 index 00000000..238c4fd7 --- /dev/null +++ b/nusamai-plateau/src/models/iur/uro/dem.rs @@ -0,0 +1,10 @@ +use nusamai_citygml::{citygml_feature, CityGmlElement}; + +use super::common::DataQualityAttribute; + +#[allow(non_camel_case_types)] +#[citygml_feature(name = "uro:demDataQualityAttribute")] +pub struct demDataQualityAttribute { + #[citygml(path = b"uro:DataQualityAttribute", required)] + pub data_quality_attribute: Option, +} diff --git a/nusamai-plateau/src/models/iur/uro/mod.rs b/nusamai-plateau/src/models/iur/uro/mod.rs index e78e1ee4..2fe5bc6d 100644 --- a/nusamai-plateau/src/models/iur/uro/mod.rs +++ b/nusamai-plateau/src/models/iur/uro/mod.rs @@ -4,6 +4,7 @@ mod bridge; mod building; mod city_furniture; mod common; +mod dem; mod disaster_risk; mod dm; mod facility; @@ -24,6 +25,7 @@ pub use bridge::*; pub use building::*; pub use city_furniture::*; pub use common::*; +pub use dem::*; pub use disaster_risk::*; pub use dm::*; pub use facility::*; diff --git a/nusamai-plateau/src/models/relief.rs b/nusamai-plateau/src/models/relief.rs index 6ecd67f7..9c6f5b02 100644 --- a/nusamai-plateau/src/models/relief.rs +++ b/nusamai-plateau/src/models/relief.rs @@ -11,6 +11,10 @@ pub struct ReliefFeature { #[citygml(path = b"dem:reliefComponent", required)] pub relief_component: Vec, // -> dem:_ReliefComponent + + // PLATEAU 4.x + #[citygml(path = b"uro:demDataQualityAttribute", required)] + pub dem_data_quality_attribute: Option, } #[citygml_property(name = "dem:_ReliefComponentProperty")] diff --git a/nusamai/src/transformer/transform/shp_field_dict.json b/nusamai/src/transformer/transform/shp_field_dict.json index 3b18f0ef..f5e06957 100644 --- a/nusamai/src/transformer/transform/shp_field_dict.json +++ b/nusamai/src/transformer/transform/shp_field_dict.json @@ -863,5 +863,18 @@ "bldgUsecaseAttribute": "bldgUC", "frnKeyValuePairAttribute": "frnKVPair", "tranKeyValuePairAttribute": "tranKVPair", - "tranUsecaseAttribute": "tranUC" + "tranUsecaseAttribute": "tranUC", + "geometrySrcDescLod0": "geomSrcDL0", + "geometrySrcDescLod1": "geomSrcDL1", + "geometrySrcDescLod2": "geomSrcDL2", + "geometrySrcDescLod3": "geomSrcDL3", + "geometrySrcDescLod4": "geomSrcDL4", + "DataQualityAttribute": "dataQual", + "demDataQualityAttribute": "demDQual", + "wtrDataQualityAttribute": "wtrDQual", + "wtrKeyValuePairAttribute": "wtrKVPair", + "dataQualityAttribute": "dataQual", + "urbanParkAttribute": "urbPark", + "luseKeyValuePairAttribute": "luseKVPair", + "vegKeyValuePairAttribute": "vegKVPair" } \ No newline at end of file