gpkg: bbox管理のちょっとした改善 (#307)

登場したテーブルのみのbboxを管理して、gpkg_contentsを更新するようにします。（ちょっとした変更なので他の作業とは特段コンプリクトしないと思います）。

（その他、いまの main に unused imports が色々と混入しているので、除去します）

nusamai-czml/src/models/interpolatable_property.rs

@@ -1,6 +1,5 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
-use std::default::Default;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 #[serde(rename_all = "camelCase")]

nusamai-gpkg/src/handler.rs

@@ -1,8 +1,7 @@
 use crate::table::TableInfo;
 use indexmap::IndexMap;
 use sqlx::{sqlite::*, ConnectOptions};
-use sqlx::{Acquire, Row};
-use sqlx::{Pool, Sqlite};
+use sqlx::{Acquire, Pool, Row};
 use std::path::Path;
 use thiserror::Error;
 use url::Url;

nusamai-kml/src/conversion.rs

@@ -135,8 +135,7 @@ pub fn multipoint_to_kml(mpoint: &MultiPoint<3>) -> MultiGeometry {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use kml::types::{Geometry, Point};
-    use nusamai_geometry::{MultiPoint, Polygon3};
+    use nusamai_geometry::Polygon3;
 
     #[test]
     fn test_multipoint_to_kml() {

nusamai/src/sink/czml/mod.rs

@@ -228,7 +228,7 @@ mod tests {
     use std::sync::RwLock;
 
     use super::*;
-    use nusamai_citygml::{object::Object, GeometryRef, Value};
+    use nusamai_citygml::{object::Object, GeometryRef};
     use nusamai_czml::{PositionListProperties, PositionListType};
     use nusamai_geometry::MultiPolygon;
     use nusamai_projection::crs::EPSG_JGD2011_GEOGRAPHIC_3D;

nusamai/src/sink/geojson/mod.rs

@@ -235,7 +235,7 @@ mod tests {
     use std::sync::RwLock;
 
     use super::*;
-    use nusamai_citygml::{object::Object, GeometryRef, Value};
+    use nusamai_citygml::{object::Object, GeometryRef};
     use nusamai_geometry::MultiPolygon;
     use nusamai_projection::crs::EPSG_JGD2011_GEOGRAPHIC_3D;
 

nusamai/src/sink/gltf/attributes.rs

@@ -239,8 +239,6 @@ pub fn to_gltf_property_table(
 
 #[cfg(test)]
 mod tests {
-    use ahash::RandomState;
-    use indexmap::IndexMap;
     use nusamai_citygml::schema::FeatureTypeDef;
 
     use super::*;

nusamai/src/sink/gpkg/mod.rs

@@ -12,7 +12,6 @@ use indexmap::IndexMap;
 
 use rayon::prelude::*;
 
-use crate::parameters::Parameters;
 use crate::parameters::*;
 use crate::pipeline::{Feedback, PipelineError, Receiver, Result};
 use crate::sink::{DataSink, DataSinkProvider, SinkInfo};
@@ -89,9 +88,6 @@ impl GpkgSink {
         let mut created_tables = HashSet::<String>::new();
 
         let mut table_bboxes = IndexMap::<String, Bbox>::new();
-        for table_name in table_infos.keys() {
-            table_bboxes.insert(table_name.clone(), Default::default());
-        }
 
         let (sender, mut receiver) = tokio::sync::mpsc::channel(100);
 
@@ -195,13 +191,11 @@ impl GpkgSink {
                 .await
                 .unwrap();
 
-            table_bboxes.get_mut(&table_name).unwrap().merge(&bbox);
+            table_bboxes.entry(table_name).or_default().merge(&bbox);
         }
 
-        for table_name in table_bboxes.keys() {
-            tx.update_bbox(table_name, table_bboxes.get(table_name).unwrap().to_tuple())
-                .await
-                .unwrap();
+        for (table_name, bbox) in table_bboxes {
+            tx.update_bbox(&table_name, bbox.to_tuple()).await.unwrap();
         }
 
         tx.commit().await.unwrap();
@@ -216,12 +210,13 @@ impl GpkgSink {
 impl DataSink for GpkgSink {
     fn make_transform_requirements(&self) -> transformer::Requirements {
         transformer::Requirements {
-            tree_flattening: transformer::TreeFlatteningSpec::Flatten {
-                // TODO: set properly after the flattening transformer is implemented
-                feature: transformer::FeatureFlatteningOption::None,
-                data: transformer::DataFlatteningOption::None,
-                object: transformer::ObjectFlatteningOption::None,
-            },
+            // TODO: set properly after the flattening transformer is implemented
+            tree_flattening: transformer::TreeFlatteningSpec::None,
+            // transformer::TreeFlatteningSpec::Flatten {
+            //     feature: transformer::FeatureFlatteningOption::None,
+            //     data: transformer::DataFlatteningOption::None,
+            //     object: transformer::ObjectFlatteningOption::None,
+            // },
             ..Default::default()
         }
     }

nusamai/src/sink/serde/mod.rs

@@ -6,7 +6,6 @@ use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::PathBuf;
 
-use bincode;
 use nusamai_citygml::schema::Schema;
 use rayon::prelude::*;
 

nusamai/src/sink/shapefile/mod.rs

@@ -14,7 +14,6 @@ use crate::{get_parameter_value, transformer};
 use nusamai_citygml::object::{ObjectStereotype, Value};
 use nusamai_plateau::Entity;
 use nusamai_shapefile::conversion::indexed_multipolygon_to_shape;
-use shapefile;
 
 pub struct ShapefileSinkProvider {}
 
@@ -184,9 +183,8 @@ mod tests {
     use std::sync::RwLock;
 
     use super::*;
-    use nusamai_citygml::{object::Object, GeometryRef, Value};
+    use nusamai_citygml::{object::Object, GeometryRef};
     use nusamai_geometry::MultiPolygon;
-    use nusamai_plateau::Entity;
     use nusamai_projection::crs::EPSG_JGD2011_GEOGRAPHIC_3D;
     use shapefile::NO_DATA;