Publish nusamai-geometry as 'flatgeom' on crates.io. (#546)

Close: #536 Publish nusamai-geometry as [flatgeom](https://crates.io/crates/flatgeom) on crates.io
MIERUNE · May 29, 2024 · 0c6addf · 0c6addf
1 parent 720b2f0
commit 0c6addf
Show file tree

Hide file tree

Showing 50 changed files with 62 additions and 2,114 deletions.
diff --git a/README.md b/README.md
@@ -91,14 +91,12 @@ PLATEAU の標準仕様に準拠した CityGML 2.0 形式の3D都市モデルは
 - アプリケーション：
   - [`app`](./app/) &mdash; Tauri による GUI 実装
   - [`nusamai`](./nusamai/) &mdash; アプリケーションバックエンドおよびコマンドライン版の実装
-- 基盤・ユーティリティ：
-  - [`nusamai-geometry`](./nusamai-geometry/) &mdash; ジオメトリ型
-  - [`nusamai-projection`](./nusamai-projection/) &mdash; 投影法変換
 - データソース：
   - [`nusamai-citygml`](./nusamai-plateau/citygml/) &mdash; CityGML パーサ実装支援ライブラリ
     - [`macros`](./nusamai-plateau/citygml/macros/) &mdash; パーサ導出用の proc macros
   - [`nusamai-plateau`](./nusamai-plateau/) &mdash; PLATEAU 用の CityGML モデルおよびパーサ
-- 変換先形式のための支援ライブラリ（本プロジェクトのユースケースと癒着しないように構成）
+- 基盤・ユーティリティ（本プロジェクトのユースケースと癒着しないように構成）：
+  - [`nusamai-projection`](./nusamai-projection/) &mdash; 投影法変換
   - [`nusamai-mvt`](./nusamai-mvt/) &mdash; Mapbox Vector Tiles (MVT)
   - [`nusamai-gpkg`](./nusamai-gpkg/) &mdash; GeoPackage
   - [`nusamai-gltf`](./nusamai-gltf/) &mdash; glTF
@@ -109,9 +107,10 @@ PLATEAU の標準仕様に準拠した CityGML 2.0 形式の3D都市モデルは
 
 ### 7.1. 外部リポジトリ
 
-- [MIERUNE/cesiumtiles-rs](https://github.com/MIERUNE/cesiumtiles-rs) &mdash; 3D TilesのJSONモデルなど
+- [MIERUNE/flatgeom-rs](https://github.com/MIERUNE/flatgeom-rs) &mdash; シリアライズ/デシリアライズの効率を優先したジオメトリ型
 - [MIERUNE/earcut-rs](https://github.com/MIERUNE/earcut-rs) &mdash; ポリゴン三角形化アルゴリズムのRust移植
 - [MIERUNE/japan-geoid](https://github.com/MIERUNE/japan-geoid) &mdash; 日本のジオイドモデル (JGD2011 → WGS 84 の変換)
+- [MIERUNE/cesiumtiles-rs](https://github.com/MIERUNE/cesiumtiles-rs) &mdash; 3D TilesのJSONモデルなど
 
 ## 8. ライセンス
 

diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.6.1", features = [ "shell-open", "fs-read-dir", "dialog-all"] }
 nusamai = { path = "../../nusamai" }
-nusamai-geometry = { path = "../../nusamai-geometry" }
+flatgeom = "0.0"
 nusamai-geojson = { path = "../../nusamai-geojson" }
 nusamai-plateau = { path = "../../nusamai-plateau" }
 nusamai-citygml = {path = "../../nusamai-citygml" }

diff --git a/nusamai-citygml/Cargo.toml b/nusamai-citygml/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 
 [features]
 default = ["serde"]
-serde = ["dep:serde", "serde_json", "nusamai-geometry/serde"]
+serde = ["dep:serde", "serde_json", "flatgeom/serde"]
 
 [dependencies]
 ahash = "0.8.11"
 chrono = { version = "0.4.35", features = ["serde"], default-features = false }
 indexmap = { version = "2.2.6", features = ["serde"] }
 log = "0.4.21"
 macros = { path = "./macros" }
-nusamai-geometry = { path = "../nusamai-geometry", features = ["serde"]}
+flatgeom = "0.0"
 nusamai-projection = { path = "../nusamai-projection"}
 quick-xml = "0.31"
 serde = { version = "1.0", features = ["derive"], optional = true }

diff --git a/nusamai-citygml/src/geometry.rs b/nusamai-citygml/src/geometry.rs
@@ -1,4 +1,4 @@
-use nusamai_geometry::{MultiLineString, MultiPoint, MultiPolygon};
+use flatgeom::{MultiLineString, MultiPoint, MultiPolygon};
 use nusamai_projection::crs::*;
 
 use crate::LocalId;

diff --git a/nusamai-czml/Cargo.toml b/nusamai-czml/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 chrono = { version = "0.4.35", features = ["serde"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = { version = "1.0.115", features = ["float_roundtrip"] }
-nusamai-geometry = { path = "../nusamai-geometry" }
+flatgeom= "0.0"
 
 [dev-dependencies]
 glob = "0.3.1"
diff --git a/nusamai-czml/src/conversion.rs b/nusamai-czml/src/conversion.rs
@@ -1,4 +1,4 @@
-use nusamai_geometry::{MultiPolygon, Polygon};
+use flatgeom::{MultiPolygon, Polygon};
 
 use crate::{
     models::CzmlPolygon, PositionList, PositionListOfLists, PositionListOfListsProperties,

diff --git a/nusamai-geojson/Cargo.toml b/nusamai-geojson/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 geojson = "0.24.1"
-nusamai-geometry = { path = "../nusamai-geometry" }
+flatgeom= "0.0"
 serde_json = { version = "1.0.115", features = ["indexmap"] }
diff --git a/nusamai-geojson/src/conversion.rs b/nusamai-geojson/src/conversion.rs
@@ -1,9 +1,9 @@
-use nusamai_geometry::{
+use flatgeom::{
     Coord, LineString, LineString3, MultiLineString, MultiLineString3, MultiPoint, MultiPoint3,
     MultiPolygon, Polygon,
 };
 
-/// Create a GeoJSON Polygon from `nusamai_geometry::MultiPolygon`.
+/// Create a GeoJSON Polygon from `flatgeom::MultiPolygon`.
 pub fn polygon_to_value<const D: usize>(poly: &Polygon<[f64; D]>) -> geojson::Value {
     polygon_to_value_with_mapping(poly, |c| c.to_vec())
 }
@@ -13,7 +13,7 @@ pub fn indexed_polygon_to_value(vertices: &[[f64; 3]], poly_idx: &Polygon<u32>)
     polygon_to_value_with_mapping(poly_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON Polygon from `nusamai_geometry::Polygon` with a mapping function.
+/// Create a GeoJSON Polygon from `flatgeom::Polygon` with a mapping function.
 pub fn polygon_to_value_with_mapping<T: Coord>(
     poly: &Polygon<T>,
     mapping: impl Fn(T) -> Vec<f64>,
@@ -29,7 +29,7 @@ pub fn polygon_to_value_with_mapping<T: Coord>(
     geojson::Value::Polygon(coords)
 }
 
-/// Create a GeoJSON MultiPolygon from `nusamai_geometry::MultiPolygon`.
+/// Create a GeoJSON MultiPolygon from `flatgeom::MultiPolygon`.
 pub fn multipolygon_to_value<const D: usize>(mpoly: &MultiPolygon<[f64; D]>) -> geojson::Value {
     multipolygon_to_value_with_mapping(mpoly, |c| c.to_vec())
 }
@@ -42,7 +42,7 @@ pub fn indexed_multipolygon_to_value(
     multipolygon_to_value_with_mapping(mpoly_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON MultiPolygon from `nusamai_geometry::MultiPolygon` with a mapping function.
+/// Create a GeoJSON MultiPolygon from `flatgeom::MultiPolygon` with a mapping function.
 pub fn multipolygon_to_value_with_mapping<T: Coord>(
     mpoly: &MultiPolygon<T>,
     mapping: impl Fn(T) -> Vec<f64>,
@@ -62,7 +62,7 @@ pub fn multipolygon_to_value_with_mapping<T: Coord>(
     geojson::Value::MultiPolygon(coords)
 }
 
-/// Create a GeoJSON LineString from `nusamai_geometry::LineString`.
+/// Create a GeoJSON LineString from `flatgeom::LineString`.
 pub fn linestring_to_value(ls: &LineString3) -> geojson::Value {
     linestring_to_value_with_mapping(ls, |c| c.to_vec())
 }
@@ -75,7 +75,7 @@ pub fn indexed_linestring_to_value(
     linestring_to_value_with_mapping(ls_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON LineString from `nusamai_geometry::LineString` with a mapping function.
+/// Create a GeoJSON LineString from `flatgeom::LineString` with a mapping function.
 pub fn linestring_to_value_with_mapping<T: Coord>(
     ls: &LineString<T>,
     mapping: impl Fn(T) -> Vec<f64>,
@@ -84,7 +84,7 @@ pub fn linestring_to_value_with_mapping<T: Coord>(
     geojson::Value::LineString(coords)
 }
 
-/// Create a GeoJSON MultiLineString from `nusamai_geometry::MultiLineString`.
+/// Create a GeoJSON MultiLineString from `flatgeom::MultiLineString`.
 pub fn multilinestring_to_value(mls: &MultiLineString3) -> geojson::Value {
     multilinestring_to_value_with_mapping(mls, |c| c.to_vec())
 }
@@ -97,7 +97,7 @@ pub fn indexed_multilinestring_to_value(
     multilinestring_to_value_with_mapping(mls_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON MultiLineString from `nusamai_geometry::MultiLineString` with a mapping function.
+/// Create a GeoJSON MultiLineString from `flatgeom::MultiLineString` with a mapping function.
 pub fn multilinestring_to_value_with_mapping<T: Coord>(
     mls: &MultiLineString<T>,
     mapping: impl Fn(T) -> Vec<f64>,
@@ -114,7 +114,7 @@ pub fn multilinestring_to_value_with_mapping<T: Coord>(
     geojson::Value::MultiLineString(coords)
 }
 
-/// Create a GeoJSON Point from `nusamai_geometry::Point`.
+/// Create a GeoJSON Point from `flatgeom::Point`.
 pub fn point_to_value(point: &[f64; 3]) -> geojson::Value {
     point_to_value_with_mapping(*point, |c| c.to_vec())
 }
@@ -124,15 +124,15 @@ pub fn indexed_point_to_value(vertices: &[[f64; 3]], point_idx: u32) -> geojson:
     point_to_value_with_mapping(point_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON Point from `nusamai_geometry::Point` with a mapping function.
+/// Create a GeoJSON Point from `flatgeom::Point` with a mapping function.
 pub fn point_to_value_with_mapping<T: Coord>(
     point: T,
     mapping: impl Fn(T) -> Vec<f64>,
 ) -> geojson::Value {
     geojson::Value::Point(mapping(point))
 }
 
-/// Create a GeoJSON MultiPoint from `nusamai_geometry::Point`.
+/// Create a GeoJSON MultiPoint from `flatgeom::Point`.
 pub fn multipoint_to_value(mpoint: &MultiPoint3) -> geojson::Value {
     multipoint_to_value_with_mapping(mpoint, |c| c.to_vec())
 }
@@ -145,7 +145,7 @@ pub fn indexed_multipoint_to_value(
     multipoint_to_value_with_mapping(mpoint_idx, |idx| vertices[idx as usize].to_vec())
 }
 
-/// Create a GeoJSON MultiPoint from `nusamai_geometry::MultiPoint` with a mapping function.
+/// Create a GeoJSON MultiPoint from `flatgeom::MultiPoint` with a mapping function.
 pub fn multipoint_to_value_with_mapping<T: Coord>(
     mpoint: &MultiPoint<T>,
     mapping: impl Fn(T) -> Vec<f64>,
@@ -159,7 +159,7 @@ pub fn multipoint_to_value_with_mapping<T: Coord>(
 
 #[cfg(test)]
 mod tests {
-    use nusamai_geometry::{MultiPolygon3, Polygon3};
+    use flatgeom::{MultiPolygon3, Polygon3};
 
     use super::*;
 

diff --git a/nusamai-geometry/Cargo.toml b/nusamai-geometry/Cargo.toml
diff --git a/nusamai-geometry/README.md b/nusamai-geometry/README.md
diff --git a/nusamai-geometry/docs/01_linestring.png b/nusamai-geometry/docs/01_linestring.png
diff --git a/nusamai-geometry/docs/02_polygon.png b/nusamai-geometry/docs/02_polygon.png
diff --git a/nusamai-geometry/docs/03_polygon_with_a_hole.png b/nusamai-geometry/docs/03_polygon_with_a_hole.png
diff --git a/nusamai-geometry/docs/04_polygon_with_multiple_holes.png b/nusamai-geometry/docs/04_polygon_with_multiple_holes.png
diff --git a/nusamai-geometry/docs/05_multipolygon.png b/nusamai-geometry/docs/05_multipolygon.png
diff --git a/nusamai-geometry/docs/06_multipolygon_with_holes.png b/nusamai-geometry/docs/06_multipolygon_with_holes.png
diff --git a/nusamai-geometry/docs/07_multipolygon_multiple_holes.png b/nusamai-geometry/docs/07_multipolygon_multiple_holes.png
diff --git a/nusamai-geometry/docs/nusamai-geometry.key b/nusamai-geometry/docs/nusamai-geometry.key