-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nusamai-plateau にテストが一切ないので、竹芝エリアの building を読み込んで、読み込まれた都市オブジェクト数などを確認するだけのテストを追加します。レグレッション防止程度の意味合い。 test coverageの上昇 → https://app.codecov.io/gh/MIERUNE/nusamai/pull/37
- Loading branch information
Showing
9 changed files
with
171 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| use chrono::NaiveDate; | ||
| use citygml::{CityGMLElement, CityGMLReader}; | ||
|
|
||
| #[test] | ||
| fn parse_date() { | ||
| #[derive(CityGMLElement, Default)] | ||
| struct Root { | ||
| #[citygml(path = b"date")] | ||
| date: Option<chrono::NaiveDate>, | ||
| } | ||
|
|
||
| let mut xml_reader = quick_xml::NsReader::from_reader(std::io::Cursor::new( | ||
| r#"<root><date>2019-03-21</date></root>"#, | ||
| )); | ||
| match CityGMLReader::new().start_root(&mut xml_reader) { | ||
| Ok(mut st) => { | ||
| let mut root = Root::default(); | ||
| root.parse(&mut st).unwrap(); | ||
| assert!(root.date.is_some()); | ||
| assert_eq!(root.date, NaiveDate::from_ymd_opt(2019, 3, 21)); | ||
| } | ||
| Err(e) => panic!("Err: {:?}", e), | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn parse_boolean() { | ||
| #[derive(CityGMLElement, Default)] | ||
| struct Root { | ||
| #[citygml(path = b"boolean")] | ||
| bools: Vec<bool>, | ||
| } | ||
|
|
||
| let mut xml_reader = quick_xml::NsReader::from_reader(std::io::Cursor::new( | ||
| r#" | ||
| <root> | ||
| <boolean>true</boolean> | ||
| <boolean>True</boolean> | ||
| <boolean>TRUE</boolean> | ||
| <boolean>1</boolean> | ||
| <boolean>false</boolean> | ||
| <boolean>False</boolean> | ||
| <boolean>FALSE</boolean> | ||
| <boolean>0</boolean> | ||
| </root> | ||
| "#, | ||
| )); | ||
| match CityGMLReader::new().start_root(&mut xml_reader) { | ||
| Ok(mut st) => { | ||
| let mut root = Root::default(); | ||
| root.parse(&mut st).unwrap(); | ||
| assert_eq!( | ||
| root.bools, | ||
| [true, true, true, true, false, false, false, false] | ||
| ); | ||
| } | ||
| Err(e) => panic!("Err: {:?}", e), | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| テスト用データ出典 | ||
|
|
||
| - 「3D都市モデル（Project PLATEAU）東京都23区 ポートシティ竹芝 建築物モデル（LOD4）（2022年度）」 (https://www.geospatial.jp/ckan/dataset/plateau-tokyo23ku-2023-lod4) | ||
|
|
||
| Project PLATEAUのサイトポリシーに従って、どなたでも、複製、公衆送信、翻訳・変形等の翻案等、自由に利用できます。商用利用も可能です。 (https://www.mlit.go.jp/plateau/site-policy/) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| use std::io::BufRead; | ||
|
|
||
| use citygml::{CityGMLElement, CityGMLReader, ParseError, SubTreeReader}; | ||
| use nusamai_plateau::models::CityObject; | ||
|
|
||
| #[derive(Default, Debug)] | ||
| struct Counter { | ||
| city_objects: usize, | ||
| appearances: usize, | ||
| multipolygons: usize, | ||
| buildings: usize, | ||
| cityobjectgroups: usize, | ||
| } | ||
|
|
||
| fn example_toplevel_dispatcher<R: BufRead>( | ||
| st: &mut SubTreeReader<R>, | ||
| ) -> Result<Counter, ParseError> { | ||
| let mut counter = Counter::default(); | ||
|
|
||
| match st.parse_children(|st| match st.current_path() { | ||
| b"core:cityObjectMember" => { | ||
| let mut cityobj: CityObject = Default::default(); | ||
| cityobj.parse(st)?; | ||
| match cityobj { | ||
| CityObject::Building(_) => counter.buildings += 1, | ||
| CityObject::CityObjectGroup(_) => counter.cityobjectgroups += 1, | ||
| e => panic!("Unexpected city object type: {:?}", e), | ||
| } | ||
| let geometries = st.collect_geometries(); | ||
| counter.city_objects += 1; | ||
| counter.multipolygons += geometries.multipolygon.len(); | ||
| Ok(()) | ||
| } | ||
| b"gml:boundedBy" => { | ||
| st.skip_current_element()?; | ||
| Ok(()) | ||
| } | ||
| b"app:appearanceMember" => { | ||
| st.skip_current_element()?; | ||
| counter.appearances += 1; | ||
| Ok(()) | ||
| } | ||
| other => Err(ParseError::SchemaViolation(format!( | ||
| "Unrecognized element {}", | ||
| String::from_utf8_lossy(other) | ||
| ))), | ||
| }) { | ||
| Ok(_) => Ok(counter), | ||
| Err(e) => { | ||
| println!("Err: {:?}", e); | ||
| Err(e) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn simple_read() { | ||
| let reader = std::io::BufReader::new( | ||
| zstd::stream::Decoder::new( | ||
| std::fs::File::open("./tests/data/53393680_bldg_6697_lod4.2_op.gml.zst").unwrap(), | ||
| ) | ||
| .unwrap(), | ||
| ); | ||
|
|
||
| let mut xml_reader = quick_xml::NsReader::from_reader(reader); | ||
| match CityGMLReader::new().start_root(&mut xml_reader) { | ||
| Ok(mut st) => match example_toplevel_dispatcher(&mut st) { | ||
| Ok(counter) => { | ||
| assert_eq!(counter.city_objects, 1527); | ||
| assert_eq!(counter.appearances, 1); | ||
| assert_eq!(counter.multipolygons, 197633); | ||
| assert_eq!(counter.buildings, 1485); | ||
| assert_eq!(counter.cityobjectgroups, 42); | ||
| } | ||
| Err(e) => panic!("Err: {:?}", e), | ||
| }, | ||
| Err(e) => panic!("Err: {:?}", e), | ||
| }; | ||
| } |