種々のリファクタリング等のまとめ

nusamai-3dtiles/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.192", features = ["derive"] }
-serde_json = { version = "1.0.108", features = ["float_roundtrip"] }
+serde_json = { version = "1.0.108", features = ["indexmap", "float_roundtrip"] }
 serde_repr = "0.1.17"
 nusamai-gltf = { path = "../nusamai-gltf" }
 

nusamai-citygml/Cargo.toml

@@ -8,12 +8,14 @@ default = ["serde"]
 serde = ["dep:serde", "serde_json", "nusamai-geometry/serde"]
 
 [dependencies]
+ahash = "0.8.7"
 chrono = { version = "0.4.31", features = ["serde"], default-features = false }
 indexmap = { version = "2.1", features = ["serde"] }
 macros = { path = "./macros" }
 nusamai-geometry = { path = "../nusamai-geometry", features = ["serde"]}
+nusamai-projection = { path = "../nusamai-projection"}
 quick-xml = "0.31"
 serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0.108", optional = true }
+serde_json = { version = "1.0.108", features = ["indexmap"], optional = true }
 thiserror = "1.0"
 url = "2.5.0"

nusamai-citygml/macros/src/derive.rs

@@ -240,7 +240,7 @@ fn generate_citygml_impl_for_struct(
                         typename: #typename.into(),
                         id: #id_value,
                         attributes: {
-                            let mut attributes = ::nusamai_citygml::object::Map::new();
+                            let mut attributes = ::nusamai_citygml::object::Map::default();
                             #(#into_object_stmts)*
                             attributes
                         },
@@ -255,7 +255,7 @@ fn generate_citygml_impl_for_struct(
                     ::nusamai_citygml::object::Data {
                         typename: #typename.into(),
                         attributes: {
-                            let mut attributes = ::nusamai_citygml::object::Map::new();
+                            let mut attributes = ::nusamai_citygml::object::Map::default();
                             #(#into_object_stmts)*
                             attributes
                         },

nusamai-citygml/src/geometry.rs

@@ -1,4 +1,5 @@
 use nusamai_geometry::{MultiLineString, MultiPoint, MultiPolygon};
+use nusamai_projection::crs::*;
 
 #[derive(Debug, Clone, Copy)]
 pub enum GeometryParseType {
@@ -35,20 +36,25 @@ pub struct GeometryRefEntry {
 
 pub type GeometryRef = Vec<GeometryRefEntry>;
 
-/// Geometries in a toplevel city object and its children.
+/// Geometries in a city object and all its children.
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Debug, Default)]
-pub struct Geometries {
+pub struct GeometryStore {
+    /// EPSG code of the Coordinate Reference System (CRS)
+    pub epsg: EPSGCode,
+    /// Shared vertex buffer for all geometries
     pub vertices: Vec<[f64; 3]>,
+    /// All polygons, referenced by `GeometryRef`
     pub multipolygon: MultiPolygon<'static, 1, u32>,
+    /// All line-strings of , referenced by `GeometryRef`
     pub multilinestring: MultiLineString<'static, 1, u32>,
+    /// All points, referenced by `GeometryRef`
     pub multipoint: MultiPoint<'static, 1, u32>,
 }
 
-/// Store for collecting vertices and polygons from GML.
 #[derive(Default)]
-pub struct GeometryCollector {
-    pub vertices: indexmap::IndexSet<[u64; 3]>,
+pub(crate) struct GeometryCollector {
+    pub vertices: indexmap::IndexSet<[u64; 3], ahash::RandomState>,
     pub multipolygon: MultiPolygon<'static, 1, u32>,
     pub multilinestring: MultiLineString<'static, 1, u32>,
     pub multipoint: MultiPoint<'static, 1, u32>,
@@ -75,7 +81,7 @@ impl GeometryCollector {
         }));
     }
 
-    pub fn into_geometries(self) -> Geometries {
+    pub fn into_geometries(self) -> GeometryStore {
         let mut vertices = Vec::with_capacity(self.vertices.len());
         for vbits in &self.vertices {
             vertices.push([
@@ -84,7 +90,8 @@ impl GeometryCollector {
                 f64::from_bits(vbits[2]),
             ]);
         }
-        Geometries {
+        GeometryStore {
+            epsg: EPSG_JGD2011_GEOGRAPHIC_3D,
             vertices,
             multipolygon: self.multipolygon,
             multilinestring: self.multilinestring,

nusamai-citygml/src/object.rs

@@ -6,12 +6,12 @@ use crate::Measure;
 use chrono::NaiveDate;
 use serde::{Deserialize, Serialize};
 
-pub type Map = indexmap::IndexMap<String, Value>;
+pub type Map = indexmap::IndexMap<String, Value, ahash::RandomState>;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct CityObject {
     pub root: Value,
-    pub geometries: geometry::Geometries,
+    pub geometries: geometry::GeometryStore,
 }
 
 #[derive(Debug, Serialize, Deserialize, PartialEq)]
@@ -70,24 +70,25 @@ impl Value {
                 // }
             }
             Array(a) => serde_json::Value::Array(a.iter().map(Value::to_attribute_json).collect()),
-            Feature(feat) => serde_json::Value::from_iter(
-                feat.attributes
-                    .iter()
-                    .map(|(k, v)| (k.clone(), v.to_attribute_json()))
-                    .chain(
-                        std::iter::once(("type".into(), feat.typename.clone().into()))
-                            .chain(std::iter::once(("id".into(), feat.id.clone().into()))),
-                    ),
-            ),
-            Data(feat) => serde_json::Value::from_iter(
-                feat.attributes
-                    .iter()
-                    .map(|(k, v)| (k.clone(), v.to_attribute_json()))
-                    .chain(std::iter::once((
-                        "type".into(),
-                        feat.typename.clone().into(),
-                    ))),
-            ),
+            Feature(feat) => {
+                let mut m = serde_json::Map::from_iter(
+                    feat.attributes
+                        .iter()
+                        .map(|(k, v)| (k.clone(), v.to_attribute_json())),
+                );
+                m.insert("type".into(), feat.typename.clone().into());
+                m.insert("id".into(), feat.id.clone().into());
+                serde_json::Value::Object(m)
+            }
+            Data(feat) => {
+                let mut m = serde_json::Map::from_iter(
+                    feat.attributes
+                        .iter()
+                        .map(|(k, v)| (k.clone(), v.to_attribute_json())),
+                );
+                m.insert("type".into(), feat.typename.clone().into());
+                serde_json::Value::Object(m)
+            }
         }
     }
 }
@@ -136,7 +137,7 @@ mod tests {
         let value = obj.to_attribute_json();
         assert_eq!(value, json!(["test", 1]));
 
-        let mut attributes = Map::new();
+        let mut attributes = Map::default();
         attributes.insert("String".into(), Value::String("test".into()));
         attributes.insert("Integer".into(), Value::Integer(1));
         let obj = Value::Feature(Feature {
@@ -158,7 +159,7 @@ mod tests {
             }
         );
 
-        let mut attributes = Map::new();
+        let mut attributes = Map::default();
         attributes.insert("String".into(), Value::String("test".into()));
         attributes.insert("Integer".into(), Value::Integer(1));
         let obj = Value::Data(Data {

nusamai-citygml/src/parser.rs

@@ -10,7 +10,8 @@ use url::Url;
 
 use crate::codelist::{self, CodeResolver};
 use crate::geometry::{
-    Geometries, GeometryCollector, GeometryParseType, GeometryRef, GeometryRefEntry, GeometryType,
+    GeometryCollector, GeometryParseType, GeometryRef, GeometryRefEntry, GeometryStore,
+    GeometryType,
 };
 use crate::namespace::{wellknown_prefix_from_nsres, GML31_NS};
 
@@ -294,7 +295,7 @@ impl<R: BufRead> SubTreeReader<'_, '_, R> {
         &self.state.context
     }
 
-    pub fn collect_geometries(&mut self) -> Geometries {
+    pub fn collect_geometries(&mut self) -> GeometryStore {
         let collector = std::mem::take(&mut self.state.geometry_collector);
         collector.into_geometries()
     }

nusamai-citygml/src/values.rs

@@ -372,7 +372,7 @@ impl CityGMLElement for GenericAttribute {
     }
 
     fn into_object(self) -> Option<Value> {
-        let mut map = object::Map::new();
+        let mut map = object::Map::default();
         map.extend(
             self.string_attrs
                 .into_iter()

nusamai-geojson/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 geojson = "0.24.1"
 nusamai-geometry = { path = "../nusamai-geometry" }
-serde_json = "1.0.108"
+serde_json = { version = "1.0.108", features = ["indexmap"] }